You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/06/09 20:08:27 UTC

[01/17] incubator-geode git commit: GEODE-1377: Updating JavaDocs to point to the correct property definitions

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 11e637493 -> b5ed09350


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cc249d5d/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 8707a39..9c5213f 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
@@ -38,15 +38,12 @@ import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties
  * various GemFire distribution configuration properties.  The
  * interface also provides constants for the names of properties and
  * their default values.
- *
- * <P>
- *
- * Decriptions of these properties can be found <a
- * href="../DistributedSystem.html#configuration">here</a>.
+ * <p>
+ * <p>
+ * <p>
+ * Descriptions of these properties can be found {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties}.
  *
  * @see com.gemstone.gemfire.internal.Config
- *
- *
  * @since GemFire 2.1
  */
 public interface DistributionConfig extends Config, LogConfig {
@@ -54,8 +51,7 @@ public interface DistributionConfig extends Config, LogConfig {
   ////////////////////  Instance Methods  ////////////////////
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#name">"name"</a> property
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#NAME} property
    * Gets the member's name.
    * A name is optional and by default empty.
    * If set it must be unique in the ds.
@@ -64,7 +60,7 @@ public interface DistributionConfig extends Config, LogConfig {
    *
    * @return the system's name.
    */
-  @ConfigAttributeGetter(name = NAME_NAME)
+  @ConfigAttributeGetter(name = NAME)
   String getName();
 
   /**
@@ -76,7 +72,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @throws com.gemstone.gemfire.GemFireIOException    if the set failure is caused by an error
    *                                                    when writing to the system's configuration file.
    */
-  @ConfigAttributeSetter(name = NAME_NAME)
+  @ConfigAttributeSetter(name = NAME)
   void setName(String value);
 
   /**
@@ -92,209 +88,196 @@ public interface DistributionConfig extends Config, LogConfig {
   String DEFAULT_NAME = "";
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#mcast-port">"mcast-port"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT}</a>
    * property
    */
   @ConfigAttributeGetter(name = MCAST_PORT_NAME)
   int getMcastPort();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#mcast-port">"mcast-port"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_PORT_NAME)
   void setMcastPort(int value);
 
   /**
-   * The default value of the "mcast-port" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT} property
    */
   int DEFAULT_MCAST_PORT = 0;
 
   /**
-   * The minimum mcastPort.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT}.
    * <p> Actual value of this constant is <code>0</code>.
    */
   int MIN_MCAST_PORT = 0;
 
   /**
-   * The maximum mcastPort.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT}.
    * <p> Actual value of this constant is <code>65535</code>.
    */
   int MAX_MCAST_PORT = 65535;
 
   /**
-   * The name of the "mcast-port" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MCAST_PORT, max = MAX_MCAST_PORT)
   String MCAST_PORT_NAME = MCAST_PORT;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#tcp-port">"tcp-port"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT}
    * property
    */
   @ConfigAttributeGetter(name = TCP_PORT)
   int getTcpPort();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#tcp-port">"tcp-port"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT}
    * property
    */
   @ConfigAttributeSetter(name = TCP_PORT)
   void setTcpPort(int value);
 
   /**
-   * The default value of the "tcpPort" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT} property
    */
   int DEFAULT_TCP_PORT = 0;
 
   /**
-   * The minimum tcpPort.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT}.
    * <p> Actual value of this constant is <code>0</code>.
    */
   int MIN_TCP_PORT = 0;
 
   /**
-   * The maximum tcpPort.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT}.
    * <p> Actual value of this constant is <code>65535</code>.
    */
   int MAX_TCP_PORT = 65535;
 
   /**
-   * The name of the "tcpPort" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_TCP_PORT, max = MAX_TCP_PORT)
   String TCP_PORT_NAME = TCP_PORT;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#mcast-address">"mcast-address"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_ADDRESS}
    * property
    */
   @ConfigAttributeGetter(name = MCAST_ADDRESS)
   InetAddress getMcastAddress();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#mcast-address">"mcast-address"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_ADDRESS}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_ADDRESS)
   void setMcastAddress(InetAddress value);
 
   /**
-   * The name of the "mcastAddress" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_ADDRESS} property
    */
   @ConfigAttribute(type = InetAddress.class)
   String MCAST_ADDRESS_NAME = MCAST_ADDRESS;
 
   /**
-   * The default value of the "mcastAddress" property.
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_ADDRESS} property.
    * Current value is <code>239.192.81.1</code>
    */
   InetAddress DEFAULT_MCAST_ADDRESS = AbstractDistributionConfig._getDefaultMcastAddress();
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#mcast-ttl">"mcast-ttl"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL}
    * property
    */
   @ConfigAttributeGetter(name = MCAST_TTL)
   int getMcastTtl();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#mcast-ttl">"mcast-ttl"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_TTL)
   void setMcastTtl(int value);
 
   /**
-   * The default value of the "mcastTtl" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL} property
    */
   int DEFAULT_MCAST_TTL = 32;
 
   /**
-   * The minimum mcastTtl.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL}.
    * <p> Actual value of this constant is <code>0</code>.
    */
   int MIN_MCAST_TTL = 0;
 
   /**
-   * The maximum mcastTtl.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL}.
    * <p> Actual value of this constant is <code>255</code>.
    */
   int MAX_MCAST_TTL = 255;
 
   /**
-   * The name of the "mcastTtl" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MCAST_TTL, max = MAX_MCAST_TTL)
   String MCAST_TTL_NAME = MCAST_TTL;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#bind-address">"bind-address"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#BIND_ADDRESS}
    * property
    */
   @ConfigAttributeGetter(name = BIND_ADDRESS)
   String getBindAddress();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#bind-address">"bind-address"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#BIND_ADDRESS}
    * property
    */
   @ConfigAttributeSetter(name = BIND_ADDRESS)
   void setBindAddress(String value);
 
   /**
-   * The name of the "bindAddress" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#BIND_ADDRESS} property
    */
   @ConfigAttribute(type = String.class)
   String BIND_ADDRESS_NAME = BIND_ADDRESS;
 
   /**
-   * The default value of the "bindAddress" property.
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#BIND_ADDRESS} property.
    * Current value is an empty string <code>""</code>
    */
   String DEFAULT_BIND_ADDRESS = "";
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#server-bind-address">"server-bind-address"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SERVER_BIND_ADDRESS}
    * property
    */
   @ConfigAttributeGetter(name = SERVER_BIND_ADDRESS)
   String getServerBindAddress();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#server-bind-address">"server-bind-address"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SERVER_BIND_ADDRESS}
    * property
    */
   @ConfigAttributeSetter(name = SERVER_BIND_ADDRESS)
   void setServerBindAddress(String value);
 
   /**
-   * The name of the "serverBindAddress" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SERVER_BIND_ADDRESS} property
    */
   @ConfigAttribute(type = String.class)
   String SERVER_BIND_ADDRESS_NAME = SERVER_BIND_ADDRESS;
 
   /**
-   * The default value of the "serverBindAddress" property.
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SERVER_BIND_ADDRESS} property.
    * Current value is an empty string <code>""</code>
    */
   String DEFAULT_SERVER_BIND_ADDRESS = "";
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#locators">"locators"</a> property
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOCATORS} property
    */
   @ConfigAttributeGetter(name = LOCATORS)
   String getLocators();
@@ -316,13 +299,13 @@ public interface DistributionConfig extends Config, LogConfig {
   void setLocators(String value);
 
   /**
-   * The name of the "locators" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOCATORS} property
    */
   @ConfigAttribute(type = String.class)
   String LOCATORS_NAME = LOCATORS;
 
   /**
-   * The default value of the "locators" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOCATORS} property
    */
   String DEFAULT_LOCATORS = "";
 
@@ -342,14 +325,14 @@ public interface DistributionConfig extends Config, LogConfig {
   void setLocatorWaitTime(int seconds);
 
   /**
-   * returns the value of the <a href="../DistribytedSystem.html#start-locator">"start-locator"
-   * </a> property
+   * returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#START_LOCATOR} property
    */
   @ConfigAttributeGetter(name = START_LOCATOR)
   String getStartLocator();
 
   /**
-   * Sets the start-locator property.  This is a string in the form
+   * Sets the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#START_LOCATOR} property.
+   * This is a string in the form
    * bindAddress[port] and, if set, tells the distributed system to start
    * a locator prior to connecting
    *
@@ -359,18 +342,17 @@ public interface DistributionConfig extends Config, LogConfig {
   void setStartLocator(String value);
 
   /**
-   * The name of the "start-locator" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#START_LOCATOR} property
    */
   @ConfigAttribute(type = String.class)
   String START_LOCATOR_NAME = START_LOCATOR;
   /**
-   * The default value of the "start-locator" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#START_LOCATOR} property
    */
   String DEFAULT_START_LOCATOR = "";
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#deploy-working-dir">"deploy-working-dir"</a> property
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DEPLOY_WORKING_DIR} property
    */
   @ConfigAttributeGetter(name = DEPLOY_WORKING_DIR)
   File getDeployWorkingDir();
@@ -387,7 +369,7 @@ public interface DistributionConfig extends Config, LogConfig {
   void setDeployWorkingDir(File value);
 
   /**
-   * The name of the "deploy-working-dir" property.
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DEPLOY_WORKING_DIR} property.
    */
   @ConfigAttribute(type = File.class)
   String DEPLOY_WORKING_DIR_NAME = DEPLOY_WORKING_DIR;
@@ -399,8 +381,7 @@ public interface DistributionConfig extends Config, LogConfig {
   File DEFAULT_DEPLOY_WORKING_DIR = new File(".");
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#user-command-packages">"user-command-packages"</a> property
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USER_COMMAND_PACKAGES} property
    */
   @ConfigAttributeGetter(name = USER_COMMAND_PACKAGES)
   String getUserCommandPackages();
@@ -417,19 +398,18 @@ public interface DistributionConfig extends Config, LogConfig {
   void setUserCommandPackages(String value);
 
   /**
-   * The name of the "user-command-packages" property.
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USER_COMMAND_PACKAGES} property.
    */
   @ConfigAttribute(type = String.class)
   String USER_COMMAND_PACKAGES_NAME = USER_COMMAND_PACKAGES;
 
   /**
-   * The default value of the "user-command-packages" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USER_COMMAND_PACKAGES} property
    */
   String DEFAULT_USER_COMMAND_PACKAGES = "";
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#log-file">"log-file"</a> property
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE} property
    *
    * @return <code>null</code> if logging information goes to standard
    * out
@@ -452,21 +432,20 @@ public interface DistributionConfig extends Config, LogConfig {
   void setLogFile(File value);
 
   /**
-   * The name of the "logFile" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE} property
    */
   @ConfigAttribute(type = File.class)
   String LOG_FILE_NAME = LOG_FILE;
 
   /**
-   * The default log file.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE}.
    * <p> Actual value of this constant is <code>""</code> which directs
    * log message to standard output.
    */
   File DEFAULT_LOG_FILE = new File("");
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#log-level">"log-level"</a> property
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL} property
    *
    * @see com.gemstone.gemfire.internal.logging.LogWriterImpl
    */
@@ -474,8 +453,7 @@ public interface DistributionConfig extends Config, LogConfig {
   int getLogLevel();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#log-level">"log-level"</a> property
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL} property
    *
    * @see com.gemstone.gemfire.internal.logging.LogWriterImpl
    */
@@ -483,93 +461,90 @@ public interface DistributionConfig extends Config, LogConfig {
   void setLogLevel(int value);
 
   /**
-   * The default log level.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL}.
    * <p> Actual value of this constant is {@link InternalLogWriter#CONFIG_LEVEL}.
    */
   int DEFAULT_LOG_LEVEL = InternalLogWriter.CONFIG_LEVEL;
   /**
-   * The minimum log level.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL}.
    * <p> Actual value of this constant is {@link InternalLogWriter#ALL_LEVEL}.
    */
   int MIN_LOG_LEVEL = InternalLogWriter.ALL_LEVEL;
   /**
-   * The maximum log level.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL}.
    * <p> Actual value of this constant is {@link InternalLogWriter#NONE_LEVEL}.
    */
   int MAX_LOG_LEVEL = InternalLogWriter.NONE_LEVEL;
 
   /**
-   * The name of the "logLevel" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL} property
    */
   // type is String because the config file contains "config", "debug", "fine" etc, not a code, but the setter/getter accepts int
   @ConfigAttribute(type = String.class)
   String LOG_LEVEL_NAME = LOG_LEVEL;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#statistic-sampling-enabled">"statistic-sampling-enabled"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLING_ENABLED}
    * property
    */
   @ConfigAttributeGetter(name = STATISTIC_SAMPLING_ENABLED)
   boolean getStatisticSamplingEnabled();
 
   /**
-   * Sets StatisticSamplingEnabled
+   * Sets {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLING_ENABLED}
    */
   @ConfigAttributeSetter(name = STATISTIC_SAMPLING_ENABLED)
   void setStatisticSamplingEnabled(boolean newValue);
 
   /**
-   * The name of the "statisticSamplingEnabled" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLING_ENABLED} property
    */
   @ConfigAttribute(type = Boolean.class)
   String STATISTIC_SAMPLING_ENABLED_NAME = STATISTIC_SAMPLING_ENABLED;
 
   /**
-   * The default value of the "statisticSamplingEnabled" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLING_ENABLED} property
    */
   boolean DEFAULT_STATISTIC_SAMPLING_ENABLED = true;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#statistic-sample-rate">"statistic-sample-rate"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}
    * property
    */
   @ConfigAttributeGetter(name = STATISTIC_SAMPLE_RATE)
   int getStatisticSampleRate();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#statistic-sample-rate">"statistic-sample-rate"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}
    * property
    */
   @ConfigAttributeSetter(name = STATISTIC_SAMPLE_RATE)
   void setStatisticSampleRate(int value);
 
   /**
-   * The default statistic sample rate.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}.
    * <p> Actual value of this constant is <code>1000</code> milliseconds.
    */
   int DEFAULT_STATISTIC_SAMPLE_RATE = 1000;
   /**
-   * The minimum statistic sample rate.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}.
    * <p> Actual value of this constant is <code>100</code> milliseconds.
    */
   int MIN_STATISTIC_SAMPLE_RATE = 100;
   /**
-   * The maximum statistic sample rate.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}.
    * <p> Actual value of this constant is <code>60000</code> milliseconds.
    */
   int MAX_STATISTIC_SAMPLE_RATE = 60000;
 
   /**
-   * The name of the "statisticSampleRate" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_STATISTIC_SAMPLE_RATE, max = MAX_STATISTIC_SAMPLE_RATE)
   String STATISTIC_SAMPLE_RATE_NAME = STATISTIC_SAMPLE_RATE;
 
   /**
-   * Returns the value of the <a href="../DistributedSystem.html#statistic-archive-file">"statistic-archive-file"</a> property.
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_ARCHIVE_FILE} property.
    *
    * @return <code>null</code> if no file was specified
    */
@@ -577,62 +552,58 @@ public interface DistributionConfig extends Config, LogConfig {
   File getStatisticArchiveFile();
 
   /**
-   * Sets the value of the <a href="../DistributedSystem.html#statistic-archive-file">"statistic-archive-file"</a> property.
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_ARCHIVE_FILE} property.
    */
   @ConfigAttributeSetter(name = STATISTIC_ARCHIVE_FILE)
   void setStatisticArchiveFile(File value);
 
   /**
-   * The name of the "statisticArchiveFile" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_ARCHIVE_FILE} property
    */
   @ConfigAttribute(type = File.class)
   String STATISTIC_ARCHIVE_FILE_NAME = STATISTIC_ARCHIVE_FILE;
 
   /**
-   * The default statistic archive file.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_ARCHIVE_FILE}.
    * <p> Actual value of this constant is <code>""</code> which
    * causes no archive file to be created.
    */
   File DEFAULT_STATISTIC_ARCHIVE_FILE = new File(""); // fix for bug 29786
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CACHE_XML_FILE}
    * property
    */
   @ConfigAttributeGetter(name = CACHE_XML_FILE)
   File getCacheXmlFile();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CACHE_XML_FILE}
    * property
    */
   @ConfigAttributeSetter(name = CACHE_XML_FILE)
   void setCacheXmlFile(File value);
 
   /**
-   * The name of the "cacheXmlFile" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CACHE_XML_FILE} property
    */
   @ConfigAttribute(type = File.class)
   String CACHE_XML_FILE_NAME = CACHE_XML_FILE;
 
   /**
-   * The default value of the "cacheXmlFile" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CACHE_XML_FILE} property
    */
   File DEFAULT_CACHE_XML_FILE = new File("cache.xml");
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#ack-wait-threshold">"ack-wait-threshold"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}
    * property
    */
   @ConfigAttributeGetter(name = ACK_WAIT_THRESHOLD)
   int getAckWaitThreshold();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#ack-wait-threshold">"ack-wait-threshold"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}
    * property
    * Setting this value too low will cause spurious alerts.
    */
@@ -640,37 +611,35 @@ public interface DistributionConfig extends Config, LogConfig {
   void setAckWaitThreshold(int newThreshold);
 
   /**
-   * The default AckWaitThreshold.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}.
    * <p> Actual value of this constant is <code>15</code> seconds.
    */
   int DEFAULT_ACK_WAIT_THRESHOLD = 15;
   /**
-   * The minimum AckWaitThreshold.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}.
    * <p> Actual value of this constant is <code>1</code> second.
    */
   int MIN_ACK_WAIT_THRESHOLD = 1;
   /**
-   * The maximum AckWaitThreshold.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}.
    * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
    */
   int MAX_ACK_WAIT_THRESHOLD = Integer.MAX_VALUE;
   /**
-   * The name of the "ackWaitThreshold" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ACK_WAIT_THRESHOLD)
   String ACK_WAIT_THRESHOLD_NAME = ACK_WAIT_THRESHOLD;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#ack-severe-alert-threshold">"ack-severe-alert-threshold"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}
    * property
    */
   @ConfigAttributeGetter(name = ACK_SEVERE_ALERT_THRESHOLD)
   int getAckSevereAlertThreshold();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#ack-severe-alert-threshold">"ack-severe-alert-threshold"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}
    * property
    * Setting this value too low will cause spurious forced disconnects.
    */
@@ -678,183 +647,174 @@ public interface DistributionConfig extends Config, LogConfig {
   void setAckSevereAlertThreshold(int newThreshold);
 
   /**
-   * The default ackSevereAlertThreshold.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}.
    * <p> Actual value of this constant is <code>0</code> seconds, which
    * turns off shunning.
    */
   int DEFAULT_ACK_SEVERE_ALERT_THRESHOLD = 0;
   /**
-   * The minimum ackSevereAlertThreshold.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}.
    * <p> Actual value of this constant is <code>0</code> second,
    * which turns off shunning.
    */
   int MIN_ACK_SEVERE_ALERT_THRESHOLD = 0;
   /**
-   * The maximum ackSevereAlertThreshold.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}.
    * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
    */
   int MAX_ACK_SEVERE_ALERT_THRESHOLD = Integer.MAX_VALUE;
   /**
-   * The name of the "ackSevereAlertThreshold" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ACK_SEVERE_ALERT_THRESHOLD)
   String ACK_SEVERE_ALERT_THRESHOLD_NAME = ACK_SEVERE_ALERT_THRESHOLD;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#archive-file-size-limit">"archive-file-size-limit"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}
    * property
    */
   @ConfigAttributeGetter(name = ARCHIVE_FILE_SIZE_LIMIT)
   int getArchiveFileSizeLimit();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#archive-file-size-limit">"archive-file-size-limit"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}
    * property
    */
   @ConfigAttributeSetter(name = ARCHIVE_FILE_SIZE_LIMIT)
   void setArchiveFileSizeLimit(int value);
 
   /**
-   * The default statistic archive file size limit.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int DEFAULT_ARCHIVE_FILE_SIZE_LIMIT = 0;
   /**
-   * The minimum statistic archive file size limit.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int MIN_ARCHIVE_FILE_SIZE_LIMIT = 0;
   /**
-   * The maximum statistic archive file size limit.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
   int MAX_ARCHIVE_FILE_SIZE_LIMIT = 1000000;
 
   /**
-   * The name of the "ArchiveFileSizeLimit" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ARCHIVE_FILE_SIZE_LIMIT, max = MAX_ARCHIVE_FILE_SIZE_LIMIT)
   String ARCHIVE_FILE_SIZE_LIMIT_NAME = ARCHIVE_FILE_SIZE_LIMIT;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#archive-disk-space-limit">"archive-disk-space-limit"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}
    * property
    */
   @ConfigAttributeGetter(name = ARCHIVE_DISK_SPACE_LIMIT)
   int getArchiveDiskSpaceLimit();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#archive-disk-space-limit">"archive-disk-space-limit"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}
    * property
    */
   @ConfigAttributeSetter(name = ARCHIVE_DISK_SPACE_LIMIT)
   void setArchiveDiskSpaceLimit(int value);
 
   /**
-   * The default archive disk space limit.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int DEFAULT_ARCHIVE_DISK_SPACE_LIMIT = 0;
   /**
-   * The minimum archive disk space limit.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int MIN_ARCHIVE_DISK_SPACE_LIMIT = 0;
   /**
-   * The maximum archive disk space limit.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
   int MAX_ARCHIVE_DISK_SPACE_LIMIT = 1000000;
 
   /**
-   * The name of the "ArchiveDiskSpaceLimit" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ARCHIVE_DISK_SPACE_LIMIT, max = MAX_ARCHIVE_DISK_SPACE_LIMIT)
   String ARCHIVE_DISK_SPACE_LIMIT_NAME = ARCHIVE_DISK_SPACE_LIMIT;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}
    * property
    */
   @ConfigAttributeGetter(name = LOG_FILE_SIZE_LIMIT)
   int getLogFileSizeLimit();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}
    * property
    */
   @ConfigAttributeSetter(name = LOG_FILE_SIZE_LIMIT)
   void setLogFileSizeLimit(int value);
 
   /**
-   * The default log file size limit.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int DEFAULT_LOG_FILE_SIZE_LIMIT = 0;
   /**
-   * The minimum log file size limit.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int MIN_LOG_FILE_SIZE_LIMIT = 0;
   /**
-   * The maximum log file size limit.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
   int MAX_LOG_FILE_SIZE_LIMIT = 1000000;
 
   /**
-   * The name of the "LogFileSizeLimit" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_LOG_FILE_SIZE_LIMIT, max = MAX_LOG_FILE_SIZE_LIMIT)
   String LOG_FILE_SIZE_LIMIT_NAME = LOG_FILE_SIZE_LIMIT;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}
    * property
    */
   @ConfigAttributeGetter(name = LOG_DISK_SPACE_LIMIT)
   int getLogDiskSpaceLimit();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}
    * property
    */
   @ConfigAttributeSetter(name = LOG_DISK_SPACE_LIMIT)
   void setLogDiskSpaceLimit(int value);
 
   /**
-   * The default log disk space limit.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int DEFAULT_LOG_DISK_SPACE_LIMIT = 0;
   /**
-   * The minimum log disk space limit.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int MIN_LOG_DISK_SPACE_LIMIT = 0;
   /**
-   * The maximum log disk space limit.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
   int MAX_LOG_DISK_SPACE_LIMIT = 1000000;
 
   /**
-   * The name of the "LogDiskSpaceLimit" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_LOG_DISK_SPACE_LIMIT, max = MAX_LOG_DISK_SPACE_LIMIT)
   String LOG_DISK_SPACE_LIMIT_NAME = LOG_DISK_SPACE_LIMIT;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#ssl-enabled">"ssl-enabled"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_ENABLED}
    * property.
    *
    * @deprecated as of 8.0 use {@link #getClusterSSLEnabled} instead.
@@ -863,7 +823,7 @@ public interface DistributionConfig extends Config, LogConfig {
   boolean getSSLEnabled();
 
   /**
-   * The default ssl-enabled state.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_ENABLED} state.
    * <p> Actual value of this constant is <code>false</code>.
    *
    * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED} instead.
@@ -871,7 +831,7 @@ public interface DistributionConfig extends Config, LogConfig {
   boolean DEFAULT_SSL_ENABLED = false;
 
   /**
-   * The name of the "SSLEnabled" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_ENABLED} property
    *
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED_NAME} instead.
    */
@@ -879,8 +839,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String SSL_ENABLED_NAME = SSL_ENABLED;
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#ssl-enabled">"ssl-enabled"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_ENABLED}
    * property.
    *
    * @deprecated as of 8.0 use {@link #setClusterSSLEnabled} instead.
@@ -889,8 +848,7 @@ public interface DistributionConfig extends Config, LogConfig {
   void setSSLEnabled(boolean enabled);
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#ssl-protocols">"ssl-protocols"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_PROTOCOLS}
    * property.
    *
    * @deprecated as of 8.0 use {@link #getClusterSSLProtocols} instead.
@@ -899,8 +857,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String getSSLProtocols();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#ssl-protocols">"ssl-protocols"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_PROTOCOLS}
    * property.
    *
    * @deprecated as of 8.0 use {@link #setClusterSSLProtocols} instead.
@@ -909,14 +866,14 @@ public interface DistributionConfig extends Config, LogConfig {
   void setSSLProtocols(String protocols);
 
   /**
-   * The default ssl-protocols value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_PROTOCOLS} value.
    * <p> Actual value of this constant is <code>any</code>.
    *
    * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS} instead.
    */
   String DEFAULT_SSL_PROTOCOLS = "any";
   /**
-   * The name of the "SSLProtocols" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_PROTOCOLS} property
    *
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS_NAME} instead.
    */
@@ -924,8 +881,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#ssl-ciphers">"ssl-ciphers"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_CIPHERS}
    * property.
    *
    * @deprecated as of 8.0 use {@link #getClusterSSLCiphers} instead.
@@ -934,8 +890,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String getSSLCiphers();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#ssl-ciphers">"ssl-ciphers"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_CIPHERS}
    * property.
    *
    * @deprecated as of 8.0 use {@link #setClusterSSLCiphers} instead.
@@ -944,14 +899,14 @@ public interface DistributionConfig extends Config, LogConfig {
   void setSSLCiphers(String ciphers);
 
   /**
-   * The default ssl-ciphers value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_CIPHERS} value.
    * <p> Actual value of this constant is <code>any</code>.
    *
    * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS} instead.
    */
   String DEFAULT_SSL_CIPHERS = "any";
   /**
-   * The name of the "SSLCiphers" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_CIPHERS} property
    *
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS_NAME} instead.
    */
@@ -959,8 +914,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String SSL_CIPHERS_NAME = SSL_CIPHERS;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#ssl-require-authentication">"ssl-require-authentication"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_REQUIRE_AUTHENTICATION}
    * property.
    *
    * @deprecated as of 8.0 use {@link #getClusterSSLRequireAuthentication} instead.
@@ -969,8 +923,7 @@ public interface DistributionConfig extends Config, LogConfig {
   boolean getSSLRequireAuthentication();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#ssl-require-authentication">"ssl-require-authentication"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_REQUIRE_AUTHENTICATION}
    * property.
    *
    * @deprecated as of 8.0 use {@link #setClusterSSLRequireAuthentication} instead.
@@ -979,14 +932,14 @@ public interface DistributionConfig extends Config, LogConfig {
   void setSSLRequireAuthentication(boolean enabled);
 
   /**
-   * The default ssl-require-authentication value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_REQUIRE_AUTHENTICATION} value.
    * <p> Actual value of this constant is <code>true</code>.
    *
    * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
    */
   boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION = true;
   /**
-   * The name of the "SSLRequireAuthentication" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_REQUIRE_AUTHENTICATION} property
    *
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME} instead.
    */
@@ -994,249 +947,231 @@ public interface DistributionConfig extends Config, LogConfig {
   String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-enabled">"cluster-ssl-enabled"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_ENABLED}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_ENABLED)
   boolean getClusterSSLEnabled();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-enabled">"cluster-ssl-enabled"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_ENABLED}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_ENABLED)
   void setClusterSSLEnabled(boolean enabled);
 
   /**
-   * The default cluster-ssl-enabled state.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_ENABLED} state.
    * <p> Actual value of this constant is <code>false</code>.
    */
   boolean DEFAULT_CLUSTER_SSL_ENABLED = false;
   /**
-   * The name of the "ClusterSSLEnabled" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_ENABLED} property
    */
   @ConfigAttribute(type = Boolean.class)
   String CLUSTER_SSL_ENABLED_NAME = CLUSTER_SSL_ENABLED;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-protocols">"cluster-ssl-protocols"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_PROTOCOLS}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_PROTOCOLS)
   String getClusterSSLProtocols();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-protocols">"cluster-ssl-protocols"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_PROTOCOLS}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_PROTOCOLS)
   void setClusterSSLProtocols(String protocols);
 
   /**
-   * The default cluster-ssl-protocols value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_PROTOCOLS} value.
    * <p> Actual value of this constant is <code>any</code>.
    */
   String DEFAULT_CLUSTER_SSL_PROTOCOLS = "any";
   /**
-   * The name of the "ClusterSSLProtocols" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_PROTOCOLS} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_PROTOCOLS_NAME = CLUSTER_SSL_PROTOCOLS;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-ciphers">"cluster-ssl-ciphers"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_CIPHERS}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_CIPHERS)
   String getClusterSSLCiphers();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-ciphers">"cluster-ssl-ciphers"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_CIPHERS}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_CIPHERS)
   void setClusterSSLCiphers(String ciphers);
 
   /**
-   * The default cluster-ssl-ciphers value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_CIPHERS} value.
    * <p> Actual value of this constant is <code>any</code>.
    */
   String DEFAULT_CLUSTER_SSL_CIPHERS = "any";
   /**
-   * The name of the "ClusterSSLCiphers" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_CIPHERS} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_CIPHERS_NAME = CLUSTER_SSL_CIPHERS;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-require-authentication">"cluster-ssl-require-authentication"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_REQUIRE_AUTHENTICATION)
   boolean getClusterSSLRequireAuthentication();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-require-authentication">"cluster-ssl-require-authentication"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_REQUIRE_AUTHENTICATION)
   void setClusterSSLRequireAuthentication(boolean enabled);
 
   /**
-   * The default cluster-ssl-require-authentication value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION} value.
    * <p> Actual value of this constant is <code>true</code>.
    */
   boolean DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION = true;
   /**
-   * The name of the "ClusterSSLRequireAuthentication" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION} property
    */
   @ConfigAttribute(type = Boolean.class)
   String CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME = CLUSTER_SSL_REQUIRE_AUTHENTICATION;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-keystore">"cluster-ssl-keystore"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE)
   String getClusterSSLKeyStore();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-keystore">"cluster-ssl-keystore"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE)
   void setClusterSSLKeyStore(String keyStore);
 
   /**
-   * The default cluster-ssl-keystore value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_KEYSTORE = "";
 
   /**
-   * The name of the "ClusterSSLKeyStore" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_KEYSTORE_NAME = CLUSTER_SSL_KEYSTORE;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-keystore-type">"cluster-ssl-keystore-type"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE_TYPE)
   String getClusterSSLKeyStoreType();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-keystore-type">"cluster-ssl-keystore-type"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE_TYPE)
   void setClusterSSLKeyStoreType(String keyStoreType);
 
   /**
-   * The default cluster-ssl-keystore-type value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_TYPE} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE = "";
 
   /**
-   * The name of the "ClusterSSLKeyStoreType" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_TYPE} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_KEYSTORE_TYPE_NAME = CLUSTER_SSL_KEYSTORE_TYPE;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-keystore-password">"cluster-ssl-keystore-password"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE_PASSWORD)
   String getClusterSSLKeyStorePassword();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-keystore-password">"cluster-ssl-keystore-password"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE_PASSWORD)
   void setClusterSSLKeyStorePassword(String keyStorePassword);
 
   /**
-   * The default cluster-ssl-keystore-password value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD = "";
 
   /**
-   * The name of the "ClusterSSLKeyStorePassword" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_PASSWORD} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_KEYSTORE_PASSWORD_NAME = CLUSTER_SSL_KEYSTORE_PASSWORD;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-truststore">"cluster-ssl-truststore"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_TRUSTSTORE)
   String getClusterSSLTrustStore();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-truststore">"cluster-ssl-truststore"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_TRUSTSTORE)
   void setClusterSSLTrustStore(String trustStore);
 
   /**
-   * The default cluster-ssl-truststore value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_TRUSTSTORE = "";
 
   /**
-   * The name of the "ClusterSSLTrustStore" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_TRUSTSTORE_NAME = CLUSTER_SSL_TRUSTSTORE;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-truststore-password">"cluster-ssl-truststore-password"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_TRUSTSTORE_PASSWORD)
   String getClusterSSLTrustStorePassword();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#cluster-ssl-truststore-password">"cluster-ssl-truststore-password"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_TRUSTSTORE_PASSWORD)
   void setClusterSSLTrustStorePassword(String trusStorePassword);
 
   /**
-   * The default cluster-ssl-truststore-password value.
+   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD = "";
 
   /**
-   * The name of the "ClusterSSLKeyStorePassword" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME = CLUSTER_SSL_TRUSTSTORE_PASSWORD;
@@ -1246,7 +1181,8 @@ public interface DistributionConfig extends Config, LogConfig {
    * com.gemstone.gemfire.i18n.LogWriterI18n} instance to log to.
    * Set this property with put(), not with setProperty()
    *
-   * @since GemFire 4.0 */
+   * @since GemFire 4.0
+   */
   String LOG_WRITER_NAME = "log-writer";
 
   /**
@@ -1255,13 +1191,15 @@ public interface DistributionConfig extends Config, LogConfig {
    * in to a ds connect.
    * Set this property with put(), not with setProperty()
    *
-   * @since GemFire 7.0 */
+   * @since GemFire 7.0
+   */
   String DS_CONFIG_NAME = "ds-config";
 
   /**
    * The name of an internal property that specifies whether
    * the distributed system is reconnecting after a forced-
    * disconnect.
+   *
    * @since GemFire 8.1
    */
   String DS_RECONNECTING_NAME = "ds-reconnecting";
@@ -1290,6 +1228,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * FileOutputStream will be closed when the distributed
    * system disconnects.  Set this property with put(), not
    * with setProperty()
+   *
    * @since GemFire 5.0
    */
   String LOG_OUTPUTSTREAM_NAME = "log-output-stream";
@@ -1305,69 +1244,65 @@ public interface DistributionConfig extends Config, LogConfig {
   String SECURITY_LOG_OUTPUTSTREAM_NAME = "security-log-output-stream";
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#socket-lease-time">"socket-lease-time"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME}
    * property
    */
   @ConfigAttributeGetter(name = SOCKET_LEASE_TIME)
   int getSocketLeaseTime();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#socket-lease-time">"socket-lease-time"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME}
    * property
    */
   @ConfigAttributeSetter(name = SOCKET_LEASE_TIME)
   void setSocketLeaseTime(int value);
 
   /**
-   * The default value of the "socketLeaseTime" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME} property
    */
   int DEFAULT_SOCKET_LEASE_TIME = 60000;
   /**
-   * The minimum socketLeaseTime.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME}.
    * <p> Actual value of this constant is <code>0</code>.
    */
   int MIN_SOCKET_LEASE_TIME = 0;
   /**
-   * The maximum socketLeaseTime.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME}.
    * <p> Actual value of this constant is <code>600000</code>.
    */
   int MAX_SOCKET_LEASE_TIME = 600000;
 
   /**
-   * The name of the "socketLeaseTime" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_SOCKET_LEASE_TIME, max = MAX_SOCKET_LEASE_TIME)
   String SOCKET_LEASE_TIME_NAME = SOCKET_LEASE_TIME;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#socket-buffer-size">"socket-buffer-size"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = SOCKET_BUFFER_SIZE)
   int getSocketBufferSize();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#socket-buffer-size">"socket-buffer-size"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = SOCKET_BUFFER_SIZE)
   void setSocketBufferSize(int value);
 
   /**
-   * The default value of the "socketBufferSize" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE} property
    */
   int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
   /**
-   * The minimum socketBufferSize.
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE}.
    * <p> Actual value of this constant is <code>1024</code>.
    */
   int MIN_SOCKET_BUFFER_SIZE = 1024;
   /**
-   * The maximum socketBufferSize.
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE}.
    * <p> Actual value of this constant is <code>20000000</code>.
    */
   int MAX_SOCKET_BUFFER_SIZE = Connection.MAX_MSG_SIZE;
@@ -1376,14 +1311,14 @@ public interface DistributionConfig extends Config, LogConfig {
   int VALIDATE_CEILING = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "validateMessageSizeCeiling", 8 * 1024 * 1024).intValue();
 
   /**
-   * The name of the "socketBufferSize" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_SOCKET_BUFFER_SIZE, max = MAX_SOCKET_BUFFER_SIZE)
   String SOCKET_BUFFER_SIZE_NAME = SOCKET_BUFFER_SIZE;
 
   /**
    * Get the value of the
-   * <a href="../DistributedSystem.html#mcast-send-buffer-size">"mcast-send-buffer-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = MCAST_SEND_BUFFER_SIZE)
@@ -1391,32 +1326,32 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * <a href="../DistributedSystem.html#mcast-send-buffer-size">"mcast-send-buffer-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_SEND_BUFFER_SIZE)
   void setMcastSendBufferSize(int value);
 
   /**
-   * The default value of the corresponding property
+   * The default value for  {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE} property
    */
   int DEFAULT_MCAST_SEND_BUFFER_SIZE = 65535;
 
   /**
-   * The minimum size of the buffer, in bytes.
+   * The minimum size of the  {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE}, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
   int MIN_MCAST_SEND_BUFFER_SIZE = 2048;
 
   /**
-   * The name of the corresponding property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MCAST_SEND_BUFFER_SIZE)
   String MCAST_SEND_BUFFER_SIZE_NAME = MCAST_SEND_BUFFER_SIZE;
 
   /**
    * Get the value of the
-   * <a href="../DistributedSystem.html#mcast-recv-buffer-size">"mcast-recv-buffer-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = MCAST_RECV_BUFFER_SIZE)
@@ -1424,32 +1359,32 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * <a href="../DistributedSystem.html#mcast-recv-buffer-size">"mcast-recv-buffer-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_RECV_BUFFER_SIZE)
   void setMcastRecvBufferSize(int value);
 
   /**
-   * The default value of the corresponding property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE} property
    */
   int DEFAULT_MCAST_RECV_BUFFER_SIZE = 1048576;
 
   /**
-   * The minimum size of the buffer, in bytes.
+   * The minimum size of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE}, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
   int MIN_MCAST_RECV_BUFFER_SIZE = 2048;
 
   /**
-   * The name of the corresponding property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MCAST_RECV_BUFFER_SIZE)
   String MCAST_RECV_BUFFER_SIZE_NAME = MCAST_RECV_BUFFER_SIZE;
 
   /**
    * Get the value of the
-   * <a href="../DistributedSystem.html#mcast-flow-control">"mcast-flow-control"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL}
    * property.
    */
   @ConfigAttributeGetter(name = MCAST_FLOW_CONTROL)
@@ -1457,57 +1392,57 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * <a href="../DistributedSystem.html#mcast-flow-control">"mcast-flow-control"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_FLOW_CONTROL)
   void setMcastFlowControl(FlowControlParams values);
 
   /**
-   * The name of the corresponding property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} property
    */
   @ConfigAttribute(type = FlowControlParams.class)
   String MCAST_FLOW_CONTROL_NAME = MCAST_FLOW_CONTROL;
 
   /**
-   * The default value of the corresponding property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} property
    */
   FlowControlParams DEFAULT_MCAST_FLOW_CONTROL
       = new FlowControlParams(1048576, (float) 0.25, 5000);
 
   /**
-   * The minimum byteAllowance for the mcast-flow-control setting of
+   * The minimum byteAllowance for the{@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
    * <code>100000</code>.
    */
   int MIN_FC_BYTE_ALLOWANCE = 10000;
 
   /**
-   * The minimum rechargeThreshold for the mcast-flow-control setting of
+   * The minimum rechargeThreshold for the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
    * <code>0.1</code>
    */
   float MIN_FC_RECHARGE_THRESHOLD = (float) 0.1;
 
   /**
-   * The maximum rechargeThreshold for the mcast-flow-control setting of
+   * The maximum rechargeThreshold for the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
    * <code>0.5</code>
    */
   float MAX_FC_RECHARGE_THRESHOLD = (float) 0.5;
 
   /**
-   * The minimum rechargeBlockMs for the mcast-flow-control setting of
+   * The minimum rechargeBlockMs for the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
    * <code>500</code>
    */
   int MIN_FC_RECHARGE_BLOCK_MS = 500;
 
   /**
-   * The maximum rechargeBlockMs for the mcast-flow-control setting of
+   * The maximum rechargeBlockMs for the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
    * <code>60000</code>
    */
   int MAX_FC_RECHARGE_BLOCK_MS = 60000;
 
   /**
    * Get the value of the
-   * <a href="../DistributedSystem.html#udp-fragment-size">"udp-fragment-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE}
    * property.
    */
   @ConfigAttributeGetter(name = UDP_FRAGMENT_SIZE)
@@ -1515,36 +1450,36 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * <a href="../DistributedSystem.html#udp-fragment-size">"udp-fragment-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = UDP_FRAGMENT_SIZE)
   void setUdpFragmentSize(int value);
 
   /**
-   * The default value of the corresponding property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE} property
    */
   int DEFAULT_UDP_FRAGMENT_SIZE = 60000;
 
   /**
-   * The minimum allowed udp-fragment-size setting of 1000
+   * The minimum allowed {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE} setting of 1000
    */
   int MIN_UDP_FRAGMENT_SIZE = 1000;
 
   /**
-   * The maximum allowed udp-fragment-size setting of 60000
+   * The maximum allowed {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE} setting of 60000
    */
   int MAX_UDP_FRAGMENT_SIZE = 60000;
 
   /**
-   * The name of the corresponding property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_UDP_FRAGMENT_SIZE, max = MAX_UDP_FRAGMENT_SIZE)
   String UDP_FRAGMENT_SIZE_NAME = UDP_FRAGMENT_SIZE;
 
   /**
    * Get the value of the
-   * <a href="../DistributedSystem.html#udp-send-buffer-size">"udp-send-buffer-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = UDP_SEND_BUFFER_SIZE)
@@ -1552,32 +1487,32 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * <a href="../DistributedSystem.html#udp-send-buffer-size">"udp-send-buffer-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = UDP_SEND_BUFFER_SIZE)
   void setUdpSendBufferSize(int value);
 
   /**
-   * The default value of the corresponding property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE} property
    */
   int DEFAULT_UDP_SEND_BUFFER_SIZE = 65535;
 
   /**
-   * The minimum size of the buffer, in bytes.
+   * The minimum size of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE}, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
   int MIN_UDP_SEND_BUFFER_SIZE = 2048;
 
   /**
-   * The name of the corresponding property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_UDP_SEND_BUFFER_SIZE)
   String UDP_SEND_BUFFER_SIZE_NAME = UDP_SEND_BUFFER_SIZE;
 
   /**
    * Get the value of the
-   * <a href="../DistributedSystem.html#udp-recv-buffer-size">"udp-recv-buffer-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = UDP_RECV_BUFFER_SIZE)
@@ -1585,59 +1520,58 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * <a href="../DistributedSystem.html#udp-recv-buffer-size">"udp-recv-buffer-size"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = UDP_RECV_BUFFER_SIZE)
   void setUdpRecvBufferSize(int value);
 
   /**
-   * The default value of the unicast receive buffer size property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE} property
    */
   int DEFAULT_UDP_RECV_BUFFER_SIZE = 1048576;
 
   /**
-   * The default size of the unicast receive buffer property if tcp/ip sockets are
+   * The default size of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE}
+   * if tcp/ip sockets are
    * enabled and multicast is disabled
    */
   int DEFAULT_UDP_RECV_BUFFER_SIZE_REDUCED = 65535;
 
   /**
-   * The minimum size of the buffer, in bytes.
+   * The minimum size of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE}, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
   int MIN_UDP_RECV_BUFFER_SIZE = 2048;
 
   /**
-   * The name of the corresponding property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_UDP_RECV_BUFFER_SIZE)
   String UDP_RECV_BUFFER_SIZE_NAME = UDP_RECV_BUFFER_SIZE;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#disable-tcp">"disable-tcp"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DISABLE_TCP}
    * property
    */
   @ConfigAttributeGetter(name = DISABLE_TCP)
   boolean getDisableTcp();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#disable-tcp">"disable-tcp"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DISABLE_TCP}
    * property.
    */
   @ConfigAttributeSetter(name = DISABLE_TCP)
   void setDisableTcp(boolean newValue);
 
   /**
-   * The name of the corresponding property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DISABLE_TCP} property
    */
   @ConfigAttribute(type = Boolean.class)
   String DISABLE_TCP_NAME = DISABLE_TCP;
 
   /**
-   * The default value of the corresponding property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DISABLE_TCP} property
    */
   boolean DEFAULT_DISABLE_TCP = false;
 
@@ -1648,73 +1582,70 @@ public interface DistributionConfig extends Config, LogConfig {
   void setEnableTimeStatistics(boolean newValue);
 
   /**
-   * Returns the value of <a
-   * href="../DistributedSystem.html#enable-time-statistics">enable-time-statistics</a>
+   * Returns the value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_TIME_STATISTICS}
    * property
    */
   @ConfigAttributeGetter(name = ENABLE_TIME_STATISTICS)
   boolean getEnableTimeStatistics();
 
   /**
-   * the name of the corresponding property
+   * the name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_TIME_STATISTICS} property
    */
   @ConfigAttribute(type = Boolean.class)
   String ENABLE_TIME_STATISTICS_NAME = ENABLE_TIME_STATISTICS;
 
   /**
-   * The default value of the corresponding property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_TIME_STATISTICS} property
    */
   boolean DEFAULT_ENABLE_TIME_STATISTICS = false;
 
   /**
    * Sets the value for
-   * <a href="../DistributedSystem.html#use-cluster-configuration">use-shared-configuration</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USE_CLUSTER_CONFIGURATION}
    */
   @ConfigAttributeSetter(name = USE_CLUSTER_CONFIGURATION)
   void setUseSharedConfiguration(boolean newValue);
 
   /**
-   * Returns the value of <a
-   * href="../DistributedSystem.html#use-cluster-configuration">use-cluster-configuration</a>
+   * Returns the value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USE_CLUSTER_CONFIGURATION}
    * property
    */
   @ConfigAttributeGetter(name = USE_CLUSTER_CONFIGURATION)
   boolean getUseSharedConfiguration();
 
   /**
-   * the name of the corresponding property
+   * the name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USE_CLUSTER_CONFIGURATION} property
    */
   @ConfigAttribute(type = Boolean.class)
   String USE_CLUSTER_CONFIGURATION_NAME = USE_CLUSTER_CONFIGURATION;
 
   /**
-   * The default value of the corresponding property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USE_CLUSTER_CONFIGURATION} property
    */
   boolean DEFAULT_USE_CLUSTER_CONFIGURATION = true;
 
   /**
    * Sets the value for
-   * <a href="../DistributedSystem.html#enable-cluster-configuration">enable-cluster-configuration</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_CLUSTER_CONFIGURATION}
    */
   @ConfigAttributeSetter(name = ENABLE_CLUSTER_CONFIGURATION)
   void setEnableClusterConfiguration(boolean newValue);
 
   /**
-   * Returns the value of <a
-   * href="../DistributedSystem.html#enable-cluster-configuration">enable-cluster-configuration</a>
+   * Returns the value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_CLUSTER_CONFIGURATION}
    * property
    */
   @ConfigAttributeGetter(name = ENABLE_CLUSTER_CONFIGURATION)
   boolean getEnableClusterConfiguration();
 
   /**
-   * the name of the corresponding property
+   * the name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_CLUSTER_CONFIGURATION} property
    */
   @ConfigAttribute(type = Boolean.class)
   String ENABLE_CLUSTER_CONFIGURATION_NAME = ENABLE_CLUSTER_CONFIGURATION;
 
   /**
-   * The default value of the corresponding property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_CLUSTER_CONFIGURATION} property
    */
   boolean DEFAULT_ENABLE_CLUSTER_CONFIGURATION = true;
 
@@ -1724,7 +1655,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of
-   * <a href="../DistributedSystem.html#cluster-configuration-dir">cluster-configuration-dir</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOAD_CLUSTER_CONFIGURATION_FROM_DIR}
    * property
    */
   @ConfigAttributeGetter(name = LOAD_CLUSTER_CONFIGURATION_FROM_DIR)
@@ -1732,7 +1663,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Sets the value of
-   * <a href="../DistributedSystem.html#cluster-configuration-dir">cluster-configuration-dir</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOAD_CLUSTER_CONFIGURATION_FROM_DIR}
    * property
    */
   @ConfigAttributeSetter(name = LOAD_CLUSTER_CONFIGURATION_FROM_DIR)
@@ -1755,13 +1686,14 @@ public interface DistributionConfig extends Config, LogConfig {
   void setEnableNetworkPartitionDetection(boolean newValue);
 
   /**
-   * Returns the value of the enable-network-partition-detection property
+   * Returns the value of the
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_NETWORK_PARTITION_DETECTION} property
    */
   @ConfigAttributeGetter(name = ENABLE_NETWORK_PARTITION_DETECTION)
   boolean getEnableNetworkPartitionDetection();
 
   /**
-   * the name of the corresponding property
+   * the name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_NETWORK_PARTITION_DETECTION} property
    */
   @ConfigAttribute(type = Boolean.class)
   String ENABLE_NETWORK_PARTITION_DETECTION_NAME = ENABLE_NETWORK_PARTITION_DETECTION;
@@ -1769,7 +1701,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Get the value of the
-   * <a href="../DistributedSystem.html#member-timeout">"member-timeout"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT}
    * property
    */
   @ConfigAttributeGetter(name = MEMBER_TIMEOUT)
@@ -1777,28 +1709,28 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * <a href="../DistributedSystem.html#member-timeout">"member-timeout"</a>
+   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT}
    * property
    */
   @ConfigAttributeSetter(name = MEMBER_TIMEOUT)
   void setMemberTimeout(int value);
 
   /**
-   * The default value of the corresponding property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT} property
    */
   int DEFAULT_MEMBER_TIMEOUT = 5000;
 
   /**
-   * The minimum member-timeout setting of 1000 milliseconds
+   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT} setting of 1000 milliseconds
    */
   int MIN_MEMBER_TIMEOUT = 10;
 
   /**
-   * The maximum member-timeout setting of 600000 millieseconds
+   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT} setting of 600000 millieseconds
    */
   int MAX_MEMBER_TIMEOUT = 600000;
   /**
-   * The name of the corresponding property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MEMBER_TIMEOUT, max = MAX_MEMBER_TIMEOUT)
   String MEMBER_TIMEOUT_NAME = MEMBER_TIMEOUT;
@@ -1815,101 +1747,97 @@ public interface DistributionConfig extends Config, LogConfig {
   void setMembershipPortRange(int[] range);
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#conserve-sockets">"conserve-sockets"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CONSERVE_SOCKETS}
    * property
    */
   @ConfigAttributeGetter(name = CONSERVE_SOCKETS)
   boolean getConserveSockets();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#conserve-sockets">"conserve-sockets"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CONSERVE_SOCKETS}
    * property.
    */
   @ConfigAttributeSetter(name = CONSERVE_SOCKETS)
   void setConserveSockets(boolean newValue);
 
   /**
-   * The name of the "conserveSockets" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CONSERVE_SOCKETS} property
    */
   @ConfigAttribute(type = Boolean.class)
   String CONSERVE_SOCKETS_NAME = CONSERVE_SOCKETS;
 
   /**
-   * The default value of the "conserveSockets" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CONSERVE_SOCKETS} property
    */
   boolean DEFAULT_CONSERVE_SOCKETS = true;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#roles">"roles"</a>
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ROLES}
    * property
    */
   @ConfigAttributeGetter(name = ROLES)
   String getRoles();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#roles">"roles"</a>
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ROLES}
    * property.
    */
   @ConfigAttributeSetter(name = ROLES)
   void setRoles(String roles);
 
   /**
-   * The name of the "roles" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ROLES} property
    */
   @ConfigAttribute(type = String.class)
   String ROLES_NAME = ROLES;
 
   /**
-   * The default value of the "roles" property
+   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ROLES} property
    */
   String DEFAULT_ROLES = "";
 
   /**
-   * The name of the "max wait time for reconnect" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_WAIT_TIME_RECONNECT} property
    */
   @ConfigAttribute(type = Integer.class)
   String MAX_WAIT_TIME_FOR_RECONNECT_NAME = MAX_WAIT_TIME_RECONNECT;
 
   /**
-   * Default value for MAX_WAIT_TIME_FOR_RECONNECT, 60,000 milliseconds.
+   * Default value for {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_WAIT_TIME_RECONNECT}, 60,000 milliseconds.
    */
   int DEFAULT_MAX_WAIT_TIME_FOR_RECONNECT = 60000;
 
   /**
-   * Sets the max wait timeout, in milliseconds, for reconnect.
+   * Sets the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_WAIT_TIME_RECONNECT}, in milliseconds, for reconnect.
    */
   @ConfigAttributeSetter(name = MAX_WAIT_TIME_RECONNECT)
   void setMaxWaitTimeForReconnect(int timeOut);
 
   /**
-   * Returns the max wait timeout, in milliseconds, for reconnect.
+   * Returns the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_WAIT_TIME_RECONNECT}, in milliseconds, for reconnect.
    */
   @ConfigAttributeGetter(name = MAX_WAIT_TIME_RECONNECT)
   int getMaxWaitTimeForReconnect();
 
   /**
-   * The name of the "max number of tries for reconnect" property.
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_NUM_RECONNECT_TRIES} property.
    */
   @ConfigAttribute(type = Integer.class)
   String MAX_NUM_RECONNECT_TRIES_NAME = MAX_NUM_RECONNECT_TRIES;
 
   /**
-   * Default value for MAX_NUM_RECONNECT_TRIES_NAME.
+   * Default value for {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_NUM_RECONNECT_TRIES}.
    */
   int DEFAULT_MAX_NUM_RECONNECT_TRIES = 3;
 
   /**
-   * Sets the max number of tries for reconnect.
+   * Sets the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_NUM_RECONNECT_TRIES}.
    */
   @ConfigAttributeSetter(name = MAX_NUM_RECONNECT_TRIES)
   void setMaxNumReconnectTries(int tries);
 
   /**
-   * Returns the value for max number of tries for reconnect.
+   * Returns the value for {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_NUM_RECONNECT_TRIES}.
    */
   @ConfigAttributeGetter(name = MAX_NUM_RECONNECT_TRIES)
   int getMaxNumReconnectTries();
@@ -1917,105 +1845,93 @@ public interface DistributionConfig extends Config, LogConfig {
   // ------------------- Asynchronous Messaging Properties -------------------
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#async-distribution-timeout">
-   * "async-distribution-timeout"</a> property.
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT} property.
    */
   @ConfigAttributeGetter(name = ASYNC_DISTRIBUTION_TIMEOUT)
   int getAsyncDistributionTimeout();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#async-distribution-timeout">
-   * "async-distribution-timeout"</a> property.
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  property.
    */
   @ConfigAttributeSetter(name = ASYNC_DISTRIBUTION_TIMEOUT)
   void setAsyncDistributionTimeout(int newValue);
 
   /**
-   * The default value of "asyncDistributionTimeout" is <code>0</code>.
+   * The default value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  is <code>0</code>.
    */
   int DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT = 0;
   /**
-   * The minimum value of "asyncDistributionTimeout" is <code>0</code>.
+   * The minimum value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  is <code>0</code>.
    */
   int MIN_ASYNC_DISTRIBUTION_TIMEOUT = 0;
   /**
-   * The maximum value of "asyncDistributionTimeout" is <code>60000</code>.
+   * The maximum value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  is <code>60000</code>.
    */
   int MAX_ASYNC_DISTRIBUTION_TIMEOUT = 60000;
 
   /**
-   * The name of the "asyncDistributionTimeout" property
+   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ASYNC_DISTRIBUTION_TIMEOUT, max = MAX_ASYNC_DISTRIBUTION_TIMEOUT)
   String ASYNC_DISTRIBUTION_TIMEOUT_NAME = ASYNC_DISTRIBUTION_TIMEOUT;
 
   /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#async-queue-timeout">
-   * "async-queue-timeout"</a> property.
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_QUEUE_TIMEOUT}  property.
    */
   @ConfigAttributeGetter(name = ASYNC_QUEUE_TIMEOUT)
   int getAsyncQueueTimeout();
 
   /**
-   * Sets the value of the <a
-   * href="../DistributedSystem.html#async-queue-timeout">
-   * "async-queue-timeout"</a> property.
+   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_QUEUE_TIMEOUT} property.
    */
   @ConfigAttributeSetter(name = ASYNC_QUEUE_TIMEOUT)
   void setAsyncQueueTimeout(int newValue);
 
   /**
-   * The default value of "asyncQueueTimeout" is <code>60000</code>.
+   * The default value of {@link com.gemstone

<TRUNCATED>


[10/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java
index 8d1fe4f..7712ff5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionClearJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
index baba67f..47de6ab 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalArguementsJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
index 4bac646..ede2214 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionIllegalCacheXMLvaluesJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
index 4c1434f..f1b638e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionTestingBase.java
@@ -20,7 +20,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
index 8993d3d..8299f9d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskStoreFactoryJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
index a54218a..6d8b27d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
index 4da2b61..9047c0c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/FixedPRSinglehopDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
index 2c7d1d4..4f11baa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
index 05340a1..e75293b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/HAOverflowMemObjectSizerDUnitTest.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
index 9b527e4..a7b0feb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/IncrementalBackupDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
index e4c4b63..f25027f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptDiskJUnitTest.java
@@ -33,7 +33,7 @@ import java.util.Properties;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
index ef7d240..fe8c209 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/InterruptsConserveSocketsFalseDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
index 5729ad5..ef4d1f2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoEnabledRegionJUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
index 57e1ee4..d8980ab 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/LIFOEvictionAlgoMemoryEnabledRegionJUnitTest.java
@@ -34,7 +34,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java
index 911f6ca..f2e9ab1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/MapInterfaceJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
index 7c16568..1f8ff40 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
index 35697d8..73eea0a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
index 639d7ea..654e45d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OfflineSnapshotJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.io.File;
 import java.io.FilenameFilter;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
index 28ddd12..c137de2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java
index 1f9aec7..12a7ea1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRConcurrentMapOpsJUnitTest.java
@@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java
index fe2ca3f..e397818 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
index 5c78048..05a98d8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
@@ -22,7 +22,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Tests PartitionedRegion DataStore currentAllocatedMemory operation.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
index b53aa5a..038c54a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionAPIConserveSocketsFalseDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
index f451b01..b12193d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
index 63c46f1..96897a1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionCacheXMLExampleDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java
index 4642133..32d7a3d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDataStoreJUnitTest.java
@@ -31,7 +31,7 @@ import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
index d43e87d..6e8a5f0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
index 40d4c49..c32e68e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
index e6be8d4..658a456 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 bf57a20..8dda088 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
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
index e47a1a8..3195b35 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopWithServerGroupDUnitTest.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
index 580133e..653595b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionTestHelper.java
@@ -26,8 +26,8 @@ import org.junit.Assert;
 import java.io.Serializable;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java
index b72a1a5..e78b8a6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PersistentPartitionedRegionJUnitTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
index 657d273..3370f6c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RegionListenerJUnitTest.java
@@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
index 69b16a6..f096255 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RemoteTransactionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java
index 0e50a43..a2fa3be 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/RunCacheInOldGemfire.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.DistributedSystem;
@@ -29,8 +29,8 @@ import com.gemstone.gemfire.internal.admin.remote.ShutdownAllRequest;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
index eae57c6..ffcca1c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/SingleHopStatsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java
index 862c7b6..5ae9be2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXManagerImplJUnitTest.java
@@ -30,8 +30,8 @@ import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java
index a05f12e..97d43ff 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TXReservationMgrJUnitTest.java
@@ -28,8 +28,8 @@ import org.junit.experimental.categories.Category;
 import java.util.Collections;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 @Category(IntegrationTest.class)
 public class TXReservationMgrJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java
index d8dd06d..3eeddf5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TombstoneCreationJUnitTest.java
@@ -32,7 +32,7 @@ import org.junit.rules.TestName;
 import java.net.InetAddress;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 @Category(IntegrationTest.class)
 public class TombstoneCreationJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java
index f3716ea..60f5b2a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/TransactionsWithDeltaDUnitTest.java
@@ -25,7 +25,6 @@ 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 com.gemstone.gemfire.Delta;
@@ -36,7 +35,6 @@ import com.gemstone.gemfire.cache.client.ClientCacheFactory;
 import com.gemstone.gemfire.cache.client.ClientRegionFactory;
 import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
 import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.execute.CustomerIDPartitionResolver;
 import com.gemstone.gemfire.internal.cache.execute.data.CustId;
@@ -53,7 +51,7 @@ import java.io.IOException;
 import java.io.Serializable;
 import java.util.Iterator;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
index a6d9d77..cea4d54 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionJUnitTest.java
@@ -30,7 +30,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
index 89f71d9..b97d848 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.control;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.lang.management.ManagementFactory;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
index 4f46dc6..ea1a9ca 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
@@ -32,7 +32,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
index e16f1ae..f11b41b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.control;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyBoolean;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
index bc4db8e..9beb798 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/MultiThreadedOplogPerJUnitPerformanceTest.java
@@ -29,7 +29,7 @@ import org.junit.rules.TestName;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 @Category(IntegrationTest.class)
 public class MultiThreadedOplogPerJUnitPerformanceTest

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
index 8a0605f..dde2ad3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/Bug51193DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.execute;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index 1c9f93f..78a2a54 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.execute;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
index f0a4604..7f62682 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/FunctionServiceStatsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.execute;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
index 6b35900..446a592 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/MemberFunctionExecutionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.execute;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.lang.reflect.Constructor;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index b84f55f..cf06ea7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.execute;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
index f490e63..6f98367 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerRegionFunctionExecutionFailoverDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.execute;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;
@@ -41,7 +41,6 @@ import com.gemstone.gemfire.cache.execute.Function;
 import com.gemstone.gemfire.cache.execute.FunctionService;
 import com.gemstone.gemfire.cache.execute.ResultCollector;
 import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.Locator;
 import com.gemstone.gemfire.internal.AvailablePort;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
index ce7ab16..368633c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRClientServerTestBase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.execute;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
index 1223690..9ed4d27 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/PRFunctionExecutionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.execute;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java
index a18ec3e..a09ffe8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/BlockingHARegionJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
index 4f76c7a..e66c7b4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug36853EventsExpiryDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
index 70bd8b4..ab603d0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48571DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java
index 2e5feec..4535461 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/Bug48879DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
index 9eb0982..c42254c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/EventIdOptimizationDUnitTest.java
@@ -37,7 +37,6 @@ import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.RegionDestroyedException;
 import com.gemstone.gemfire.cache.RegionEvent;
 import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.client.internal.Connection;
 import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -56,14 +55,9 @@ import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import com.gemstone.gemfire.test.dunit.*;
 
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * This test verifies that eventId, while being sent across the network ( client

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
index 9e59ba7..79552ee 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/FailoverDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
index c16d7a0..6fa4260 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HABugInPutDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
index 4c42a36..eb445aa 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAClearDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
index dca557c..4ce1789 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAConflationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
index 54f18cd..00d7cd5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADuplicateDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
index d45e66e..a7f3af1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAEventIdPropagationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
index 62375f9..938cd97 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HAGIIDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java
index 4bbc49f..e8bfafb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQAddOperationJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
index 340f10b..283a15f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.NetworkUtils.*;
 import static com.gemstone.gemfire.test.dunit.Wait.*;
@@ -45,7 +45,6 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.cache30.ClientServerTestCase;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.LocalRegion;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
index 6c027ea..7ad33e3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java
index 1942c75..868e39f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
index 41d776c..f6f110b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitTest.java
@@ -33,8 +33,8 @@ import org.junit.experimental.categories.Category;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.fail;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java
index aa4a0b3..b096cf3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStatsJUnitTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
 
 import java.io.IOException;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
index 1f7e63c..12ed542 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -44,7 +44,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 @Category(DistributedTest.class)
 public class HASlowReceiverDUnitTest extends JUnit4DistributedTestCase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
index 971ced1..52e1a5b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/OperationsPropagationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
index 9868c73..92a3e68 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/PutAllDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
index b7bb6c1..32490b8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/StatsBugDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java
index d939fd4..bf2fb07 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/locks/TXLockServiceDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.locks;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java
index 2e596e9..16b7ac5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/LRUClockJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.lru;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java
index 10f6b42..9d6e224 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/lru/TransactionsWithOverflowTest.java
@@ -27,8 +27,8 @@ import org.junit.rules.TestName;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Test for transactional operations on overflowed data

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
index 2dd4dc3..447b427 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug43684DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.partitioned;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java
index d46b0f5..b996ab5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug47388DUnitTest.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache.partitioned;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
index d7366eb..211e2f2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/Bug51400DUnitTest.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache.partitioned;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index ef63848..bc6fceb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.partitioned;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.jayway.awaitility.Awaitility.*;
 import static java.util.concurrent.TimeUnit.*;
 import static org.assertj.core.api.Assertions.assertThat;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
index b61cd25..15ea3ba 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/persistence/PersistentRecoveryOrderDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.persistence;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.lang.ThrowableUtils.*;
 import static org.junit.Assert.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
index 001a857..7c52a89 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImplJUnitTest.java
@@ -35,7 +35,7 @@ import java.net.BindException;
 import java.util.Collections;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)



[15/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
deleted file mode 100644
index fa5f236..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
+++ /dev/null
@@ -1,1590 +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 com.gemstone.gemfire.distributed;
-
-/**
- *
- */
-public interface DistributedSystemConfigProperties {
-  /**
-   * The static string definition of the <i>"ack-severe-alert-threshold"</i> property <a name="ack-severe-alert-threshold"/>
-   * <p>
-   * <U>Description</U>:
-   * The number of seconds the distributed
-   * system will wait after the ack-wait-threshold for a message to be
-   * acknowledged before it issues an alert at <i>severe</i> level.  The
-   * default value is zero, which turns off this feature.
-   * When ack-severe-alert-threshold is used, GemFire will also initiate
-   * additional checks to see if the process is alive.  These checks will
-   * begin when the ack-wait-threshold is reached and will continue until
-   * GemFire has been able to communicate with the process and ascertain its
-   * status.<p>
-   * <U>Default</U>: "0"
-   * <p>
-   * <U>Allowed values</U>: 0..2147483647
-   */
-  String ACK_SEVERE_ALERT_THRESHOLD = "ack-severe-alert-threshold";
-  /**
-   * The static String definition of the <i>"ack-wait-threshold"</i> property
-   * <a name="ack-wait-threshold"/a></p>
-   * <U>Description</U>: The number of seconds the distributed
-   * system will wait for a message to be acknowledged before it sends
-   * a <i>warning</i> level alert to signal that something might be wrong with the system
-   * node that is unresponsive.  After sending this alert the waiter
-   * continues to wait. The alerts are logged in the log as warnings
-   * and will cause an alert notification in the Admin API and GemFire
-   * JMX Agent.</p>
-   * <U>Default</U>: "15"</p>
-   * <U>Allowed values</U>: 1..2147483647
-   */
-  String ACK_WAIT_THRESHOLD = "ack-wait-threshold";
-  /**
-   * The static String definition of the <i>"archive-disk-space-limit"</i> property
-   * <a name="archive-disk-space-limit"/a></p>
-   * <U>Description</U>: Limits, in megabytes, how much disk space can be
-   * consumed by old inactive statistic archive files. When the limit is
-   * exceeded the oldest inactive archive is deleted.
-   * Set to zero to disable automatic archive deletion.
-   * </p>
-   * <U>Default</U>: "0"</p>
-   * <U>Allowed values</U>: 0..1000000
-   */
-  String ARCHIVE_DISK_SPACE_LIMIT = "archive-disk-space-limit";
-  /**
-   * The static String definition of the <i>"archive-file-size-limit"</i> property
-   * <a name="archive-file-size-limit"/a></p>
-   * <U>Description</U>: Limits, in megabytes, how large the current statistic archive
-   * file can grow before it is closed and archival rolls on to a new file.
-   * Set to zero to disable archive rolling.
-   * </p>
-   * <U>Default</U>: "0"</p>
-   * <U>Allowed values</U>: 0..1000000
-   */
-  String ARCHIVE_FILE_SIZE_LIMIT = "archive-file-size-limit";
-  /**
-   * The static String definition of the <i>"async-distribution-timeout"</i> property
-   * <a name="async-distribution-timeout"/a></p>
-   * <U>Description</U>: The number of milliseconds before a
-   * publishing process should attempt to distribute a cache operation
-   * before switching over to asynchronous messaging for this process.
-   * To enable asynchronous messaging, the value must be set above
-   * zero. If a thread that is publishing to the cache exceeds this value
-   * when attempting to distribute to this process, it will switch to
-   * asynchronous messaging until this process catches up, departs, or
-   * some specified limit is reached, such as <a href="#async-queue-timeout">
-   * async-queue-timeout</a> or <a href="#async-max-queue-size">
-   * async-max-queue-size</a>.
-   * </p>
-   * <U>Default</U>: "0"</p>
-   * <U>Allowed values</U>: 0..60000
-   */
-  String ASYNC_DISTRIBUTION_TIMEOUT = "async-distribution-timeout";
-  /**
-   * The static String definition of the <i>"async-max-queue-size"</i> property
-   * <a name="async-max-queue-size"/a></p>
-   * <U>Description</U>: The maximum size in megabytes that a
-   * publishing process should be allowed to asynchronously enqueue
-   * for this process before asking this process to depart from the
-   * distributed system.
-   * </p>
-   * <U>Default</U>: "8"</p>
-   * <U>Allowed values</U>: 0..1024
-   */
-  String ASYNC_MAX_QUEUE_SIZE = "async-max-queue-size";
-  /**
-   * The static String definition of the <i>"async-queue-timeout"</i> property
-   * <a name="async-queue-timeout"/a></p>
-   * <U>Description</U>: The number of milliseconds a queuing
-   * publisher may enqueue asynchronous messages without any distribution
-   * to this process before that publisher requests this process to
-   * depart. If a queuing publisher has not been able to send this process
-   * any cache operations prior to the timeout, this process will attempt
-   * to close its cache and disconnect from the distributed system.
-   * </p>
-   * <U>Default</U>: "60000"</p>
-   * <U>Allowed values</U>: 0..86400000
-   */
-  String ASYNC_QUEUE_TIMEOUT = "async-queue-timeout";
-  /**
-   * The static String definition of the <i>"bind-address"</i> property
-   * <a name="bind-address"/a><p>
-   * <U>Description</U>: The IP address that this distributed system's
-   * server sockets will listen on.
-   * If set to an empty string then the local machine's
-   * default address will be listened on.
-   * <p>
-   * <U>Default</U>: ""
-   */
-  String BIND_ADDRESS = "bind-address";
-  /**
-   * The static String definition of the <i>"cache-xml-file"</i> property
-   * <a name="cache-xml-file"/a></p>
-   * <U>Description</U>: Specifies the name of the XML file or resource
-   * to initialize the cache with when it is
-   * {@linkplain com.gemstone.gemfire.cache.CacheFactory#create created}.
-   * Create will first look for a file that matches the value of this property.
-   * If a file is not found then it will be searched for using
-   * {@link java.lang.ClassLoader#getResource}.  If the value of this
-   * property is the empty string (<code>""</code>), then the cache
-   * will not be declaratively initialized.</p>
-   * <U>Default</U>: "cache.xml"
-   */
-  String CACHE_XML_FILE = "cache-xml-file";
-  /**
-   * The static String definition of the <i>"cluster-configuration-dir"</i> property
-   * <a name="cluster-configuration-dir"/a></p>
-   * <U>Description</U>: This property specifies the directory in which the cluster configuration related disk-store and artifacts are stored
-   * This property is only applicable to dedicated locators which have "enable-cluster-configuration" set to true.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
-  /**
-   * The static String definition of the <i>"cluster-ssl-ciphers"</i> property
-   * <a name="cluster-ssl-ciphers"/a></p>
-   * <U>Description</U>: A space separated list of the SSL cipher suites to
-   * enable. Those listed must be supported by the available providers.Preferably
-   * use cluster-ssl-* properties rather than ssl-* properties.
-   * </p>
-   * <U>Default</U>: "any" </p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String CLUSTER_SSL_CIPHERS = "cluster-ssl-ciphers";
-  /**
-   * The static String definition of the <i>"cluster-ssl-enabled"</i> property
-   * <a name="cluster-ssl-enabled"/a></p>
-   * <U>Description</U>: If true, all gemfire socket communication is
-   * configured to use SSL through JSSE. Preferably Use cluster-ssl-* properties
-   * rather than ssl-* properties.
-   * </p>
-   * <U>Default</U>: "false"</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String CLUSTER_SSL_ENABLED = "cluster-ssl-enabled";
-  /**
-   * The static String definition of the <i>"cluster-ssl-keystore"</i> property
-   * <a name="cluster-ssl-keystore"/a></p>
-   * <U>Description</U>Location of the Java keystore file containing
-   * certificate and private key.</p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String CLUSTER_SSL_KEYSTORE = "cluster-ssl-keystore";
-  /**
-   * The static String definition of the <i>"cluster-ssl-keystore-password"</i> property
-   * <a name="cluster-ssl-keystore-password"/a></p>
-   * <U>Description</U>Password to access the private key from the keystore
-   * file specified by javax.net.ssl.keyStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String CLUSTER_SSL_KEYSTORE_PASSWORD = "cluster-ssl-keystore-password";
-  /**
-   * The static String definition of the <i>"cluster-ssl-keystore-type"</i> property
-   * <a name="cluster-ssl-keystore-type"/a></p>
-   * <U>Description</U>For Java keystore file format, this property has the
-   * value jks (or JKS).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String CLUSTER_SSL_KEYSTORE_TYPE = "cluster-ssl-keystore-type";
-  /**
-   * The static String definition of the <i>"cluster-ssl-protocols"</i> property
-   * <a name="cluster-ssl-protocols"/a></p>
-   * <U>Description</U>: A space separated list of the SSL protocols to
-   * enable. Those listed must be supported by the available providers.Preferably
-   * use cluster-ssl-* properties rather than ssl-* properties.
-   * </p>
-   * <U>Default</U>: "any"</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String CLUSTER_SSL_PROTOCOLS = "cluster-ssl-protocols";
-  /**
-   * The static String definition of the <i>"cluster-ssl-require-authentication"</i> property
-   * <a name="cluster-ssl-require-authentication"/a></p>
-   * <U>Description</U>: If false, allow ciphers that do not require the
-   * client side of the connection to be authenticated.Preferably use
-   * cluster-ssl-* properties rather than ssl-* properties.
-   * </p>
-   * <U>Default</U>: "true"</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String CLUSTER_SSL_REQUIRE_AUTHENTICATION = "cluster-ssl-require-authentication";
-  /**
-   * The static String definition of the <i>"cluster-ssl-truststore"</i> property
-   * <a name="cluster-ssl-truststore"/a></p>
-   * <U>Description</U>Location of the Java keystore file containing the
-   * collection of CA certificates trusted by distributed member (trust store).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String CLUSTER_SSL_TRUSTSTORE = "cluster-ssl-truststore";
-  /**
-   * The static String definition of the <i>"cluster-ssl-truststore-password"</i> property
-   * <a name="cluster-ssl-truststore-password"/a></p>
-   * <U>Description</U>Password to unlock the keystore file (store password)
-   * specified by javax.net.ssl.trustStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String CLUSTER_SSL_TRUSTSTORE_PASSWORD = "cluster-ssl-truststore-password";
-  /**
-   * The static String definition of the <i>"conflate-events"</i> property
-   * <a name="conflate-events"/a></p>
-   * <U>Description</U>: This is a client-side property that is passed to
-   * the server. Allowable values are "server", "true", and "false". With the
-   * "server" setting, this client&apos;s servers use their own client queue
-   * conflation settings. With a "true" setting, the servers disregard their
-   * own configuration and enable conflation of events for all regions for the
-   * client. A "false" setting causes the client&apos;s servers to disable
-   * conflation for all regions for the client.
-   * <U>Default</U>: "server"</p>
-   * <U>Since</U>: GemFire 5.7
-   */
-  String CONFLATE_EVENTS = "conflate-events";
-  /**
-   * The static String definition of the <i>"conserve-sockets"</i> property
-   * <a name="conserve-sockets"/a></p>
-   * <U>Description</U>: If "true" then a minimal number of sockets
-   * will be used when connecting to the distributed system. This conserves
-   * resource usage but can cause performance to suffer.
-   * If "false" then every application thread that sends
-   * distribution messages to other members of the distributed system
-   * will own its own sockets and have exclusive access to them.
-   * The length of time a thread can have exclusive access to a socket
-   * can be configured with "socket-lease-time".
-   * <U>Default</U>: "true"</p>
-   * <U>Allowed values</U>: true|false</p>
-   */
-  String CONSERVE_SOCKETS = "conserve-sockets";
-  /**
-   * The static String definition of the <i>"delta-propagation"</i> property
-   * <a name="delta-propagation">
-   * <dt>delta-propagation</dt>
-   * </a>
-   * <U>Description</U>: "true" indicates that server propagates delta
-   * generated from {@link com.gemstone.gemfire.Delta} type of objects. If "false"
-   * then server propagates full object but not delta. </p>
-   * <U>Default</U>: "true"</p>
-   * <U>Allowed values</U>: true|false
-   */
-  String DELTA_PROPAGATION = "delta-propagation";
-  /**
-   * The static String definition of the <i>"deploy-working-dir"</i> property
-   * <a name="deploy-working-dir"/a></p>
-   * <U>Description</U>: Specifies the working directory which this
-   * distributed member will use to persist deployed JAR files.  This directory
-   * should be unchanged when restarting the member so that it can read what
-   * was previously persisted. The default is the current working directory
-   * as determined by <code>System.getProperty("user.dir")</code>.
-   * </p>
-   * <U>Default</U>: <code>System.getProperty("user.dir")</code></p>
-   * <U>Since</U>: GemFire 7.0
-   */
-  String DEPLOY_WORKING_DIR = "deploy-working-dir";
-  /**
-   * The static String definition of the <i>"disable-auto-reconnect"</i> property
-   * <a name="disable-auto-reconnect"/a></p>
-   * <U>Description</U>: By default GemFire will attempt to reconnect and
-   * reinitialize the cache when it has been forced out of the distributed system
-   * by a network-partition event or has otherwise been shunned by other members.
-   * This setting will turn off this behavior.</p>
-   * <U>Default</U>: "false"
-   */
-  String DISABLE_AUTO_RECONNECT = "disable-auto-reconnect";
-  /**
-   * The static String definition of the <i>"disable-tcp"</i> property
-   * <a name="disable-tcp"/a><p>
-   * <U>Description</U>: Turns off use of tcp/ip sockets, forcing the
-   * cache to use datagram sockets for all communication.  This is useful
-   * if you have a large number of processes in the distributed cache since
-   * it eliminates the per-connection reader-thread that is otherwise required.
-   * However, udp communications are somewhat slower than tcp/ip communications
-   * due to the extra work required in Java to break messages down to
-   * transmittable sizes, and the extra work required to guarantee
-   * message delivery.
-   * <p>
-   * <U>Default</U>: "false"<p>
-   * <U>Allowed values</U>: true or false<p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String DISABLE_TCP = "disable-tcp";
-  /**
-   * The static String definition of the <i>"distributed-system-id"</i> property<p>
-   * <a name="distributed-system-id"/a>
-   * <U>Decription:</U>A number that uniquely identifies this distributed system, when
-   * using the WAN gateway to share data between multiple distributed systems. This
-   * setting is only required when using the WAN gateway in conjunction with
-   * the <b>P</b>ortable <b>D</b>ata e<b>X</b>change (PDX) serialization format.
-   * <p>
-   * If set, this setting must be the same for every member in this distributed
-   * system. It must be different than the number in other distributed systems
-   * that this one will connect to using the WAN.
-   * -1 means no setting.<p>
-   * <U>Range:</U>-1..255
-   * <p>
-   * <U>Default:</U>: "-1"
-   */
-  String DISTRIBUTED_SYSTEM_ID = "distributed-system-id";
-  /**
-   * The static String definition of the <i>"durable-client-id"</i> property
-   * <a name="durable-client-id"/a></p>
-   * <U>Description</U>: The id to be used by this durable client. When a
-   * durable client connects to a server, this id is used by the server to
-   * identify it. The server will accumulate updates for a durable client
-   * while it is disconnected and deliver these events to the client when it
-   * reconnects.
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 5.5
-   */
-  String DURABLE_CLIENT_ID = "durable-client-id";
-  /**
-   * The static String definition of the <i>"durable-client-timeout"</i> property
-   * <a name="durable-client-timeout"/a></p>
-   * <U>Description</U>: The number of seconds a disconnected durable
-   * client is kept alive and updates are accumulated for it by the server
-   * before it is terminated.
-   * <U>Default</U>: "300"</p>
-   * <U>Since</U>: GemFire 5.5
-   */
-  String DURABLE_CLIENT_TIMEOUT = "durable-client-timeout";
-  /**
-   * The static String definition of the <i>"enable-cluster-configuration"</i> property
-   * <a name="enable-cluster-configuration"/a></p>
-   * <U>Description</U>: "true" causes creation of cluster configuration service on dedicated locators. The cluster configuration service on dedicated locator(s)
-   * would serve the configuration to new members joining the distributed system and also save the configuration changes caused by the Gfsh commands.
-   * This property is only applicable to dedicated locators.
-   * </p>
-   * <U>Default</U>: "true"</p>
-   * <U>Allowed values</U>: true or false</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String ENABLE_CLUSTER_CONFIGURATION = "enable-cluster-configuration";
-  /**
-   * The static String definition of the <i>"enable-network-partition-detection"</i> property
-   * <a name="enable-network-partition-detection"/a></p>
-   * <U>Description</U>: Turns on network partitioning detection algorithms, which
-   * detect loss of quorum and shuts down losing partitions.
-   * </p>
-   * <U>Default</U>: "false"
-   */
-  String ENABLE_NETWORK_PARTITION_DETECTION = "enable-network-partition-detection";
-  /**
-   * The static String definition of the <i>"enable-time-statistics"</i> property
-   * <a name="enable-time-statistics"/a></p>
-   * <U>Description</U>: "true" causes additional time-based statistics to be
-   * gathered for gemfire operations.  This can aid in discovering
-   * where time is going in cache operations, albeit at the expense of
-   * extra clock probes on every operation.  "false" disables the additional
-   * time-based statistics.
-   * </p>
-   * <U>Default</U>: "false"</p>
-   * <U>Allowed values</U>: true or false</p>
-   * <U>Since</U>: 5.0
-   */
-  String ENABLE_TIME_STATISTICS = "enable-time-statistics";
-  /**
-   * The static String definition of the <i>"enforce-unique-host"</i> property
-   * <a name="enforce-unique-host"/a></p>
-   * <U>Description</U>: Whether or not partitioned regions will
-   * put redundant copies of the same data in different JVMs running on the same physical host.
-   * <p>
-   * By default, partitioned regions will try to put redundancy copies on different physical hosts, but it may
-   * put them on the same physical host if no other hosts are available. Setting this property to true
-   * will prevent partitions regions from ever putting redundant copies of data on the same physical host.
-   * </p>
-   * <U>Default</U>: "false"
-   */
-  String ENFORCE_UNIQUE_HOST = "enforce-unique-host";
-  /**
-   * The static String definition of the <i>"gateway-ssl-ciphers"</i> property
-   * <a name="gateway-ssl-ciphers"/a></p>
-   * <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: <code>any</code></p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers";
-  /**
-   * The static String definition of the <i>"gateway-ssl-enabled"</i> property
-   * <a name="gateway-ssl-enabled"/a></p>
-   * <U>Description</U>: Specifies if gateway is started with separate ssl configuration.
-   * If not specified global property ssl-enabled (and its other related properties) are used
-   * to create gateway socket
-   * </p>
-   * <U>Default</U>: <code>false</code></p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled";
-  /**
-   * The static String definition of the <i>"gateway-ssl-keystore"</i> property
-   * <a name="gateway-ssl-keystore"/a></p>
-   * <U>Description</U>Location of the Java keystore file containing
-   * certificate and private key.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore";
-  /**
-   * The static String definition of the <i>"gateway-ssl-keystore-password"</i> property
-   * <a name="gateway-ssl-keystore-password"/a></p>
-   * <U>Description</U>Password to access the private key from the keystore
-   * file specified by javax.net.ssl.keyStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password";
-  /**
-   * The static String definition of the <i>"gateway-ssl-keystore-type"</i> property
-   * <a name="gateway-ssl-keystore-type"/a></p>
-   * <U>Description</U>For Java keystore file format, this property has the
-   * value jks (or JKS).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type";
-  /**
-   * The static String definition of the <i>"gateway-ssl-protocols"</i> property
-   * <a name="gateway-ssl-protocols"/a></p>
-   * <U>Description</U>: A space seperated list of the SSL protocols to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: <code>any</code></p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols";
-  /**
-   * The static String definition of the <i>"gateway-ssl-require-authentication"</i> property
-   * <a name="gateway-ssl-require-authentication"/a></p>
-   * <U>Description</U>: If false, allow ciphers that do not require the Gateway Sender
-   * side of the connection to be authenticated.
-   * </p>
-   * <U>Default</U>: <code>any</code></p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication";
-  /**
-   * The static String definition of the <i>"gateway-ssl-truststore"</i> property
-   * <a name="gateway-ssl-truststore"/a></p>
-   * <U>Description</U>Location of the Java keystore file containing the
-   * collection of CA certificates trusted by server (trust store).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore";
-  /**
-   * The static String definition of the <i>"gateway-ssl-truststore-password"</i> property
-   * <a name="gateway-ssl-truststore-password"/a></p>
-   * <U>Description</U>: Password to unlock the keystore file (store password)
-   * specified by javax.net.ssl.trustStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password";
-  /**
-   * The static String definition of the <i>"groups"</i> property.
-   * <a name="groups"/a> <p>
-   * <U>Description</U>: Defines the list of groups this member belongs to.
-   * Use commas to separate group names.
-   * Note that anything defined by the deprecated roles gemfire property will also be considered a group.
-   * <p>
-   * <U>Default</U>: ""
-   * <p>
-   * <U>Since</U>: GemFire 7.0
-   */
-  String GROUPS = "groups";
-  /**
-   * The static String definition of the <i>"http-service-bind-address"</i> property
-   * <a name="http-service-bind-address"/a></p>
-   * <U>Description</U>: The address where the GemFire HTTP service will listen
-   * for remote connections. One can use this property to configure what ip
-   * address or host name the HTTP service will listen on. When not set, by
-   * default the HTTP service will listen on the local host's address.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String HTTP_SERVICE_BIND_ADDRESS = "http-service-bind-address";
-  /**
-   * The static String definition of the <i>"http-service-port"</i> property
-   * <a name="http-service-port"/a></p>
-   * <U>Description</U>: Specifies the port used by the GemFire HTTP service. If
-   * configured with non-zero value, then an HTTP service will listen on this port.
-   * A value of "0" disables Gemfire HTTP service.
-   * </p>
-   * <U>Default</U>: "7070" </p>
-   * <U>Allowed values</U>: 0..65535</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String HTTP_SERVICE_PORT = "http-service-port";
-  /**
-   * The static String definition of the <i>"http-service-ssl-ciphers"</i> property
-   * <a name="http-service-ssl-ciphers"/a></p>
-   * <U>Description</U>: A space separated list of the SSL cipher suites to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: <code>any</code></p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers";
-  /**
-   * The static String definition of the <i>"http-service-ssl-enabled"</i> property
-   * a name="http-service-ssl-enabled"/a></p>
-   * <U>Description</U>: Specifies if http service is started with separate ssl configuration.
-   * If not specified, global property cluster-ssl-enabled (and its other related properties) are used
-   * to secure http service. All http-service-ssl-* properties are inherited from cluster-ssl-* properties.
-   * User can ovverride them using specific http-service-ssl-* property.
-   * </p>
-   * <U>Default</U>: <code>false</code></p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled";
-  /**
-   * The static String definition of the <i>"http-service-ssl-keystore"</i> property
-   * <a name="http-service-ssl-keystore"/a></p>
-   * <U>Description</U>: Location of the Java keystore file containing
-   * certificate and private key.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore";
-  /**
-   * The static String definition of the <i>"http-service-ssl-keystore-password"</i> property
-   * <a name="http-service-ssl-keystore-password"/a></p>
-   * <U>Description</U>: Password to access the private key from the keystore
-   * file specified by javax.net.ssl.keyStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password";
-  /**
-   * The static String definition of the <i>"http-service-ssl-keystore-type"</i> property
-   * <a name="http-service-ssl-keystore-type"/a></p>
-   * <U>Description</U>: For Java keystore file format, this property has the
-   * value jks (or JKS).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type";
-  /**
-   * The static String definition of the <i>"http-service-ssl-protocols"</i> property
-   * <a name="http-service-ssl-protocols"/a></p>
-   * <U>Description</U>: A space separated list of the SSL protocols to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: <code>any</code></p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols";
-  /**
-   * The static String definition of the <i>"http-service-ssl-require-authentication"</i> property
-   * <a name="http-service-ssl-require-authentication"/a></p>
-   * <U>Description</U>: If false, allow ciphers that do not require the client
-   * side of the connection to be authenticated.
-   * </p>
-   * <U>Default</U>: <code>false</code></p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication";
-  /**
-   * The static String definition of the <i>"http-service-ssl-truststore"</i> property
-   * <a name="http-service-ssl-truststore"/a></p>
-   * <U>Description</U>: Location of the Java keystore file containing the
-   * collection of CA certificates trusted by server (trust store).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore";
-  /**
-   * The static String definition of the <i>"http-service-ssl-truststore-password"</i> property
-   * <a name="http-service-ssl-truststore-password"/a></p>
-   * <U>Description</U>: Password to unlock the keystore file (store password)
-   * specified by javax.net.ssl.trustStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.1
-   */
-  String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password";
-  /**
-   * The static String definition of the <i>"jmx-manager"</i> property
-   * <a name="jmx-manager"/a></p>
-   * <U>Description</U>: If true then this member is willing to be a jmx-manager.
-   * All the other jmx-manager properties will be used when it does become a manager.
-   * If this property is false then all other jmx-manager properties are ignored.
-   * </p>
-   * <U>Default</U>: "false except on locators"
-   */
-  String JMX_MANAGER = "jmx-manager";
-  /**
-   * The static String definition of the <i>"jmx-manager-access-file"</i> property
-   * <a name="jmx-manager-access-file"/a></p>
-   * <U>Description</U>: By default the jmx-manager will allow full access to all mbeans by any client.
-   * If this property is set to the name of a file then it can restrict clients to only being able to read
-   * mbeans; they will not be able to modify mbeans. The access level can be configured differently in this
-   * file for each user name defined in the password file.
-   * For more information about the format of this file see Oracle's documentation of the
-   * com.sun.management.jmxremote.access.file system property.
-   * Ignored if jmx-manager is false or if jmx-manager-port is zero.
-   * </p>
-   * <U>Default</U>: ""
-   */
-  String JMX_MANAGER_ACCESS_FILE = "jmx-manager-access-file";
-  /**
-   * The static String definition of the <i>"jmx-manager-bind-address"</i> property
-   * <a name="jmx-manager-bind-address"/a></p>
-   * <U>Description</U>: By default the jmx-manager when configured with a port will listen
-   * on all the local host's addresses. You can use this property to configure what ip address
-   * or host name the jmx-manager will listen on. In addition, if the embedded http server is
-   * started, it will also bind to this address if it is set.
-   * Ignored if jmx-manager is false or jmx-manager-port is zero.
-   * </p>
-   * <U>Default</U>: ""
-   */
-  String JMX_MANAGER_BIND_ADDRESS = "jmx-manager-bind-address";
-  /**
-   * The static String definition of the <i>"jmx-manager-hostname-for-clients"</i> property
-   * <a name="jmx-manager-hostname-for-clients"/a></p>
-   * <U>Description</U>: Lets you control what hostname will be given to clients that ask
-   * the locator for the location of a jmx manager. By default the ip address that the jmx-manager
-   * reports is used. But for clients on a different network this property allows you to configure
-   * a different hostname that will be given to clients.
-   * Ignored if jmx-manager is false or jmx-manager-port is zero.
-   * </p>
-   * <U>Default</U>: ""
-   */
-  String JMX_MANAGER_HOSTNAME_FOR_CLIENTS = "jmx-manager-hostname-for-clients";
-  /**
-   * The static String definition of the <i>"jmx-manager-http-port"</i> property
-   * <a name="jmx-manager-http-port"/a></p>
-   * <U>Description</U>: If non-zero then when the jmx manager is started, an embedded
-   * web server will also be started and will listen on this port.
-   * The web server is used to host the GemFire Pulse application.
-   * If you are hosting the Pulse web app in your own web server, then disable
-   * this embedded server by setting this property to zero.
-   * Ignored if jmx-manager is false.
-   * </p>
-   * <U>Default</U>: "7070"</p>
-   * <U>Deprecated</U>: as of GemFire8.0 use <a href="#http-service-port"><code>http-service-port</code></a> instead.
-   *
-   * @deprecated as of GemFire 8.0 use {@link #HTTP_SERVICE_PORT} instead.
-   */
-  String JMX_MANAGER_HTTP_PORT = "jmx-manager-http-port";
-  /**
-   * The static String definition of the <i>"jmx-manager-password-file"</i> property
-   * <a name="jmx-manager-password-file"/a></p>
-   * <U>Description</U>: By default the jmx-manager will allow clients without credentials to connect.
-   * If this property is set to the name of a file then only clients that connect with credentials that
-   * match an entry in this file will be allowed.
-   * Most JVMs require that the file is only readable by the owner.
-   * For more information about the format of this file see Oracle's documentation of the
-   * com.sun.management.jmxremote.password.file system property.
-   * Ignored if jmx-manager is false or if jmx-manager-port is zero.
-   * </p>
-   * <U>Default</U>: ""
-   */
-  String JMX_MANAGER_PASSWORD_FILE = "jmx-manager-password-file";
-  /**
-   * The static String definition of the <i>"jmx-manager-port"</i> property
-   * <a name="jmx-manager-port"/a></p>
-   * <U>Description</U>: The port this jmx manager will listen to for client connections.
-   * If this property is set to zero then GemFire will not allow remote client connections
-   * but you can alternatively use the standard system properties supported by the JVM
-   * for configuring access from remote JMX clients.
-   * Ignored if jmx-manager is false.
-   * </p>
-   * <U>Default</U>: "1099"
-   */
-  String JMX_MANAGER_PORT = "jmx-manager-port";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl"</i> property
-   * <a name="jmx-manager-ssl"/a></p>
-   * <U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
-   * will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
-   * but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
-   * without needing to configure it for the other GemFire connections.
-   * Ignored if jmx-manager is false.
-   * </p>
-   * <U>Default</U>: "false"</p>
-   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#jmx-manager-ssl-enabled"><code>jmx-manager-ssl-enabled</code></a> instead.
-   *
-   * @deprecated as of GemFire 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead.
-   */
-  String JMX_MANAGER_SSL = "jmx-manager-ssl";
-  /**
-   * The static String definition of the <i>"jmx-manager-start"</i> property
-   * <a name="jmx-manager-start"/a></p>
-   * <U>Description</U>: If true then this member will start a jmx manager when
-   * it creates a cache. Management tools like gfsh can be configured to connect
-   * to the jmx-manager. In most cases you should not set this because a jmx manager will
-   * automatically be started when needed on a member that sets "jmx-manager" to true.
-   * Ignored if jmx-manager is false.
-   * </p>
-   * <U>Default</U>: "false"
-   */
-  String JMX_MANAGER_START = "jmx-manager-start";
-  /**
-   * The static String definition of the <i>"jmx-manager-update-rate"</i> property
-   * <a name="jmx-manager-update-rate"/a></p>
-   * <U>Description</U>: The rate, in milliseconds, at which this member will push updates
-   * to any jmx managers. Currently this value should be greater than or equal to the
-   * statistic-sample-rate. Setting this value too high will cause stale values to be
-   * seen by gfsh and pulse.
-   * </p>
-   * <U>Default</U>: "2000"
-   */
-  String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl-ciphers"</i> property
-   * <a name="jmx-manager-ssl-ciphers"/a></p>
-   * <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: "any"
-   */
-  String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl-enabled"</i> property
-   * <a name="jmx-manager-ssl-enabled"/a></p>
-   * <U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
-   * will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
-   * but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
-   * without needing to configure it for the other GemFire connections.
-   * Ignored if jmx-manager is false.
-   * </p>
-   * <U>Default</U>: "false"
-   */
-  String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl-keystore"</i> property
-   * <a name="jmx-manager-ssl-keystore"/a></p>
-   * <U>Description</U>: Location of the Java keystore file containing
-   * certificate and private key.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl-keystore-password"</i> property
-   * <a name="jmx-manager-ssl-keystore-password"/a></p>
-   * <U>Description</U>: Password to access the private key from the keystore
-   * file specified by javax.net.ssl.keyStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl-keystore-type"</i> property
-   * <a name="jmx-manager-ssl-keystore-type"/a></p>
-   * <U>Description</U>: For Java keystore file format, this property has the
-   * value jks (or JKS).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl-protocols"</i> property
-   * <a name="jmx-manager-ssl-protocols"/a></p>
-   * <U>Description</U>: A space seperated list of the SSL protocols to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: "any"
-   */
-  String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl-require-authentication"</i> property
-   * <a name="jmx-manager-ssl-require-authentication"/a></p>
-   * <U>Description</U>: If false, allow ciphers that do not require the client
-   * side of the connection to be authenticated.
-   * </p>
-   * <U>Default</U>: "true"
-   */
-  String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl-truststore"</i> property
-   * <a name="jmx-manager-ssl-truststore"/a></p>
-   * <U>Description</U>: Location of the Java keystore file containing the
-   * collection of CA certificates trusted by manager (trust store).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore";
-  /**
-   * The static String definition of the <i>"jmx-manager-ssl-truststore-password"</i> property
-   * <a name="jmx-manager-ssl-truststore-password"/a></p>
-   * <U>Description</U>: Password to unlock the keystore file (store password)
-   * specified by javax.net.ssl.trustStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password";
-  String LICENCE_APPLICATION_CACHE = "license-application-cache";
-  String LICENCE_DATA_MANAGEMENT = "license-data-management";
-  String LICENCE_SERVER_TIMEOUT = "license-server-timeout";
-  String LICENCE_WORKING_DIR = "license-working-dir";
-  /**
-   * The static String definition of the <i>"load-cluster-configuration-from-dir"</i> property
-   * <a name="load-cluster-configuration-from-dir"/a></p>
-   * <U>Description</U>: "true" causes loading of cluster configuration from "cluster_config" directory in the locator.
-   * This property is only applicable to dedicated locators which have "enable-cluster-configuration" set to true.
-   * </p>
-   * <U>Default</U>: "false"</p>
-   * <U>Allowed values</U>: true or false</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String LOAD_CLUSTER_CONFIGURATION_FROM_DIR = "load-cluster-configuration-from-dir";
-  /**
-   * The static String definition of the <i>"locator-wait-time"</i> property
-   * <a name="locator-wait-time"/a><p>
-   * <U>Description</U>: The number of seconds to wait for a locator to start
-   * if one is not available when attempting to join the distributed system.  This
-   * setting can be used when locators and peers are being started all at once in
-   * order to have the peers be patient and wait for the locators to finish starting
-   * up before attempting to join the distributed system..<p>
-   * <p>
-   * <U>Default</U>: "0"
-   */
-  String LOCATOR_WAIT_TIME = "locator-wait-time";
-  /**
-   * The static String definition of the <i>"locators"</i> property
-   * <a name="locators"/a><p>
-   * <U>Description</U>: A list of locators (host and port) that
-   * are used to find other member of the distributed system.  This
-   * attribute's value is a possibly empty comma separated list.  Each
-   * element must be of the form "hostName[portNum]" and may be of the
-   * form "host:bindAddress[port]" if a specific bind address is to be
-   * used on the locator machine.  The square
-   * brackets around the portNum are literal character and must be
-   * specified.<p>
-   * Since IPv6 bind addresses may contain colons, you may use an at symbol
-   * instead of a colon to separate the host name and bind address.
-   * For example, "server1@fdf0:76cf:a0ed:9449::5[12233]" specifies a locator
-   * running on "server1" and bound to fdf0:76cf:a0ed:9449::5 on port 12233.<p>
-   * If "locators" is empty
-   * then this distributed system will be isolated from all other GemFire
-   * processes.<p>
-   * <p>
-   * <U>Default</U>: ""
-   */
-  String LOCATORS = "locators";
-  /**
-   * The static String definition of the <i>"log-disk-space-limit"</i> property
-   * <a name="log-disk-space-limit"/a></p>
-   * <U>Description</U>: Limits, in megabytes, how much disk space can be
-   * consumed by old inactive log files. When the limit is
-   * exceeded the oldest inactive log file is deleted.
-   * Set to zero to disable automatic log file deletion.
-   * </p>
-   * <U>Default</U>: "0"</p>
-   * <U>Allowed values</U>: 0..1000000
-   */
-  String LOG_DISK_SPACE_LIMIT = "log-disk-space-limit";
-  /**
-   * The static String definition of the <i>"log-file"</i> property
-   * <a name="log-file"/a></p>
-   * <U>Description</U>: Name of the file to write logging
-   * messages to.  If the file name if "" (default) then messages are
-   * written to standard out.
-   * </p>
-   * <U>Default</U>: ""
-   */
-  String LOG_FILE = "log-file";
-  /**
-   * The static String definition of the <i>"log-file-size-limit"</i> property
-   * <a name="log-file-size-limit"/a></p>
-   * <U>Description</U>: Limits, in megabytes, how large the current log
-   * file can grow before it is closed and logging rolls on to a new file.
-   * Set to zero to disable log rolling.
-   * </p>
-   * <U>Default</U>: "0"</p>
-   * <U>Allowed values</U>: 0..1000000
-   */
-  String LOG_FILE_SIZE_LIMIT = "log-file-size-limit";
-  /**
-   * The static String definition of the <i>"log-level"</i> property
-   * <a name="log-level"/a></p>
-   * <U>Description</U>:The type of log messages that will
-   * actually write to the log file.
-   * </p>
-   * <U>Default</U>: "config"</p>
-   * <U>Allowed values</U>: all|finest|finer|fine|config|info|warning|severe|none
-   */
-  String LOG_LEVEL = "log-level";
-  /**
-   * The static String definition of the <i>"max-num-reconnect-tries"</i> property
-   * <a name="max-num-reconnect-tries"/a></p>
-   * <U>Description</U>: Specifies the maximum number or times to attempt
-   * to reconnect to the distributed system when required roles are missing.
-   * This does not apply to reconnect attempts due to a forced disconnect.
-   * </p>
-   * <U>Deprecated</U>: this setting is scheduled to be removed.</p>
-   * <U>Default</U>: "3"</p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String MAX_NUM_RECONNECT_TRIES = "max-num-reconnect-tries";
-  /**
-   * The static String definition of the <i>"max-wait-time-reconnect"</i> property
-   * <a name="max-wait-time-reconnect"/a></p>
-   * <U>Description</U>: Specifies the time in milliseconds to wait before each reconnect attempt when
-   * a member of the distributed system is forced out of the system and auto-reconnect
-   * is enabled (see <a href="#disable-auto-reconnect"><code>disable-auto-reconnect</code></a>) or if the deprecated required-roles
-   * feature is being used and a role-loss has triggered a shutdown and reconnect.
-   * </p>
-   * <U>Default</U>: "60000"</p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String MAX_WAIT_TIME_RECONNECT = "max-wait-time-reconnect";
-  /**
-   * The static String definition of the <i>"mcast-address"</i> property
-   * <a name="mcast-address"/a><p>
-   * <U>Description</U>: The IP address used for multicast
-   * networking.  If mcast-port is zero, then mcast-address is
-   * ignored.
-   * <p>
-   * <U>Default</U>: "239.192.81.1"
-   */
-  String MCAST_ADDRESS = "mcast-address";
-  /**
-   * The static String definition of the <i>"mcast-flow-control"</i> property
-   * <a name="mcast-flow-control"/a><p>
-   * <U>Description</U>: Configures the flow-of-control protocol for
-   * multicast messaging.  There are three settings that are separated
-   * by commas:  byteAllowance (integer), rechargeThreshold (float) and
-   * rechargeBlockMs (integer).  The byteAllowance determines how many bytes
-   * can be sent without a recharge from other processes.  The rechargeThreshold
-   * tells receivers how low the sender's initial to remaining allowance
-   * ratio should be before sending a recharge.  The rechargeBlockMs
-   * tells the sender how long to wait for a recharge before explicitly
-   * requesting one.<p>
-   * <U>Deprecated</U>: as of 9.0 GemFire does not include a flow-of-control protocol for multicast messaging.<p>
-   * <U>Default</U>: "1048576,0.25,5000"<p>
-   * <U>Allowed values</U>: 100000-maxInt, 0.1-0.5, 500-60000<p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String MCAST_FLOW_CONTROL = "mcast-flow-control";
-  /**
-   * The static String definition of the <i>"mcast-port"</i> property
-   * <a name="mcast-port"/a><p>
-   * <U>Description</U>: The port used for multicast networking.
-   * If zero, then multicast will be disabled and unicast messaging will
-   * be used.
-   * <p>
-   * <U>Default</U>: "0"
-   */
-  String MCAST_PORT = "mcast-port";
-  /**
-   * The static String definition of the <i>"mcast-recv-buffer-size"</i> property
-   * <a name="mcast-recv-buffer-size"/a><p>
-   * <U>Description</U>: Sets the size of the socket buffer used for
-   * incoming multicast transmissions.  You should set this high if there will be
-   * high volumes of messages.
-   * <U>Default</U>: "1048576"<p>
-   * <U>Allowed values</U>: 2048..Operating System maximum<p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String MCAST_RECV_BUFFER_SIZE = "mcast-recv-buffer-size";
-  /**
-   * The static String definition of the <i>"mcast-send-buffer-size"</i> property
-   * <a name="mcast-send-buffer-size"/a><p>
-   * <U>Description</U>: Sets the size of the socket buffer used for
-   * outgoing multicast transmissions.
-   * <U>Default</U>: "65535"<p>
-   * <U>Allowed values</U>: 2048..Operating System maximum<p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String MCAST_SEND_BUFFER_SIZE = "mcast-send-buffer-size";
-  /**
-   * The static String definition of the <i>"mcast-ttl"</i> property
-   * <a name="mcast-ttl"/a><p>
-   * <U>Description</U>: Determines how far through your network
-   * the multicast packets used by GemFire will propagate.
-   * <U>Default</U>: "32"<p>
-   * <U>Allowed values</U>: 0..255<p>
-   * <U>Since</U>: GemFire 4.1
-   */
-  String MCAST_TTL = "mcast-ttl";
-  /**
-   * The static String definition of the <i>"member-timeout"</i> property
-   * <a name="member-timeout"/a><p>
-   * <U>Description</U>: Sets the timeout interval, in milliseconds, used
-   * to determine whether another process is alive or not.  When another process
-   * appears to be gone, GemFire sends it an ARE-YOU-DEAD message and waits
-   * for the member-timeout period for it to respond and declare it is not dead.
-   * <p>
-   * <U>Default</U>: "5000"<p>
-   * <U>Allowed values</U>: 1000-600000<p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String MEMBER_TIMEOUT = "member-timeout";
-  /**
-   * The static String definition of the <i>"membership-port-range"</i> property
-   * <a name="membership-port-range"/a><p>
-   * <U>Description</U>: The allowed range of ports for use in forming an
-   * unique membership identifier (UDP), for failure detection purposes (TCP) and
-   * to listen on for peer connections (TCP). This range is given as two numbers
-   * separated by a minus sign. Minimum 3 values in range are required to
-   * successfully startup.
-   * <p>
-   * <U>Default</U>: 1024-65535
-   */
-  String MEMBERSHIP_PORT_RANGE = "membership-port-range";
-  /**
-   * The static String definition of the <i>"memcached-bind-address"</i> property
-   * <a name="memcached-bind-address"/a></p>
-   * <U>Description</U>: Specifies the bind address used by {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer}</p>
-   * <U>Default</U>: ""
-   */
-  String MEMCACHED_BIND_ADDRESS = "memcached-bind-address";
-  /**
-   * The static String definition of the <i>"memcached-port"</i> property
-   * <a name="memcached-port"/a></p>
-   * <U>Description</U>: Specifies the port used by {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer}
-   * which enables memcached clients to connect and store data in GemFire distributed system.
-   * see {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer} for other configuration options.</p>
-   * <U>Default</U>: "0" disables GemFireMemcachedServer</p>
-   * <U>Allowed values</U>: 0..65535
-   */
-  String MEMCACHED_PORT = "memcached-port";
-  /**
-   * The static String definition of the <i>"memcached-protocol"</i> property
-   * <a name="memcached-protocol"/a></p>
-   * <U>Description</U>: Specifies the protocol used by {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer}</p>
-   * <U>Default</U>: "ASCII"</p>
-   * <U>Allowed values</U>: "ASCII" "BINARY"
-   */
-  String MEMCACHED_PROTOCOL = "memcached-protocol";
-  /**
-   * The static string definition of the <i>"name"</i> property
-   * <a name="name"><p>
-   * <U>Description</U>: Uniquely identifies a member in its distributed system.
-   * If two members with the same name try to join the same distributed system
-   * then the second join will fail.<p>
-   * <U>Default</U>: ""
-   */
-  String NAME = "name";
-  /**
-   * The static String definition of the <i>"redundancy-zone"</i> property
-   * <a name="redundancy-zone"/a></p>
-   * <u>Description</u>: Defines the redundancy zone from this member. If this property is set, partitioned
-   * regions will not put two redundant copies of data in two members with the same redundancy zone setting.
-   * </p>
-   * <u>Default</u>: ""
-   */
-  String REDUNDANCY_ZONE = "redundancy-zone";
-  /**
-   * The static String definition of the <i>"remote-locators"</i> property
-   * <a name="remote-locators"/a><p>
-   * <U>Description</U>: A list of locators (host and port) that a cluster
-   * will use in order to connect to a remote site in a multi-site (WAN)
-   * configuration. This attribute's value is a possibly comma separated list.
-   * <p>For each remote locator, provide a hostname and/or address
-   * (separated by '@', if you use both), followed by a port number in brackets.
-   * <p>Examples:
-   * remote-locators=address1[port1],address2[port2]
-   * <p>
-   * remote-locators=hostName1@address1[port1],hostName2@address2[port2]
-   * <p>
-   * remote-locators=hostName1[port1],hostName2[port2]<p>
-   * <p>
-   * <U>Default</U>: ""
-   */
-  String REMOTE_LOCATORS = "remote-locators";
-  /**
-   * The static String definition of the <i>"remove-unresponsive-client"</i>
-   * property
-   */
-  String REMOVE_UNRESPONSIVE_CLIENT = "remove-unresponsive-client";
-  /**
-   * The static String definition of the <i>"roles"</i> property
-   * <a name="roles"/a></p>
-   * <U>Description</U>: Specifies the application roles that this member
-   * performs in the distributed system. This is a comma delimited list of
-   * user-defined strings. Any number of members can be configured to perform
-   * the same role, and a member can be configured to perform any number of
-   * roles.
-   * Note that anything defined by the groups gemfire property will also be considered a role.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 5.0</p>
-   * <U>Deprecated</U>: This feature is scheduled to be removed.
-   *
-   * @deprecated : This feature is scheduled to be removed.
-   */
-  String ROLES = "roles";
-  /**
-   * The static String definition of the security prefix "security-" used in conjunction with other security-* properties</i> property
-   * <a name="security-"/a></p>
-   * <U>Description</U>: Mechanism to define client credentials.
-   * All tags with "security-" prefix is packaged together as security properties
-   * and passed as an argument to getCredentials of Authentication module.
-   * These tags cannot have null values.
-   * </p>
-   * <U>Default</U>: Optional</p>
-   * <U>Allowed values</U>: any string
-   */
-  String SECURITY_PREFIX = "security-";
-  /**
-   * The static String definition of the <i>"security-client-accessor"</i>
-   * property
-   */
-  String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor";
-  /**
-   * The static String definition of the <i>"security-client-accessor-pp"</i>
-   * property
-   */
-  String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp";
-  /**
-   * The static String definition of the <i>"security-client-auth-init"</i> property
-   * <a name="security-client-auth-init"/a></p>
-   * <U>Description</U>: Authentication module name for Clients that requires to act
-   * upon credentials read from the gemfire.properties file.
-   * Module must implement AuthInitialize interface.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Allowed values</U>: jar file:class name
-   */
-  String SECURITY_CLIENT_AUTH_INIT = SECURITY_PREFIX + "client-auth-init";
-  /**
-   * The static String definition of the <i>"security-client-authenticator"</i>
-   * property
-   */
-  String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + "client-authenticator";
-  /**
-   * The static String definition of the <i>"security-client-dhalgo"</i>
-   * property
-   */
-  String SECURITY_CLIENT_DHALGO = SECURITY_PREFIX + "client-dhalgo";
-  /**
-   * The static String definition of the <i>"security-log-file"</i>
-   * property
-   */
-  String SECURITY_LOG_FILE = SECURITY_PREFIX + "log-file";
-  /**
-   * The static String definition of the <i>"security-log-level"</i>
-   * property
-   */
-  String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level";
-  /**
-   * The static String definition of the <i>"security-peer-auth-init"</i>
-   * property
-   */
-  String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init";
-  /**
-   * The static String definition of the <i>"security-peer-authenticator"</i>
-   * property
-   */
-  String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator";
-  /**
-   * The static String definition of the <i>"security-peer-verifymember-timeout"</i>
-   * property
-   */
-  String SECURITY_PEER_VERIFY_MEMBER_TIMEOUT = SECURITY_PREFIX + "peer-verifymember-timeout";
-  /**
-   * The static String definition of the <i>"server-bind-address"</i> property
-   * <a name="server-bind-address"/a><p>
-   * <U>Description</U>: The IP address that this distributed system's
-   * server sockets in a client-server topology will listen on.
-   * If set to an empty string then all of the local machine's
-   * addresses will be listened on.
-   * <p>
-   * <U>Default</U>: ""
-   */
-  String SERVER_BIND_ADDRESS = "server-bind-address";
-  /**
-   * The static String definition of the <i>"server-ssl-ciphers"</i> property
-   * <a name="server-ssl-ciphers"/a></p>
-   * <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: <code>any</code></p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String SERVER_SSL_CIPHERS = "server-ssl-ciphers";
-  /**
-   * The static String definition of the <i>"server-ssl-enabled"</i> property
-   * <a name="server-ssl-enabled"/a></p>
-   * <U>Description</U>: Specifies if server is started with separate ssl configuration.
-   * If not specified global property ssl-enabled (and its other related properties) are used
-   * to create server socket
-   * </p>
-   * <U>Default</U>: <code>false</code></p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String SERVER_SSL_ENABLED = "server-ssl-enabled";
-  /**
-   * The static String definition of the <i>"server-ssl-keystore"</i> property
-   * <a name="server-ssl-keystore"/a></p>
-   * <U>Description</U>: Location of the Java keystore file containing
-   * certificate and private key.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String SERVER_SSL_KEYSTORE = "server-ssl-keystore";
-  /**
-   * The static String definition of the <i>"server-ssl-keystore-password"</i> property
-   * <a name="server-ssl-keystore-password"/a></p>
-   * <U>Description</U>: Password to access the private key from the keystore
-   * file specified by javax.net.ssl.keyStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password";
-  /**
-   * The static String definition of the <i>"server-ssl-keystore-type"</i> property
-   * <a name="server-ssl-keystore-type"/a></p>
-   * <U>Description</U>: For Java keystore file format, this property has the
-   * value jks (or JKS).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type";
-  /**
-   * The static String definition of the <i>"server-ssl-protocols"</i> property
-   * <a name="server-ssl-protocols"/a></p>
-   * <U>Description</U>: A space seperated list of the SSL protocols to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: <code>any</code></p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String SERVER_SSL_PROTOCOLS = "server-ssl-protocols";
-  /**
-   * The static String definition of the <i>"server-ssl-require-authentication"</i> property
-   * <a name="server-ssl-require-authentication"/a></p>
-   * <U>Description</U>: If false, allow ciphers that do not require the client
-   * side of the connection to be authenticated.
-   * </p>
-   * <U>Default</U>: <code>any</code></p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication";
-  /**
-   * The static String definition of the <i>"server-ssl-truststore"</i> property
-   * <a name="server-ssl-truststore"/a></p>
-   * <U>Description</U>: Location of the Java keystore file containing the
-   * collection of CA certificates trusted by server (trust store).
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore";
-  /**
-   * The static String definition of the <i>"server-ssl-truststore-password"</i> property
-   * <a name="server-ssl-truststore-password"/a></p>
-   * <U>Description</U>: Password to unlock the keystore file (store password)
-   * specified by javax.net.ssl.trustStore.
-   * </p>
-   * <U>Default</U>: ""</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password";
-  /**
-   * The static String definition of the <i>"socket-buffer-size"</i> property
-   * <a name="socket-buffer-size"/a></p>
-   * <U>Description</U>: The size of each socket buffer, in bytes.
-   * Smaller buffers conserve memory. Larger buffers can improve performance;
-   * in particular if large messages are being sent.
-   * <U>Default</U>: "32768"</p>
-   * <U>Allowed values</U>: 128..16777215</p>
-   * <U>Since</U>: GemFire 4.1
-   */
-  String SOCKET_BUFFER_SIZE = "socket-buffer-size";
-  /**
-   * The static String definition of the <i>"socket-lease-time"</i> property
-   * <a name="socket-lease-time"/a></p>
-   * <U>Description</U>: The number of milliseconds a thread
-   * can keep exclusive access to a socket that it is not actively using.
-   * Once a thread loses its lease to a socket it will need to re-acquire
-   * a socket the next time it sends a message.
-   * A value of zero causes socket leases to never expire.
-   * This property is ignored if "conserve-sockets" is true.
-   * <U>Default</U>: "15000"</p>
-   * <U>Allowed values</U>: 0..600000</p>
-   * <U>Since</U>: GemFire 4.1
-   */
-  String SOCKET_LEASE_TIME = "socket-lease-time";
-  /**
-   * The static String definition of the <i>"start-dev-rest-api"</i> property
-   * <a name="start-dev-rest-api"/a></p>
-   * <U>Description</U>: If true then developer(API) REST service will be
-   * started when cache is created. REST service can be configured using
-   * <code>http-service-port</code> and <code>http-service-bind-address</code>
-   * properties.</p>
-   * <U>Default</U>: "false"</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String START_DEV_REST_API = "start-dev-rest-api";
-  /**
-   * The static String definition of the <i>"start-locator"</i> property
-   * <a name="start-locator"/a></p>
-   * <U>Description</U>: A host name or bind-address and port
-   * ("host[port],peer=<true|false>,server=<true|false>")
-   * that are used to start a locator in the same process as the DistributedSystem.
-   * The locator is started when the DistributedSystem connects,
-   * and is stopped when the DistributedSystem disconnects.  To start a
-   * locator that is not tied to the DistributedSystem's lifecycle, see
-   * the {@link Locator} class in this same package.<p>
-   * <p>
-   * The peer and server parameters are optional. They specify whether
-   * the locator can be used for peers to discover each other, or for clients
-   * to discover peers. By default both are true.
-   * </p>
-   * <U>Default</U>: "" (doesn't start a locator)
-   */
-  String START_LOCATOR = "start-locator";
-  /**
-   * The static String definition of the <i>"statistic-archive-file"</i> property
-   * <a name="statistic-archive-file"/a></p>
-   * <U>Description</U>: The file that statistic samples are
-   * written to.  An empty string (default) disables statistic
-   * archival.
-   * </p>
-   * <U>Default</U>: ""
-   */
-  String STATISTIC_ARCHIVE_FILE = "statistic-archive-file";
-  /**
-   * The static String definition of the <i>"statistic-sample-rate"</i> property
-   * <a name="statistic-sample-rate"/a></p>
-   * <U>Description</U>: The rate, in milliseconds, at which samples
-   * of the statistics will be taken.
-   * If set to a value less than 1000 the rate will be set to 1000 because
-   * the VSD tool does not support sub-second sampling.
-   * </p>
-   * <U>Default</U>: "1000"</p>
-   * <U>Allowed values</U>: 100..60000
-   */
-  String STATISTIC_SAMPLE_RATE = "statistic-sample-rate";
-  /**
-   * The static String definition of the <i>"statistic-sampling-enabled"</i> property
-   * <a name="statistic-sampling-enabled"/a></p>
-   * <U>Description</U>: "true" causes the statistics to be
-   * sampled periodically and operating system statistics to be
-   * fetched each time a sample is taken.  "false" disables sampling
-   * which also disables operating system statistic collection.  Non
-   * OS statistics will still be recorded in memory and can be viewed
-   * by administration tools.  However, charts will show no activity
-   * and no statistics will be archived while sampling is
-   * disabled.
-   * Starting in 7.0 the default value has been changed to true.
-   * If statistic sampling is disabled it will also cause various
-   * metrics seen in gfsh and pulse to always be zero.
-   * </p>
-   * <U>Default</U>: "true"</p>
-   * <U>Allowed values</U>: true|false
-   */
-  String STATISTIC_SAMPLING_ENABLED = "statistic-sampling-enabled";
-  /**
-   * The static String definition of the <i>"tcp-port"</i> property
-   * <a name="tcp-port"/a><p>
-   * <U>Description</U>: A 16-bit integer that determines the tcp/ip port number to listen on
-   * for cache communications.  If zero, the operating system will select
-   * an available port to listen on.  Each process on a machine must have
-   * its own tcp-port.  Note that some operating systems restrict the range
-   * of ports usable by non-privileged users, and using restricted port
-   * numbers can cause runtime errors in GemFire startup.
-   * <p>
-   * <U>Default</U>: "0"<p>
-   * <U>Allowed values</U>: 0..65535<p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String TCP_PORT = "tcp-port";
-  /**
-   * The static String definition of the <i>"udp-fragment-size"</i> property
-   * <a name="udp-fragment-size"/a><p>
-   * <U>Description</U>: When messages are sent over datagram sockets,
-   * GemFire breaks large messages down into fragments for transmission.
-   * This property sets the maximum fragment size for transmission.
-   * <U>Default</U>: "60000"<p>
-   * <U>Allowed values</U>: 1000..60000<p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String UDP_FRAGMENT_SIZE = "udp-fragment-size";
-  /**
-   * The static String definition of the <i>"udp-recv-buffer-size"</i> property
-   * <a name="udp-recv-buffer-size"/a><p>
-   * <U>Description</U>: Sets the size of the socket buffer used for
-   * incoming udp point-to-point transmissions.  Note: if multicast is not
-   * enabled and disable-tcp is not enabled, a reduced default size of
-   * 65535 is used.
-   * <U>Default</U>: "1048576 if multicast is enabled or disable-tcp is true, 131071 if not"<p>
-   * <U>Allowed values</U>: 2048..Operating System maximum<p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String UDP_RECV_BUFFER_SIZE = "udp-recv-buffer-size";
-  /**
-   * The static String definition of the <i>"udp-send-buffer-size"</i> property
-   * <a name="udp-send-buffer-size"/a><p>
-   * <U>Description</U>: Sets the size of the socket buffer used for
-   * outgoing udp point-to-point transmissions.
-   * <U>Default</U>: "65535"<p>
-   * <U>Allowed values</U>: 2048..Operating System maximum<p>
-   * <U>Since</U>: GemFire 5.0
-   */
-  String UDP_SEND_BUFFER_SIZE = "udp-send-buffer-size";
-  /**
-   * The static String definition of the <i>"use-cluster-configuration"</i> property
-   * <a name="use-cluster-configuration"/a></p>
-   * <U>Description</U>: This property is only applicable for data members (non client and non locator)
-   * "true" causes a member to request and uses the configuration from cluster configuration services running on dedicated locators.
-   * "false" causes a member to not request the configuration from the configuration services running on the locator(s).
-   * </p>
-   * <U>Default</U>: "true"</p>
-   * <U>Allowed values</U>: true or false</p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String USE_CLUSTER_CONFIGURATION = "use-cluster-configuration";
-  /**
-   * The static String definition of the <i>"user-command-packages"</i> property
-   * <a name="user-command-packages"/a></p>
-   * <U>Description</U>: A comma separated list of Java packages that
-   * contain classes implementing the <code>CommandMarker</code> interface.
-   * Matching classes will be loaded when the VM starts and will be available
-   * in the GFSH command-line utility.
-   * </p>
-   * <U>Default</U>: <code>""</code></p>
-   * <U>Since</U>: GemFire 8.0
-   */
-  String USER_COMMAND_PACKAGES = "user-command-packages";
-  /**
-   * The static String definition of the <i>"off-heap-memory-size"</i> property
-   * <a name="off-heap-memory-size"/a></p>
-   * <U>Description</U>: The total size of off-heap memory specified as
-   * off-heap-memory-size=<n>[g|m]. <n> is the size. [g|m] indicates
-   * whether the size should be interpreted as gigabytes or megabytes.
-   * By default no off-heap memory is allocated.
-   * A non-zero value will cause that much memory to be allocated from the operating
-   * system and reserved for off-heap use.
-   * </p>
-   * <U>Default</U>: <code>""</code></p>
-   * <U>Since</U>: Geode 1.0
-   */
-  String OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size";
-  /**
-   * The static String definition of the <i>"redis-port"</i> property
-   * <a name="redis-port"/a></p>
-   * <U>Description</U>: Specifies the port used by {@link com.gemstone.gemfire.redis.GemFireRedisServer}
-   * which enables redis clients to connect and store data in GemFire distributed system.
-   * see {@link com.gemstone.gemfire.redis.GemFireRedisServer} for other configuration options.</p>
-   * <U>Default</U>: "0" disables GemFireMemcachedServer</p>
-   * <U>Allowed values</U>: 0..65535
-   */
-  String REDIS_PORT = "redis-port";
-  /**
-   * The static String definition of the <i>"redis-bind-address"</i> property
-   * <a name="redis-bind-address"/a></p>
-   * <U>Description</U>: Specifies the bind address used by {@link com.gemstone.gemfire.redis.GemFireRedisServer}</p>
-   * <U>Default</U>: ""
-   */
-  String REDIS_BIND_ADDRESS = "redis-bind-address";
-  /**
-   * The static String definition of the <i>"redis-password"</i> property
-   * <a name="redis-password"/a></p>
-   * <U>Description</U>: Specifies the password to authenticate a client of {@link com.gemstone.gemfire.redis.GemFireRedisServer}</p>
-   * <U>Default</U>: ""
-   */
-  String REDIS_PASSWORD = "redis-password";
-  /**
-   * The static String definition of the <i>"lock-memory"</i> property
-   * <a name="lock-memory"/a></p>
-   * <U>Description</U>: Include this option to lock GemFire heap and off-heap memory pages into RAM.
-   * This prevents the operating system from swapping the pages out to disk, which can cause sever
-   * performance degradation. When you use this command, also configure the operating system limits for
-   * locked memory.
-   * </p>
-   * <U>Default</U>: <code>"false"</code></p>
-   * <U>Since</U>: Geode 1.0
-   */
-  String LOCK_MEMORY = "lock-memory";
-  /**
-   * The static String definition of the <i>"shiro-init"</i> property
-   */
-  String SECURITY_SHIRO_INIT = SECURITY_PREFIX + "shiro-init";
-  /**
-   * The static String definition of the <i>"distributed-transactions"</i> property
-   */
-  String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
-  /**
-   * The static String definition of the <i>"ssl-enabled"</i> property
-   * <a name="ssl-enabled"/a></p>
-   * <U>Description</U>: If true, all gemfire socket communication is
-   * configured to use SSL through JSSE.
-   * </p>
-   * <U>Default</U>: "false"</p>
-   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-enabled"><code>cluster-ssl-enabled</code></a> instead.
-   *
-   * @deprecated as of Gemfire 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
-   */
-  String SSL_ENABLED = "ssl-enabled";
-  /**
-   * The static String definition of the <i>"ssl-protocols"</i> property
-   * <a name="ssl-protocols"/a></p>
-   * <U>Description</U>: A space separated list of the SSL protocols to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: "any"</p>
-   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-protocols"><code>cluster-ssl-protocols</code></a> instead.
-   *
-   * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
-   */
-  String SSL_PROTOCOLS = "ssl-protocols";
-  /**
-   * The static String definition of the <i>"ssl-ciphers"</i> property
-   * <a name="ssl-ciphers"/a></p>
-   * <U>Description</U>: A space separated list of the SSL cipher suites to enable.
-   * Those listed must be supported by the available providers.
-   * </p>
-   * <U>Default</U>: "any"</p>
-   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-ciphers"><code>cluster-ssl-ciphers</code></a> instead.
-   *
-   * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
-   */
-  String SSL_CIPHERS = "ssl-ciphers";
-  /**
-   * The static String definition of the <i>"ssl-require-authentication"</i> property
-   * <a name="ssl-require-authentication"/a></p>
-   * <U>Description</U>: If false, allow ciphers that do not require the client
-   * side of the connection to be authenticated.
-   * </p>
-   * <U>Default</U>: "true"</p>
-   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-require-authentication"><code>cluster-ssl-require-authentication</code></a> instead.
-   *
-   * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
-   */
-  String SSL_REQUIRE_AUTHENTICATION = "ssl-require-authentication";
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
index 22814a5..1b7316a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
@@ -17,7 +17,7 @@
 
 package com.gemstone.gemfire.distributed;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusResponse;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
index e4fe16c..8f30390 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
@@ -17,7 +17,7 @@
 
 package com.gemstone.gemfire.distributed;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.SystemFailure;
 import com.gemstone.gemfire.cache.Cache;
@@ -60,7 +60,7 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SERVER_BIND_ADDRESS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.SERVER_BIND_ADDRESS;
 
 /**
  * The ServerLauncher class is a launcher class with main method to start a GemFire Server (implying a GemFire Cache

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 015f340..c7eca0f 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
@@ -32,7 +32,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Provides an implementation of <code>DistributionConfig</code> that


[04/17] incubator-geode git commit: GEODE-1377: Refactoring as per review comments

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
index d80a3e8..fa5f236 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
@@ -16,369 +16,839 @@
  */
 package com.gemstone.gemfire.distributed;
 
-
+/**
+ *
+ */
 public interface DistributedSystemConfigProperties {
   /**
-   * The static definition of the <a href="DistributedSystem.html#ack-severe-alert-threshold">"ack-severe-alert-threshold"</a>
-   * property
+   * The static string definition of the <i>"ack-severe-alert-threshold"</i> property <a name="ack-severe-alert-threshold"/>
+   * <p>
+   * <U>Description</U>:
+   * The number of seconds the distributed
+   * system will wait after the ack-wait-threshold for a message to be
+   * acknowledged before it issues an alert at <i>severe</i> level.  The
+   * default value is zero, which turns off this feature.
+   * When ack-severe-alert-threshold is used, GemFire will also initiate
+   * additional checks to see if the process is alive.  These checks will
+   * begin when the ack-wait-threshold is reached and will continue until
+   * GemFire has been able to communicate with the process and ascertain its
+   * status.<p>
+   * <U>Default</U>: "0"
+   * <p>
+   * <U>Allowed values</U>: 0..2147483647
    */
   String ACK_SEVERE_ALERT_THRESHOLD = "ack-severe-alert-threshold";
   /**
-   * The static definition of the <a href="DistributedSystem.html#ack-wait-threshold">"ack-wait-threshold"</a>
-   * property
+   * The static String definition of the <i>"ack-wait-threshold"</i> property
+   * <a name="ack-wait-threshold"/a></p>
+   * <U>Description</U>: The number of seconds the distributed
+   * system will wait for a message to be acknowledged before it sends
+   * a <i>warning</i> level alert to signal that something might be wrong with the system
+   * node that is unresponsive.  After sending this alert the waiter
+   * continues to wait. The alerts are logged in the log as warnings
+   * and will cause an alert notification in the Admin API and GemFire
+   * JMX Agent.</p>
+   * <U>Default</U>: "15"</p>
+   * <U>Allowed values</U>: 1..2147483647
    */
   String ACK_WAIT_THRESHOLD = "ack-wait-threshold";
   /**
-   * The static definition of the <a href="DistributedSystem.html#archive-disk-space-limit">"archive-disk-space-limit"</a>
-   * property
+   * The static String definition of the <i>"archive-disk-space-limit"</i> property
+   * <a name="archive-disk-space-limit"/a></p>
+   * <U>Description</U>: Limits, in megabytes, how much disk space can be
+   * consumed by old inactive statistic archive files. When the limit is
+   * exceeded the oldest inactive archive is deleted.
+   * Set to zero to disable automatic archive deletion.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..1000000
    */
   String ARCHIVE_DISK_SPACE_LIMIT = "archive-disk-space-limit";
   /**
-   * The static definition of the <a href="DistributedSystem.html#archive-file-size-limit">"archive-file-size-limit"</a>
-   * property
+   * The static String definition of the <i>"archive-file-size-limit"</i> property
+   * <a name="archive-file-size-limit"/a></p>
+   * <U>Description</U>: Limits, in megabytes, how large the current statistic archive
+   * file can grow before it is closed and archival rolls on to a new file.
+   * Set to zero to disable archive rolling.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..1000000
    */
   String ARCHIVE_FILE_SIZE_LIMIT = "archive-file-size-limit";
   /**
-   * The static definition of the <a href="DistributedSystem.html#async-distribution-timeout">"async-distribution-timeout"</a>
-   * property
+   * The static String definition of the <i>"async-distribution-timeout"</i> property
+   * <a name="async-distribution-timeout"/a></p>
+   * <U>Description</U>: The number of milliseconds before a
+   * publishing process should attempt to distribute a cache operation
+   * before switching over to asynchronous messaging for this process.
+   * To enable asynchronous messaging, the value must be set above
+   * zero. If a thread that is publishing to the cache exceeds this value
+   * when attempting to distribute to this process, it will switch to
+   * asynchronous messaging until this process catches up, departs, or
+   * some specified limit is reached, such as <a href="#async-queue-timeout">
+   * async-queue-timeout</a> or <a href="#async-max-queue-size">
+   * async-max-queue-size</a>.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..60000
    */
   String ASYNC_DISTRIBUTION_TIMEOUT = "async-distribution-timeout";
   /**
-   * The static definition of the <a href="DistributedSystem.html#async-max-queue-size">"async-max-queue-size"</a>
-   * property
+   * The static String definition of the <i>"async-max-queue-size"</i> property
+   * <a name="async-max-queue-size"/a></p>
+   * <U>Description</U>: The maximum size in megabytes that a
+   * publishing process should be allowed to asynchronously enqueue
+   * for this process before asking this process to depart from the
+   * distributed system.
+   * </p>
+   * <U>Default</U>: "8"</p>
+   * <U>Allowed values</U>: 0..1024
    */
   String ASYNC_MAX_QUEUE_SIZE = "async-max-queue-size";
   /**
-   * The static definition of the <a href="DistributedSystem.html#async-queue-timeout">"async-queue-timeout"</a>
-   * property
+   * The static String definition of the <i>"async-queue-timeout"</i> property
+   * <a name="async-queue-timeout"/a></p>
+   * <U>Description</U>: The number of milliseconds a queuing
+   * publisher may enqueue asynchronous messages without any distribution
+   * to this process before that publisher requests this process to
+   * depart. If a queuing publisher has not been able to send this process
+   * any cache operations prior to the timeout, this process will attempt
+   * to close its cache and disconnect from the distributed system.
+   * </p>
+   * <U>Default</U>: "60000"</p>
+   * <U>Allowed values</U>: 0..86400000
    */
   String ASYNC_QUEUE_TIMEOUT = "async-queue-timeout";
   /**
-   * The static definition of the <a href="DistributedSystem.html#bind-address">"bind-address"</a>
-   * property
+   * The static String definition of the <i>"bind-address"</i> property
+   * <a name="bind-address"/a><p>
+   * <U>Description</U>: The IP address that this distributed system's
+   * server sockets will listen on.
+   * If set to an empty string then the local machine's
+   * default address will be listened on.
+   * <p>
+   * <U>Default</U>: ""
    */
   String BIND_ADDRESS = "bind-address";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
-   * property
+   * The static String definition of the <i>"cache-xml-file"</i> property
+   * <a name="cache-xml-file"/a></p>
+   * <U>Description</U>: Specifies the name of the XML file or resource
+   * to initialize the cache with when it is
+   * {@linkplain com.gemstone.gemfire.cache.CacheFactory#create created}.
+   * Create will first look for a file that matches the value of this property.
+   * If a file is not found then it will be searched for using
+   * {@link java.lang.ClassLoader#getResource}.  If the value of this
+   * property is the empty string (<code>""</code>), then the cache
+   * will not be declaratively initialized.</p>
+   * <U>Default</U>: "cache.xml"
    */
   String CACHE_XML_FILE = "cache-xml-file";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-configuration-dir">"cluster-configuration-dir"</a>
-   * property
+   * The static String definition of the <i>"cluster-configuration-dir"</i> property
+   * <a name="cluster-configuration-dir"/a></p>
+   * <U>Description</U>: This property specifies the directory in which the cluster configuration related disk-store and artifacts are stored
+   * This property is only applicable to dedicated locators which have "enable-cluster-configuration" set to true.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
    */
   String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-ciphers">"cluster-ssl-ciphers"</a>
-   * property
+   * The static String definition of the <i>"cluster-ssl-ciphers"</i> property
+   * <a name="cluster-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space separated list of the SSL cipher suites to
+   * enable. Those listed must be supported by the available providers.Preferably
+   * use cluster-ssl-* properties rather than ssl-* properties.
+   * </p>
+   * <U>Default</U>: "any" </p>
+   * <U>Since</U>: GemFire 8.0
    */
   String CLUSTER_SSL_CIPHERS = "cluster-ssl-ciphers";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-enabled">"cluster-ssl-enabled"</a>
-   * property
+   * The static String definition of the <i>"cluster-ssl-enabled"</i> property
+   * <a name="cluster-ssl-enabled"/a></p>
+   * <U>Description</U>: If true, all gemfire socket communication is
+   * configured to use SSL through JSSE. Preferably Use cluster-ssl-* properties
+   * rather than ssl-* properties.
+   * </p>
+   * <U>Default</U>: "false"</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String CLUSTER_SSL_ENABLED = "cluster-ssl-enabled";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore">"cluster-ssl-keystore"</a>
-   * property
+   * The static String definition of the <i>"cluster-ssl-keystore"</i> property
+   * <a name="cluster-ssl-keystore"/a></p>
+   * <U>Description</U>Location of the Java keystore file containing
+   * certificate and private key.</p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String CLUSTER_SSL_KEYSTORE = "cluster-ssl-keystore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore-password">"cluster-ssl-keystore-password"</a>
-   * property
+   * The static String definition of the <i>"cluster-ssl-keystore-password"</i> property
+   * <a name="cluster-ssl-keystore-password"/a></p>
+   * <U>Description</U>Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String CLUSTER_SSL_KEYSTORE_PASSWORD = "cluster-ssl-keystore-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore-type">"cluster-ssl-keystore-type"</a>
-   * property
+   * The static String definition of the <i>"cluster-ssl-keystore-type"</i> property
+   * <a name="cluster-ssl-keystore-type"/a></p>
+   * <U>Description</U>For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String CLUSTER_SSL_KEYSTORE_TYPE = "cluster-ssl-keystore-type";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-protocols">"cluster-ssl-protocols"</a>
-   * property
+   * The static String definition of the <i>"cluster-ssl-protocols"</i> property
+   * <a name="cluster-ssl-protocols"/a></p>
+   * <U>Description</U>: A space separated list of the SSL protocols to
+   * enable. Those listed must be supported by the available providers.Preferably
+   * use cluster-ssl-* properties rather than ssl-* properties.
+   * </p>
+   * <U>Default</U>: "any"</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String CLUSTER_SSL_PROTOCOLS = "cluster-ssl-protocols";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-require-authentication">"cluster-ssl-require-authentication"</a>
-   * property
+   * The static String definition of the <i>"cluster-ssl-require-authentication"</i> property
+   * <a name="cluster-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the
+   * client side of the connection to be authenticated.Preferably use
+   * cluster-ssl-* properties rather than ssl-* properties.
+   * </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String CLUSTER_SSL_REQUIRE_AUTHENTICATION = "cluster-ssl-require-authentication";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-truststore">"cluster-ssl-truststore"</a>
-   * property
+   * The static String definition of the <i>"cluster-ssl-truststore"</i> property
+   * <a name="cluster-ssl-truststore"/a></p>
+   * <U>Description</U>Location of the Java keystore file containing the
+   * collection of CA certificates trusted by distributed member (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String CLUSTER_SSL_TRUSTSTORE = "cluster-ssl-truststore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-truststore-password">"cluster-ssl-truststore-password"</a>
-   * property
+   * The static String definition of the <i>"cluster-ssl-truststore-password"</i> property
+   * <a name="cluster-ssl-truststore-password"/a></p>
+   * <U>Description</U>Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String CLUSTER_SSL_TRUSTSTORE_PASSWORD = "cluster-ssl-truststore-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#conflate-events">"conflate-events"</a>
-   * property
+   * The static String definition of the <i>"conflate-events"</i> property
+   * <a name="conflate-events"/a></p>
+   * <U>Description</U>: This is a client-side property that is passed to
+   * the server. Allowable values are "server", "true", and "false". With the
+   * "server" setting, this client&apos;s servers use their own client queue
+   * conflation settings. With a "true" setting, the servers disregard their
+   * own configuration and enable conflation of events for all regions for the
+   * client. A "false" setting causes the client&apos;s servers to disable
+   * conflation for all regions for the client.
+   * <U>Default</U>: "server"</p>
+   * <U>Since</U>: GemFire 5.7
    */
   String CONFLATE_EVENTS = "conflate-events";
   /**
-   * The static definition of the <a href="DistributedSystem.html#conserve-sockets">"conserve-sockets"</a>
-   * property
+   * The static String definition of the <i>"conserve-sockets"</i> property
+   * <a name="conserve-sockets"/a></p>
+   * <U>Description</U>: If "true" then a minimal number of sockets
+   * will be used when connecting to the distributed system. This conserves
+   * resource usage but can cause performance to suffer.
+   * If "false" then every application thread that sends
+   * distribution messages to other members of the distributed system
+   * will own its own sockets and have exclusive access to them.
+   * The length of time a thread can have exclusive access to a socket
+   * can be configured with "socket-lease-time".
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true|false</p>
    */
   String CONSERVE_SOCKETS = "conserve-sockets";
   /**
-   * The static definition of the <a href="DistributedSystem.html#delta-propagation">"delta-propagation"</a>
-   * property
+   * The static String definition of the <i>"delta-propagation"</i> property
+   * <a name="delta-propagation">
+   * <dt>delta-propagation</dt>
+   * </a>
+   * <U>Description</U>: "true" indicates that server propagates delta
+   * generated from {@link com.gemstone.gemfire.Delta} type of objects. If "false"
+   * then server propagates full object but not delta. </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true|false
    */
   String DELTA_PROPAGATION = "delta-propagation";
   /**
-   * The static definition of the <a href="DistributedSystem.html#deploy-working-dir">"deploy-working-dir"</a>
-   * property
+   * The static String definition of the <i>"deploy-working-dir"</i> property
+   * <a name="deploy-working-dir"/a></p>
+   * <U>Description</U>: Specifies the working directory which this
+   * distributed member will use to persist deployed JAR files.  This directory
+   * should be unchanged when restarting the member so that it can read what
+   * was previously persisted. The default is the current working directory
+   * as determined by <code>System.getProperty("user.dir")</code>.
+   * </p>
+   * <U>Default</U>: <code>System.getProperty("user.dir")</code></p>
+   * <U>Since</U>: GemFire 7.0
    */
   String DEPLOY_WORKING_DIR = "deploy-working-dir";
   /**
-   * The static definition of the <a href="DistributedSystem.html#disable-auto-reconnect">"disable-auto-reconnect"</a>
-   * property
+   * The static String definition of the <i>"disable-auto-reconnect"</i> property
+   * <a name="disable-auto-reconnect"/a></p>
+   * <U>Description</U>: By default GemFire will attempt to reconnect and
+   * reinitialize the cache when it has been forced out of the distributed system
+   * by a network-partition event or has otherwise been shunned by other members.
+   * This setting will turn off this behavior.</p>
+   * <U>Default</U>: "false"
    */
   String DISABLE_AUTO_RECONNECT = "disable-auto-reconnect";
   /**
-   * The static definition of the <a href="DistributedSystem.html#disable-tcp">"disable-tcp"</a>
-   * property
+   * The static String definition of the <i>"disable-tcp"</i> property
+   * <a name="disable-tcp"/a><p>
+   * <U>Description</U>: Turns off use of tcp/ip sockets, forcing the
+   * cache to use datagram sockets for all communication.  This is useful
+   * if you have a large number of processes in the distributed cache since
+   * it eliminates the per-connection reader-thread that is otherwise required.
+   * However, udp communications are somewhat slower than tcp/ip communications
+   * due to the extra work required in Java to break messages down to
+   * transmittable sizes, and the extra work required to guarantee
+   * message delivery.
+   * <p>
+   * <U>Default</U>: "false"<p>
+   * <U>Allowed values</U>: true or false<p>
+   * <U>Since</U>: GemFire 5.0
    */
   String DISABLE_TCP = "disable-tcp";
   /**
-   * The static definition of the <a href="DistributedSystem.html#distributed-system-id">"distributed-system-id"</a>
-   * property
+   * The static String definition of the <i>"distributed-system-id"</i> property<p>
+   * <a name="distributed-system-id"/a>
+   * <U>Decription:</U>A number that uniquely identifies this distributed system, when
+   * using the WAN gateway to share data between multiple distributed systems. This
+   * setting is only required when using the WAN gateway in conjunction with
+   * the <b>P</b>ortable <b>D</b>ata e<b>X</b>change (PDX) serialization format.
+   * <p>
+   * If set, this setting must be the same for every member in this distributed
+   * system. It must be different than the number in other distributed systems
+   * that this one will connect to using the WAN.
+   * -1 means no setting.<p>
+   * <U>Range:</U>-1..255
+   * <p>
+   * <U>Default:</U>: "-1"
    */
   String DISTRIBUTED_SYSTEM_ID = "distributed-system-id";
   /**
-   * The static definition of the <a href="DistributedSystem.html#durable-client-id">"durable-client-id"</a>
-   * property
+   * The static String definition of the <i>"durable-client-id"</i> property
+   * <a name="durable-client-id"/a></p>
+   * <U>Description</U>: The id to be used by this durable client. When a
+   * durable client connects to a server, this id is used by the server to
+   * identify it. The server will accumulate updates for a durable client
+   * while it is disconnected and deliver these events to the client when it
+   * reconnects.
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 5.5
    */
   String DURABLE_CLIENT_ID = "durable-client-id";
   /**
-   * The static definition of the <a href="DistributedSystem.html#durable-client-timeout">"durable-client-timeout"</a>
-   * property
+   * The static String definition of the <i>"durable-client-timeout"</i> property
+   * <a name="durable-client-timeout"/a></p>
+   * <U>Description</U>: The number of seconds a disconnected durable
+   * client is kept alive and updates are accumulated for it by the server
+   * before it is terminated.
+   * <U>Default</U>: "300"</p>
+   * <U>Since</U>: GemFire 5.5
    */
   String DURABLE_CLIENT_TIMEOUT = "durable-client-timeout";
   /**
-   * The static definition of the <a href="DistributedSystem.html#enable-cluster-configuration">"enable-cluster-configuration"</a>
-   * property
+   * The static String definition of the <i>"enable-cluster-configuration"</i> property
+   * <a name="enable-cluster-configuration"/a></p>
+   * <U>Description</U>: "true" causes creation of cluster configuration service on dedicated locators. The cluster configuration service on dedicated locator(s)
+   * would serve the configuration to new members joining the distributed system and also save the configuration changes caused by the Gfsh commands.
+   * This property is only applicable to dedicated locators.
+   * </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true or false</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String ENABLE_CLUSTER_CONFIGURATION = "enable-cluster-configuration";
   /**
-   * The static definition of the <a href="DistributedSystem.html#enable-network-partition-detection">"enable-network-partition-detection"</a>
-   * property
+   * The static String definition of the <i>"enable-network-partition-detection"</i> property
+   * <a name="enable-network-partition-detection"/a></p>
+   * <U>Description</U>: Turns on network partitioning detection algorithms, which
+   * detect loss of quorum and shuts down losing partitions.
+   * </p>
+   * <U>Default</U>: "false"
    */
   String ENABLE_NETWORK_PARTITION_DETECTION = "enable-network-partition-detection";
   /**
-   * The static definition of the <a href="DistributedSystem.html#enable-time-statistics">"enable-time-statistics"</a>
-   * property
+   * The static String definition of the <i>"enable-time-statistics"</i> property
+   * <a name="enable-time-statistics"/a></p>
+   * <U>Description</U>: "true" causes additional time-based statistics to be
+   * gathered for gemfire operations.  This can aid in discovering
+   * where time is going in cache operations, albeit at the expense of
+   * extra clock probes on every operation.  "false" disables the additional
+   * time-based statistics.
+   * </p>
+   * <U>Default</U>: "false"</p>
+   * <U>Allowed values</U>: true or false</p>
+   * <U>Since</U>: 5.0
    */
   String ENABLE_TIME_STATISTICS = "enable-time-statistics";
   /**
-   * The static definition of the <a href="DistributedSystem.html#enforce-unique-host">"enforce-unique-host"</a>
-   * property
+   * The static String definition of the <i>"enforce-unique-host"</i> property
+   * <a name="enforce-unique-host"/a></p>
+   * <U>Description</U>: Whether or not partitioned regions will
+   * put redundant copies of the same data in different JVMs running on the same physical host.
+   * <p>
+   * By default, partitioned regions will try to put redundancy copies on different physical hosts, but it may
+   * put them on the same physical host if no other hosts are available. Setting this property to true
+   * will prevent partitions regions from ever putting redundant copies of data on the same physical host.
+   * </p>
+   * <U>Default</U>: "false"
    */
   String ENFORCE_UNIQUE_HOST = "enforce-unique-host";
   /**
-   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-ciphers">"gateway-ssl-ciphers"</a>
-   * property
+   * The static String definition of the <i>"gateway-ssl-ciphers"</i> property
+   * <a name="gateway-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
    */
   String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers";
   /**
-   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-enabled">"gateway-ssl-enabled"</a>
-   * property
+   * The static String definition of the <i>"gateway-ssl-enabled"</i> property
+   * <a name="gateway-ssl-enabled"/a></p>
+   * <U>Description</U>: Specifies if gateway is started with separate ssl configuration.
+   * If not specified global property ssl-enabled (and its other related properties) are used
+   * to create gateway socket
+   * </p>
+   * <U>Default</U>: <code>false</code></p>
+   * <U>Since</U>: GemFire 8.0
    */
   String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled";
   /**
-   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore">"gateway-ssl-keystore"</a>
-   * property
+   * The static String definition of the <i>"gateway-ssl-keystore"</i> property
+   * <a name="gateway-ssl-keystore"/a></p>
+   * <U>Description</U>Location of the Java keystore file containing
+   * certificate and private key.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore-password">"gateway-ssl-keystore-password"</a>
-   * property
+   * The static String definition of the <i>"gateway-ssl-keystore-password"</i> property
+   * <a name="gateway-ssl-keystore-password"/a></p>
+   * <U>Description</U>Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore-type">"gateway-ssl-keystore-type"</a>
-   * property
+   * The static String definition of the <i>"gateway-ssl-keystore-type"</i> property
+   * <a name="gateway-ssl-keystore-type"/a></p>
+   * <U>Description</U>For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type";
   /**
-   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-protocols">"gateway-ssl-protocols"</a>
-   * property
+   * The static String definition of the <i>"gateway-ssl-protocols"</i> property
+   * <a name="gateway-ssl-protocols"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL protocols to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
    */
   String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols";
   /**
-   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-require-authentication">"gateway-ssl-require-authentication"</a>
-   * property
+   * The static String definition of the <i>"gateway-ssl-require-authentication"</i> property
+   * <a name="gateway-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the Gateway Sender
+   * side of the connection to be authenticated.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
    */
   String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication";
   /**
-   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-truststore">"gateway-ssl-truststore"</a>
-   * property
+   * The static String definition of the <i>"gateway-ssl-truststore"</i> property
+   * <a name="gateway-ssl-truststore"/a></p>
+   * <U>Description</U>Location of the Java keystore file containing the
+   * collection of CA certificates trusted by server (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-truststore-password">"gateway-ssl-truststore-password"</a>
-   * property
+   * The static String definition of the <i>"gateway-ssl-truststore-password"</i> property
+   * <a name="gateway-ssl-truststore-password"/a></p>
+   * <U>Description</U>: Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#groups">"groups"</a>
-   * property
+   * The static String definition of the <i>"groups"</i> property.
+   * <a name="groups"/a> <p>
+   * <U>Description</U>: Defines the list of groups this member belongs to.
+   * Use commas to separate group names.
+   * Note that anything defined by the deprecated roles gemfire property will also be considered a group.
+   * <p>
+   * <U>Default</U>: ""
+   * <p>
+   * <U>Since</U>: GemFire 7.0
    */
   String GROUPS = "groups";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-bind-address">"http-service-bind-address"</a>
-   * property
+   * The static String definition of the <i>"http-service-bind-address"</i> property
+   * <a name="http-service-bind-address"/a></p>
+   * <U>Description</U>: The address where the GemFire HTTP service will listen
+   * for remote connections. One can use this property to configure what ip
+   * address or host name the HTTP service will listen on. When not set, by
+   * default the HTTP service will listen on the local host's address.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String HTTP_SERVICE_BIND_ADDRESS = "http-service-bind-address";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-port">"http-service-port"</a>
-   * property
+   * The static String definition of the <i>"http-service-port"</i> property
+   * <a name="http-service-port"/a></p>
+   * <U>Description</U>: Specifies the port used by the GemFire HTTP service. If
+   * configured with non-zero value, then an HTTP service will listen on this port.
+   * A value of "0" disables Gemfire HTTP service.
+   * </p>
+   * <U>Default</U>: "7070" </p>
+   * <U>Allowed values</U>: 0..65535</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String HTTP_SERVICE_PORT = "http-service-port";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-ciphers">"http-service-ssl-ciphers"</a>
-   * property
+   * The static String definition of the <i>"http-service-ssl-ciphers"</i> property
+   * <a name="http-service-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space separated list of the SSL cipher suites to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.1
    */
   String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-enabled">"http-service-ssl-enabled"</a>
-   * property
+   * The static String definition of the <i>"http-service-ssl-enabled"</i> property
+   * a name="http-service-ssl-enabled"/a></p>
+   * <U>Description</U>: Specifies if http service is started with separate ssl configuration.
+   * If not specified, global property cluster-ssl-enabled (and its other related properties) are used
+   * to secure http service. All http-service-ssl-* properties are inherited from cluster-ssl-* properties.
+   * User can ovverride them using specific http-service-ssl-* property.
+   * </p>
+   * <U>Default</U>: <code>false</code></p>
+   * <U>Since</U>: GemFire 8.1
    */
   String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore">"http-service-ssl-keystore"</a>
-   * property
+   * The static String definition of the <i>"http-service-ssl-keystore"</i> property
+   * <a name="http-service-ssl-keystore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing
+   * certificate and private key.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
    */
   String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore-password">"http-service-ssl-keystore-password"</a>
-   * property
+   * The static String definition of the <i>"http-service-ssl-keystore-password"</i> property
+   * <a name="http-service-ssl-keystore-password"/a></p>
+   * <U>Description</U>: Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
    */
   String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore-type">"http-service-ssl-keystore-type"</a>
-   * property
+   * The static String definition of the <i>"http-service-ssl-keystore-type"</i> property
+   * <a name="http-service-ssl-keystore-type"/a></p>
+   * <U>Description</U>: For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
    */
   String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-protocols">"http-service-ssl-protocols"</a>
-   * property
+   * The static String definition of the <i>"http-service-ssl-protocols"</i> property
+   * <a name="http-service-ssl-protocols"/a></p>
+   * <U>Description</U>: A space separated list of the SSL protocols to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.1
    */
   String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-require-authentication">"http-service-ssl-require-authentication"</a>
-   * property
+   * The static String definition of the <i>"http-service-ssl-require-authentication"</i> property
+   * <a name="http-service-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the client
+   * side of the connection to be authenticated.
+   * </p>
+   * <U>Default</U>: <code>false</code></p>
+   * <U>Since</U>: GemFire 8.1
    */
   String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-truststore">"http-service-ssl-truststore"</a>
-   * property
+   * The static String definition of the <i>"http-service-ssl-truststore"</i> property
+   * <a name="http-service-ssl-truststore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing the
+   * collection of CA certificates trusted by server (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
    */
   String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-truststore-password">"http-service-ssl-truststore-password"</a>
-   * property
+   * The static String definition of the <i>"http-service-ssl-truststore-password"</i> property
+   * <a name="http-service-ssl-truststore-password"/a></p>
+   * <U>Description</U>: Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
    */
   String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager">"jmx-manager"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager"</i> property
+   * <a name="jmx-manager"/a></p>
+   * <U>Description</U>: If true then this member is willing to be a jmx-manager.
+   * All the other jmx-manager properties will be used when it does become a manager.
+   * If this property is false then all other jmx-manager properties are ignored.
+   * </p>
+   * <U>Default</U>: "false except on locators"
    */
   String JMX_MANAGER = "jmx-manager";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-access-file">"jmx-manager-access-file"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-access-file"</i> property
+   * <a name="jmx-manager-access-file"/a></p>
+   * <U>Description</U>: By default the jmx-manager will allow full access to all mbeans by any client.
+   * If this property is set to the name of a file then it can restrict clients to only being able to read
+   * mbeans; they will not be able to modify mbeans. The access level can be configured differently in this
+   * file for each user name defined in the password file.
+   * For more information about the format of this file see Oracle's documentation of the
+   * com.sun.management.jmxremote.access.file system property.
+   * Ignored if jmx-manager is false or if jmx-manager-port is zero.
+   * </p>
+   * <U>Default</U>: ""
    */
   String JMX_MANAGER_ACCESS_FILE = "jmx-manager-access-file";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-bind-address">"jmx-manager-bind-address"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-bind-address"</i> property
+   * <a name="jmx-manager-bind-address"/a></p>
+   * <U>Description</U>: By default the jmx-manager when configured with a port will listen
+   * on all the local host's addresses. You can use this property to configure what ip address
+   * or host name the jmx-manager will listen on. In addition, if the embedded http server is
+   * started, it will also bind to this address if it is set.
+   * Ignored if jmx-manager is false or jmx-manager-port is zero.
+   * </p>
+   * <U>Default</U>: ""
    */
   String JMX_MANAGER_BIND_ADDRESS = "jmx-manager-bind-address";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-hostname-for-clients">"jmx-manager-hostname-for-clients"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-hostname-for-clients"</i> property
+   * <a name="jmx-manager-hostname-for-clients"/a></p>
+   * <U>Description</U>: Lets you control what hostname will be given to clients that ask
+   * the locator for the location of a jmx manager. By default the ip address that the jmx-manager
+   * reports is used. But for clients on a different network this property allows you to configure
+   * a different hostname that will be given to clients.
+   * Ignored if jmx-manager is false or jmx-manager-port is zero.
+   * </p>
+   * <U>Default</U>: ""
    */
   String JMX_MANAGER_HOSTNAME_FOR_CLIENTS = "jmx-manager-hostname-for-clients";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-http-port">"jmx-manager-http-port"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-http-port"</i> property
+   * <a name="jmx-manager-http-port"/a></p>
+   * <U>Description</U>: If non-zero then when the jmx manager is started, an embedded
+   * web server will also be started and will listen on this port.
+   * The web server is used to host the GemFire Pulse application.
+   * If you are hosting the Pulse web app in your own web server, then disable
+   * this embedded server by setting this property to zero.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "7070"</p>
+   * <U>Deprecated</U>: as of GemFire8.0 use <a href="#http-service-port"><code>http-service-port</code></a> instead.
    *
    * @deprecated as of GemFire 8.0 use {@link #HTTP_SERVICE_PORT} instead.
    */
   String JMX_MANAGER_HTTP_PORT = "jmx-manager-http-port";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-password-file">"jmx-manager-password-file"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-password-file"</i> property
+   * <a name="jmx-manager-password-file"/a></p>
+   * <U>Description</U>: By default the jmx-manager will allow clients without credentials to connect.
+   * If this property is set to the name of a file then only clients that connect with credentials that
+   * match an entry in this file will be allowed.
+   * Most JVMs require that the file is only readable by the owner.
+   * For more information about the format of this file see Oracle's documentation of the
+   * com.sun.management.jmxremote.password.file system property.
+   * Ignored if jmx-manager is false or if jmx-manager-port is zero.
+   * </p>
+   * <U>Default</U>: ""
    */
   String JMX_MANAGER_PASSWORD_FILE = "jmx-manager-password-file";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-port">"jmx-manager-port"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-port"</i> property
+   * <a name="jmx-manager-port"/a></p>
+   * <U>Description</U>: The port this jmx manager will listen to for client connections.
+   * If this property is set to zero then GemFire will not allow remote client connections
+   * but you can alternatively use the standard system properties supported by the JVM
+   * for configuring access from remote JMX clients.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "1099"
    */
   String JMX_MANAGER_PORT = "jmx-manager-port";
   /**
-   * * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl">"jmx-manager-ssl"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl"</i> property
+   * <a name="jmx-manager-ssl"/a></p>
+   * <U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
+   * will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
+   * but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
+   * without needing to configure it for the other GemFire connections.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "false"</p>
+   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#jmx-manager-ssl-enabled"><code>jmx-manager-ssl-enabled</code></a> instead.
+   *
    * @deprecated as of GemFire 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead.
    */
   String JMX_MANAGER_SSL = "jmx-manager-ssl";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-start">"jmx-manager-start"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-start"</i> property
+   * <a name="jmx-manager-start"/a></p>
+   * <U>Description</U>: If true then this member will start a jmx manager when
+   * it creates a cache. Management tools like gfsh can be configured to connect
+   * to the jmx-manager. In most cases you should not set this because a jmx manager will
+   * automatically be started when needed on a member that sets "jmx-manager" to true.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "false"
    */
   String JMX_MANAGER_START = "jmx-manager-start";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-update-rate">"jmx-manager-update-rate"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-update-rate"</i> property
+   * <a name="jmx-manager-update-rate"/a></p>
+   * <U>Description</U>: The rate, in milliseconds, at which this member will push updates
+   * to any jmx managers. Currently this value should be greater than or equal to the
+   * statistic-sample-rate. Setting this value too high will cause stale values to be
+   * seen by gfsh and pulse.
+   * </p>
+   * <U>Default</U>: "2000"
    */
   String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-ciphers">"jmx-manager-ssl-ciphers"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl-ciphers"</i> property
+   * <a name="jmx-manager-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: "any"
    */
   String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-enabled">"jmx-manager-ssl-enabled"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl-enabled"</i> property
+   * <a name="jmx-manager-ssl-enabled"/a></p>
+   * <U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
+   * will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
+   * but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
+   * without needing to configure it for the other GemFire connections.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "false"
    */
   String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore">"jmx-manager-ssl-keystore"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl-keystore"</i> property
+   * <a name="jmx-manager-ssl-keystore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing
+   * certificate and private key.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore-password">"jmx-manager-ssl-keystore-password"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl-keystore-password"</i> property
+   * <a name="jmx-manager-ssl-keystore-password"/a></p>
+   * <U>Description</U>: Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore-type">"jmx-manager-ssl-keystore-type"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl-keystore-type"</i> property
+   * <a name="jmx-manager-ssl-keystore-type"/a></p>
+   * <U>Description</U>: For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-protocols">"jmx-manager-ssl-protocols"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl-protocols"</i> property
+   * <a name="jmx-manager-ssl-protocols"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL protocols to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: "any"
    */
   String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-require-authentication">"jmx-manager-ssl-require-authentication"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl-require-authentication"</i> property
+   * <a name="jmx-manager-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the client
+   * side of the connection to be authenticated.
+   * </p>
+   * <U>Default</U>: "true"
    */
   String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-truststore">"jmx-manager-ssl-truststore"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl-truststore"</i> property
+   * <a name="jmx-manager-ssl-truststore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing the
+   * collection of CA certificates trusted by manager (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-truststore-password">"jmx-manager-ssl-truststore-password"</a>
-   * property
+   * The static String definition of the <i>"jmx-manager-ssl-truststore-password"</i> property
+   * <a name="jmx-manager-ssl-truststore-password"/a></p>
+   * <U>Description</U>: Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password";
   String LICENCE_APPLICATION_CACHE = "license-application-cache";
@@ -386,359 +856,733 @@ public interface DistributedSystemConfigProperties {
   String LICENCE_SERVER_TIMEOUT = "license-server-timeout";
   String LICENCE_WORKING_DIR = "license-working-dir";
   /**
-   * The static definition of the <a href="DistributedSystem.html#load-cluster-configuration-from-dir">"load-cluster-configuration-from-dir"</a>
-   * property
+   * The static String definition of the <i>"load-cluster-configuration-from-dir"</i> property
+   * <a name="load-cluster-configuration-from-dir"/a></p>
+   * <U>Description</U>: "true" causes loading of cluster configuration from "cluster_config" directory in the locator.
+   * This property is only applicable to dedicated locators which have "enable-cluster-configuration" set to true.
+   * </p>
+   * <U>Default</U>: "false"</p>
+   * <U>Allowed values</U>: true or false</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String LOAD_CLUSTER_CONFIGURATION_FROM_DIR = "load-cluster-configuration-from-dir";
   /**
-   * The static definition of the <a href="DistributedSystem.html#locator-wait-time">"locator-wait-time"</a>
-   * property
+   * The static String definition of the <i>"locator-wait-time"</i> property
+   * <a name="locator-wait-time"/a><p>
+   * <U>Description</U>: The number of seconds to wait for a locator to start
+   * if one is not available when attempting to join the distributed system.  This
+   * setting can be used when locators and peers are being started all at once in
+   * order to have the peers be patient and wait for the locators to finish starting
+   * up before attempting to join the distributed system..<p>
+   * <p>
+   * <U>Default</U>: "0"
    */
   String LOCATOR_WAIT_TIME = "locator-wait-time";
   /**
-   * The static definition of the <a href="DistributedSystem.html#locators">"locators"</a>
-   * property
+   * The static String definition of the <i>"locators"</i> property
+   * <a name="locators"/a><p>
+   * <U>Description</U>: A list of locators (host and port) that
+   * are used to find other member of the distributed system.  This
+   * attribute's value is a possibly empty comma separated list.  Each
+   * element must be of the form "hostName[portNum]" and may be of the
+   * form "host:bindAddress[port]" if a specific bind address is to be
+   * used on the locator machine.  The square
+   * brackets around the portNum are literal character and must be
+   * specified.<p>
+   * Since IPv6 bind addresses may contain colons, you may use an at symbol
+   * instead of a colon to separate the host name and bind address.
+   * For example, "server1@fdf0:76cf:a0ed:9449::5[12233]" specifies a locator
+   * running on "server1" and bound to fdf0:76cf:a0ed:9449::5 on port 12233.<p>
+   * If "locators" is empty
+   * then this distributed system will be isolated from all other GemFire
+   * processes.<p>
+   * <p>
+   * <U>Default</U>: ""
    */
   String LOCATORS = "locators";
   /**
-   * The static definition of the <a href="DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a>
-   * property
+   * The static String definition of the <i>"log-disk-space-limit"</i> property
+   * <a name="log-disk-space-limit"/a></p>
+   * <U>Description</U>: Limits, in megabytes, how much disk space can be
+   * consumed by old inactive log files. When the limit is
+   * exceeded the oldest inactive log file is deleted.
+   * Set to zero to disable automatic log file deletion.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..1000000
    */
   String LOG_DISK_SPACE_LIMIT = "log-disk-space-limit";
   /**
-   * The static definition of the <a href="DistributedSystem.html#log-file">"log-file"</a>
-   * property
+   * The static String definition of the <i>"log-file"</i> property
+   * <a name="log-file"/a></p>
+   * <U>Description</U>: Name of the file to write logging
+   * messages to.  If the file name if "" (default) then messages are
+   * written to standard out.
+   * </p>
+   * <U>Default</U>: ""
    */
   String LOG_FILE = "log-file";
   /**
-   * The static definition of the <a href="DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a>
-   * property
+   * The static String definition of the <i>"log-file-size-limit"</i> property
+   * <a name="log-file-size-limit"/a></p>
+   * <U>Description</U>: Limits, in megabytes, how large the current log
+   * file can grow before it is closed and logging rolls on to a new file.
+   * Set to zero to disable log rolling.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..1000000
    */
   String LOG_FILE_SIZE_LIMIT = "log-file-size-limit";
   /**
-   * The static definition of the <a href="DistributedSystem.html#log-level">"log-level"</a>
-   * property
+   * The static String definition of the <i>"log-level"</i> property
+   * <a name="log-level"/a></p>
+   * <U>Description</U>:The type of log messages that will
+   * actually write to the log file.
+   * </p>
+   * <U>Default</U>: "config"</p>
+   * <U>Allowed values</U>: all|finest|finer|fine|config|info|warning|severe|none
    */
   String LOG_LEVEL = "log-level";
   /**
-   * The static definition of the <a href="DistributedSystem.html#max-num-reconnect-tries">"max-num-reconnect-tries"</a>
-   * property
+   * The static String definition of the <i>"max-num-reconnect-tries"</i> property
+   * <a name="max-num-reconnect-tries"/a></p>
+   * <U>Description</U>: Specifies the maximum number or times to attempt
+   * to reconnect to the distributed system when required roles are missing.
+   * This does not apply to reconnect attempts due to a forced disconnect.
+   * </p>
+   * <U>Deprecated</U>: this setting is scheduled to be removed.</p>
+   * <U>Default</U>: "3"</p>
+   * <U>Since</U>: GemFire 5.0
    */
   String MAX_NUM_RECONNECT_TRIES = "max-num-reconnect-tries";
   /**
-   * The static definition of the <a href="DistributedSystem.html#max-wait-time-reconnect">"max-wait-time-reconnect"</a>
-   * property
+   * The static String definition of the <i>"max-wait-time-reconnect"</i> property
+   * <a name="max-wait-time-reconnect"/a></p>
+   * <U>Description</U>: Specifies the time in milliseconds to wait before each reconnect attempt when
+   * a member of the distributed system is forced out of the system and auto-reconnect
+   * is enabled (see <a href="#disable-auto-reconnect"><code>disable-auto-reconnect</code></a>) or if the deprecated required-roles
+   * feature is being used and a role-loss has triggered a shutdown and reconnect.
+   * </p>
+   * <U>Default</U>: "60000"</p>
+   * <U>Since</U>: GemFire 5.0
    */
   String MAX_WAIT_TIME_RECONNECT = "max-wait-time-reconnect";
   /**
-   * The static definition of the <a href="DistributedSystem.html#mcast-address">"mcast-address"</a>
-   * property
+   * The static String definition of the <i>"mcast-address"</i> property
+   * <a name="mcast-address"/a><p>
+   * <U>Description</U>: The IP address used for multicast
+   * networking.  If mcast-port is zero, then mcast-address is
+   * ignored.
+   * <p>
+   * <U>Default</U>: "239.192.81.1"
    */
   String MCAST_ADDRESS = "mcast-address";
   /**
-   * The static definition of the <a href="DistributedSystem.html#mcast-flow-control">"mcast-flow-control"</a>
-   * property
+   * The static String definition of the <i>"mcast-flow-control"</i> property
+   * <a name="mcast-flow-control"/a><p>
+   * <U>Description</U>: Configures the flow-of-control protocol for
+   * multicast messaging.  There are three settings that are separated
+   * by commas:  byteAllowance (integer), rechargeThreshold (float) and
+   * rechargeBlockMs (integer).  The byteAllowance determines how many bytes
+   * can be sent without a recharge from other processes.  The rechargeThreshold
+   * tells receivers how low the sender's initial to remaining allowance
+   * ratio should be before sending a recharge.  The rechargeBlockMs
+   * tells the sender how long to wait for a recharge before explicitly
+   * requesting one.<p>
+   * <U>Deprecated</U>: as of 9.0 GemFire does not include a flow-of-control protocol for multicast messaging.<p>
+   * <U>Default</U>: "1048576,0.25,5000"<p>
+   * <U>Allowed values</U>: 100000-maxInt, 0.1-0.5, 500-60000<p>
+   * <U>Since</U>: GemFire 5.0
    */
   String MCAST_FLOW_CONTROL = "mcast-flow-control";
   /**
-   * The static definition of the <a href="DistributedSystem.html#mcast-port">"mcast-port"</a>
-   * property
+   * The static String definition of the <i>"mcast-port"</i> property
+   * <a name="mcast-port"/a><p>
+   * <U>Description</U>: The port used for multicast networking.
+   * If zero, then multicast will be disabled and unicast messaging will
+   * be used.
+   * <p>
+   * <U>Default</U>: "0"
    */
   String MCAST_PORT = "mcast-port";
   /**
-   * The static definition of the <a href="DistributedSystem.html#mcast-recv-buffer-size">"mcast-recv-buffer-size"</a>
-   * property
+   * The static String definition of the <i>"mcast-recv-buffer-size"</i> property
+   * <a name="mcast-recv-buffer-size"/a><p>
+   * <U>Description</U>: Sets the size of the socket buffer used for
+   * incoming multicast transmissions.  You should set this high if there will be
+   * high volumes of messages.
+   * <U>Default</U>: "1048576"<p>
+   * <U>Allowed values</U>: 2048..Operating System maximum<p>
+   * <U>Since</U>: GemFire 5.0
    */
   String MCAST_RECV_BUFFER_SIZE = "mcast-recv-buffer-size";
   /**
-   * The static definition of the <a href="DistributedSystem.html#mcast-send-buffer-size">"mcast-send-buffer-size"</a>
-   * property
+   * The static String definition of the <i>"mcast-send-buffer-size"</i> property
+   * <a name="mcast-send-buffer-size"/a><p>
+   * <U>Description</U>: Sets the size of the socket buffer used for
+   * outgoing multicast transmissions.
+   * <U>Default</U>: "65535"<p>
+   * <U>Allowed values</U>: 2048..Operating System maximum<p>
+   * <U>Since</U>: GemFire 5.0
    */
   String MCAST_SEND_BUFFER_SIZE = "mcast-send-buffer-size";
   /**
-   * The static definition of the <a href="DistributedSystem.html#mcast-ttl">"mcast-ttl"</a>
-   * property
+   * The static String definition of the <i>"mcast-ttl"</i> property
+   * <a name="mcast-ttl"/a><p>
+   * <U>Description</U>: Determines how far through your network
+   * the multicast packets used by GemFire will propagate.
+   * <U>Default</U>: "32"<p>
+   * <U>Allowed values</U>: 0..255<p>
+   * <U>Since</U>: GemFire 4.1
    */
   String MCAST_TTL = "mcast-ttl";
   /**
-   * The static definition of the <a href="DistributedSystem.html#member-timeout">"member-timeout"</a>
-   * property
+   * The static String definition of the <i>"member-timeout"</i> property
+   * <a name="member-timeout"/a><p>
+   * <U>Description</U>: Sets the timeout interval, in milliseconds, used
+   * to determine whether another process is alive or not.  When another process
+   * appears to be gone, GemFire sends it an ARE-YOU-DEAD message and waits
+   * for the member-timeout period for it to respond and declare it is not dead.
+   * <p>
+   * <U>Default</U>: "5000"<p>
+   * <U>Allowed values</U>: 1000-600000<p>
+   * <U>Since</U>: GemFire 5.0
    */
   String MEMBER_TIMEOUT = "member-timeout";
   /**
-   * The static definition of the <a href="DistributedSystem.html#membership-port-range">"membership-port-range"</a>
-   * property
+   * The static String definition of the <i>"membership-port-range"</i> property
+   * <a name="membership-port-range"/a><p>
+   * <U>Description</U>: The allowed range of ports for use in forming an
+   * unique membership identifier (UDP), for failure detection purposes (TCP) and
+   * to listen on for peer connections (TCP). This range is given as two numbers
+   * separated by a minus sign. Minimum 3 values in range are required to
+   * successfully startup.
+   * <p>
+   * <U>Default</U>: 1024-65535
    */
   String MEMBERSHIP_PORT_RANGE = "membership-port-range";
   /**
-   * The static definition of the <a href="DistributedSystem.html#memcached-bind-address">"memcached-bind-address"</a>
-   * property
+   * The static String definition of the <i>"memcached-bind-address"</i> property
+   * <a name="memcached-bind-address"/a></p>
+   * <U>Description</U>: Specifies the bind address used by {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer}</p>
+   * <U>Default</U>: ""
    */
   String MEMCACHED_BIND_ADDRESS = "memcached-bind-address";
   /**
-   * The static definition of the <a href="DistributedSystem.html#memcached-port">"memcached-port"</a>
-   * property
+   * The static String definition of the <i>"memcached-port"</i> property
+   * <a name="memcached-port"/a></p>
+   * <U>Description</U>: Specifies the port used by {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer}
+   * which enables memcached clients to connect and store data in GemFire distributed system.
+   * see {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer} for other configuration options.</p>
+   * <U>Default</U>: "0" disables GemFireMemcachedServer</p>
+   * <U>Allowed values</U>: 0..65535
    */
   String MEMCACHED_PORT = "memcached-port";
   /**
-   * The static definition of the <a href="DistributedSystem.html#memcached-protocol">"memcached-protocol"</a>
-   * property
+   * The static String definition of the <i>"memcached-protocol"</i> property
+   * <a name="memcached-protocol"/a></p>
+   * <U>Description</U>: Specifies the protocol used by {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer}</p>
+   * <U>Default</U>: "ASCII"</p>
+   * <U>Allowed values</U>: "ASCII" "BINARY"
    */
   String MEMCACHED_PROTOCOL = "memcached-protocol";
   /**
-   * The static definition of the <a href="DistributedSystem.html#name">"name"</a>
-   * property
+   * The static string definition of the <i>"name"</i> property
+   * <a name="name"><p>
+   * <U>Description</U>: Uniquely identifies a member in its distributed system.
+   * If two members with the same name try to join the same distributed system
+   * then the second join will fail.<p>
+   * <U>Default</U>: ""
    */
   String NAME = "name";
   /**
-   * The static definition of the <a href="DistributedSystem.html#redundancy-zone">"redundancy-zone"</a>
-   * property
+   * The static String definition of the <i>"redundancy-zone"</i> property
+   * <a name="redundancy-zone"/a></p>
+   * <u>Description</u>: Defines the redundancy zone from this member. If this property is set, partitioned
+   * regions will not put two redundant copies of data in two members with the same redundancy zone setting.
+   * </p>
+   * <u>Default</u>: ""
    */
   String REDUNDANCY_ZONE = "redundancy-zone";
   /**
-   * The static definition of the <a href="DistributedSystem.html#remote-locators">"remote-locators"</a>
-   * property
+   * The static String definition of the <i>"remote-locators"</i> property
+   * <a name="remote-locators"/a><p>
+   * <U>Description</U>: A list of locators (host and port) that a cluster
+   * will use in order to connect to a remote site in a multi-site (WAN)
+   * configuration. This attribute's value is a possibly comma separated list.
+   * <p>For each remote locator, provide a hostname and/or address
+   * (separated by '@', if you use both), followed by a port number in brackets.
+   * <p>Examples:
+   * remote-locators=address1[port1],address2[port2]
+   * <p>
+   * remote-locators=hostName1@address1[port1],hostName2@address2[port2]
+   * <p>
+   * remote-locators=hostName1[port1],hostName2[port2]<p>
+   * <p>
+   * <U>Default</U>: ""
    */
   String REMOTE_LOCATORS = "remote-locators";
   /**
-   * The static definition of the <a href="DistributedSystem.html#remove-unresponsive-client">"remove-unresponsive-client"</a>
+   * The static String definition of the <i>"remove-unresponsive-client"</i>
    * property
    */
   String REMOVE_UNRESPONSIVE_CLIENT = "remove-unresponsive-client";
   /**
-   * The static definition of the <a href="DistributedSystem.html#roles">"roles"</a>
-   * property
+   * The static String definition of the <i>"roles"</i> property
+   * <a name="roles"/a></p>
+   * <U>Description</U>: Specifies the application roles that this member
+   * performs in the distributed system. This is a comma delimited list of
+   * user-defined strings. Any number of members can be configured to perform
+   * the same role, and a member can be configured to perform any number of
+   * roles.
+   * Note that anything defined by the groups gemfire property will also be considered a role.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 5.0</p>
+   * <U>Deprecated</U>: This feature is scheduled to be removed.
+   *
+   * @deprecated : This feature is scheduled to be removed.
    */
   String ROLES = "roles";
   /**
-   * The static definition of the security prefix "security-" used in conjuntion with other security-* properties</a>
-   * property
+   * The static String definition of the security prefix "security-" used in conjunction with other security-* properties</i> property
+   * <a name="security-"/a></p>
+   * <U>Description</U>: Mechanism to define client credentials.
+   * All tags with "security-" prefix is packaged together as security properties
+   * and passed as an argument to getCredentials of Authentication module.
+   * These tags cannot have null values.
+   * </p>
+   * <U>Default</U>: Optional</p>
+   * <U>Allowed values</U>: any string
    */
   String SECURITY_PREFIX = "security-";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-client-accessor">"security-client-accessor"</a>
+   * The static String definition of the <i>"security-client-accessor"</i>
    * property
    */
   String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-client-accessor-pp">"security-client-accessor-pp"</a>
+   * The static String definition of the <i>"security-client-accessor-pp"</i>
    * property
    */
   String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-client-auth-init">"security-client-auth-init"</a>
-   * property
+   * The static String definition of the <i>"security-client-auth-init"</i> property
+   * <a name="security-client-auth-init"/a></p>
+   * <U>Description</U>: Authentication module name for Clients that requires to act
+   * upon credentials read from the gemfire.properties file.
+   * Module must implement AuthInitialize interface.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Allowed values</U>: jar file:class name
    */
   String SECURITY_CLIENT_AUTH_INIT = SECURITY_PREFIX + "client-auth-init";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-client-authenticator">"security-client-authenticator"</a>
+   * The static String definition of the <i>"security-client-authenticator"</i>
    * property
    */
   String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + "client-authenticator";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-client-dhalgo">"security-client-dhalgo"</a>
+   * The static String definition of the <i>"security-client-dhalgo"</i>
    * property
    */
   String SECURITY_CLIENT_DHALGO = SECURITY_PREFIX + "client-dhalgo";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-log-file">"security-log-file"</a>
+   * The static String definition of the <i>"security-log-file"</i>
    * property
    */
   String SECURITY_LOG_FILE = SECURITY_PREFIX + "log-file";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-log-level">"security-log-level"</a>
+   * The static String definition of the <i>"security-log-level"</i>
    * property
    */
   String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-peer-auth-init">"security-peer-auth-init"</a>
+   * The static String definition of the <i>"security-peer-auth-init"</i>
    * property
    */
   String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-peer-authenticator">"security-peer-authenticator"</a>
+   * The static String definition of the <i>"security-peer-authenticator"</i>
    * property
    */
   String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator";
   /**
-   * The static definition of the <a href="DistributedSystem.html#security-peer-verifymember-timeout">"security-peer-verifymember-timeout"</a>
+   * The static String definition of the <i>"security-peer-verifymember-timeout"</i>
    * property
    */
   String SECURITY_PEER_VERIFY_MEMBER_TIMEOUT = SECURITY_PREFIX + "peer-verifymember-timeout";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-bind-address">"server-bind-address"</a>
-   * property
+   * The static String definition of the <i>"server-bind-address"</i> property
+   * <a name="server-bind-address"/a><p>
+   * <U>Description</U>: The IP address that this distributed system's
+   * server sockets in a client-server topology will listen on.
+   * If set to an empty string then all of the local machine's
+   * addresses will be listened on.
+   * <p>
+   * <U>Default</U>: ""
    */
   String SERVER_BIND_ADDRESS = "server-bind-address";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-ssl-ciphers">"server-ssl-ciphers"</a>
-   * property
+   * The static String definition of the <i>"server-ssl-ciphers"</i> property
+   * <a name="server-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
    */
   String SERVER_SSL_CIPHERS = "server-ssl-ciphers";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-ssl-enabled">"server-ssl-enabled"</a>
-   * property
+   * The static String definition of the <i>"server-ssl-enabled"</i> property
+   * <a name="server-ssl-enabled"/a></p>
+   * <U>Description</U>: Specifies if server is started with separate ssl configuration.
+   * If not specified global property ssl-enabled (and its other related properties) are used
+   * to create server socket
+   * </p>
+   * <U>Default</U>: <code>false</code></p>
+   * <U>Since</U>: GemFire 8.0
    */
   String SERVER_SSL_ENABLED = "server-ssl-enabled";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore">"server-ssl-keystore"</a>
-   * property
+   * The static String definition of the <i>"server-ssl-keystore"</i> property
+   * <a name="server-ssl-keystore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing
+   * certificate and private key.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String SERVER_SSL_KEYSTORE = "server-ssl-keystore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore-password">"server-ssl-keystore-password"</a>
-   * property
+   * The static String definition of the <i>"server-ssl-keystore-password"</i> property
+   * <a name="server-ssl-keystore-password"/a></p>
+   * <U>Description</U>: Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore-type">"server-ssl-keystore-type"</a>
-   * property
+   * The static String definition of the <i>"server-ssl-keystore-type"</i> property
+   * <a name="server-ssl-keystore-type"/a></p>
+   * <U>Description</U>: For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-ssl-protocols">"server-ssl-protocols"</a>
-   * property
+   * The static String definition of the <i>"server-ssl-protocols"</i> property
+   * <a name="server-ssl-protocols"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL protocols to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
    */
   String SERVER_SSL_PROTOCOLS = "server-ssl-protocols";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-ssl-require-authentication">"server-ssl-require-authentication"</a>
-   * property
+   * The static String definition of the <i>"server-ssl-require-authentication"</i> property
+   * <a name="server-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the client
+   * side of the connection to be authenticated.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
    */
   String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-ssl-truststore">"server-ssl-truststore"</a>
-   * property
+   * The static String definition of the <i>"server-ssl-truststore"</i> property
+   * <a name="server-ssl-truststore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing the
+   * collection of CA certificates trusted by server (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore";
   /**
-   * The static definition of the <a href="DistributedSystem.html#server-ssl-truststore-password">"server-ssl-truststore-password"</a>
-   * property
+   * The static String definition of the <i>"server-ssl-truststore-password"</i> property
+   * <a name="server-ssl-truststore-password"/a></p>
+   * <U>Description</U>: Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#socket-buffer-size">"socket-buffer-size"</a>
-   * property
+   * The static String definition of the <i>"socket-buffer-size"</i> property
+   * <a name="socket-buffer-size"/a></p>
+   * <U>Description</U>: The size of each socket buffer, in bytes.
+   * Smaller buffers conserve memory. Larger buffers can improve performance;
+   * in particular if large messages are being sent.
+   * <U>Default</U>: "32768"</p>
+   * <U>Allowed values</U>: 128..16777215</p>
+   * <U>Since</U>: GemFire 4.1
    */
   String SOCKET_BUFFER_SIZE = "socket-buffer-size";
   /**
-   * The static definition of the <a href="DistributedSystem.html#socket-lease-time">"socket-lease-time"</a>
-   * property
+   * The static String definition of the <i>"socket-lease-time"</i> property
+   * <a name="socket-lease-time"/a></p>
+   * <U>Description</U>: The number of milliseconds a thread
+   * can keep exclusive access to a socket that it is not actively using.
+   * Once a thread loses its lease to a socket it will need to re-acquire
+   * a socket the next time it sends a message.
+   * A value of zero causes socket leases to never expire.
+   * This property is ignored if "conserve-sockets" is true.
+   * <U>Default</U>: "15000"</p>
+   * <U>Allowed values</U>: 0..600000</p>
+   * <U>Since</U>: GemFire 4.1
    */
   String SOCKET_LEASE_TIME = "socket-lease-time";
   /**
-   * The static definition of the <a href="DistributedSystem.html#start-dev-rest-api">"start-dev-rest-api"</a>
-   * property
+   * The static String definition of the <i>"start-dev-rest-api"</i> property
+   * <a name="start-dev-rest-api"/a></p>
+   * <U>Description</U>: If true then developer(API) REST service will be
+   * started when cache is created. REST service can be configured using
+   * <code>http-service-port</code> and <code>http-service-bind-address</code>
+   * properties.</p>
+   * <U>Default</U>: "false"</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String START_DEV_REST_API = "start-dev-rest-api";
   /**
-   * The static definition of the <a href="DistributedSystem.html#start-locator">"start-locator"</a>
-   * property
+   * The static String definition of the <i>"start-locator"</i> property
+   * <a name="start-locator"/a></p>
+   * <U>Description</U>: A host name or bind-address and port
+   * ("host[port],peer=<true|false>,server=<true|false>")
+   * that are used to start a locator in the same process as the DistributedSystem.
+   * The locator is started when the DistributedSystem connects,
+   * and is stopped when the DistributedSystem disconnects.  To start a
+   * locator that is not tied to the DistributedSystem's lifecycle, see
+   * the {@link Locator} class in this same package.<p>
+   * <p>
+   * The peer and server parameters are optional. They specify whether
+   * the locator can be used for peers to discover each other, or for clients
+   * to discover peers. By default both are true.
+   * </p>
+   * <U>Default</U>: "" (doesn't start a locator)
    */
   String START_LOCATOR = "start-locator";
   /**
-   * The static definition of the <a href="DistributedSystem.html#statistic-archive-file">"statistic-archive-file"</a>
-   * property
+   * The static String definition of the <i>"statistic-archive-file"</i> property
+   * <a name="statistic-archive-file"/a></p>
+   * <U>Description</U>: The file that statistic samples are
+   * written to.  An empty string (default) disables statistic
+   * archival.
+   * </p>
+   * <U>Default</U>: ""
    */
   String STATISTIC_ARCHIVE_FILE = "statistic-archive-file";
   /**
-   * The static definition of the <a href="DistributedSystem.html#statistic-sample-rate">"statistic-sample-rate"</a>
-   * property
+   * The static String definition of the <i>"statistic-sample-rate"</i> property
+   * <a name="statistic-sample-rate"/a></p>
+   * <U>Description</U>: The rate, in milliseconds, at which samples
+   * of the statistics will be taken.
+   * If set to a value less than 1000 the rate will be set to 1000 because
+   * the VSD tool does not support sub-second sampling.
+   * </p>
+   * <U>Default</U>: "1000"</p>
+   * <U>Allowed values</U>: 100..60000
    */
   String STATISTIC_SAMPLE_RATE = "statistic-sample-rate";
   /**
-   * The static definition of the <a href="DistributedSystem.html#statistic-sampling-enabled">"statistic-sampling-enabled"</a>
-   * property
+   * The static String definition of the <i>"statistic-sampling-enabled"</i> property
+   * <a name="statistic-sampling-enabled"/a></p>
+   * <U>Description</U>: "true" causes the statistics to be
+   * sampled periodically and operating system statistics to be
+   * fetched each time a sample is taken.  "false" disables sampling
+   * which also disables operating system statistic collection.  Non
+   * OS statistics will still be recorded in memory and can be viewed
+   * by administration tools.  However, charts will show no activity
+   * and no statistics will be archived while sampling is
+   * disabled.
+   * Starting in 7.0 the default value has been changed to true.
+   * If statistic sampling is disabled it will also cause various
+   * metrics seen in gfsh and pulse to always be zero.
+   * </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true|false
    */
   String STATISTIC_SAMPLING_ENABLED = "statistic-sampling-enabled";
   /**
-   * The static definition of the <a href="DistributedSystem.html#tcp-port">"tcp-port"</a>
-   * property
+   * The static String definition of the <i>"tcp-port"</i> property
+   * <a name="tcp-port"/a><p>
+   * <U>Description</U>: A 16-bit integer that determines the tcp/ip port number to listen on
+   * for cache communications.  If zero, the operating system will select
+   * an available port to listen on.  Each process on a machine must have
+   * its own tcp-port.  Note that some operating systems restrict the range
+   * of ports usable by non-privileged users, and using restricted port
+   * numbers can cause runtime errors in GemFire startup.
+   * <p>
+   * <U>Default</U>: "0"<p>
+   * <U>Allowed values</U>: 0..65535<p>
+   * <U>Since</U>: GemFire 5.0
    */
   String TCP_PORT = "tcp-port";
   /**
-   * The static definition of the <a href="DistributedSystem.html#udp-fragment-size">"udp-fragment-size"</a>
-   * property
+   * The static String definition of the <i>"udp-fragment-size"</i> property
+   * <a name="udp-fragment-size"/a><p>
+   * <U>Description</U>: When messages are sent over datagram sockets,
+   * GemFire breaks large messages down into fragments for transmission.
+   * This property sets the maximum fragment size for transmission.
+   * <U>Default</U>: "60000"<p>
+   * <U>Allowed values</U>: 1000..60000<p>
+   * <U>Since</U>: GemFire 5.0
    */
   String UDP_FRAGMENT_SIZE = "udp-fragment-size";
   /**
-   * The static definition of the <a href="DistributedSystem.html#udp-recv-buffer-size">"udp-recv-buffer-size"</a>
-   * property
+   * The static String definition of the <i>"udp-recv-buffer-size"</i> property
+   * <a name="udp-recv-buffer-size"/a><p>
+   * <U>Description</U>: Sets the size of the socket buffer used for
+   * incoming udp point-to-point transmissions.  Note: if multicast is not
+   * enabled and disable-tcp is not enabled, a reduced default size of
+   * 65535 is used.
+   * <U>Default</U>: "1048576 if multicast is enabled or disable-tcp is true, 131071 if not"<p>
+   * <U>Allowed values</U>: 2048..Operating System maximum<p>
+   * <U>Since</U>: GemFire 5.0
    */
   String UDP_RECV_BUFFER_SIZE = "udp-recv-buffer-size";
   /**
-   * The static definition of the <a href="DistributedSystem.html#udp-send-buffer-size">"udp-send-buffer-size"</a>
-   * property
+   * The static String definition of the <i>"udp-send-buffer-size"</i> property
+   * <a name="udp-send-buffer-size"/a><p>
+   * <U>Description</U>: Sets the size of the socket buffer used for
+   * outgoing udp point-to-point transmissions.
+   * <U>Default</U>: "65535"<p>
+   * <U>Allowed values</U>: 2048..Operating System maximum<p>
+   * <U>Since</U>: GemFire 5.0
    */
   String UDP_SEND_BUFFER_SIZE = "udp-send-buffer-size";
   /**
-   * The static definition of the <a href="DistributedSystem.html#use-cluster-configuration">"use-cluster-configuration"</a>
-   * property
+   * The static String definition of the <i>"use-cluster-configuration"</i> property
+   * <a name="use-cluster-configuration"/a></p>
+   * <U>Description</U>: This property is only applicable for data members (non client and non locator)
+   * "true" causes a member to request and uses the configuration from cluster configuration services running on dedicated locators.
+   * "false" causes a member to not request the configuration from the configuration services running on the locator(s).
+   * </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true or false</p>
+   * <U>Since</U>: GemFire 8.0
    */
   String USE_CLUSTER_CONFIGURATION = "use-cluster-configuration";
   /**
-   * The static definition of the <a href="DistributedSystem.html#user-command-packages">"user-command-packages"</a>
-   * property
+   * The static String definition of the <i>"user-command-packages"</i> property
+   * <a name="user-command-packages"/a></p>
+   * <U>Description</U>: A comma separated list of Java packages that
+   * contain classes implementing the <code>CommandMarker</code> interface.
+   * Matching classes will be loaded when the VM starts and will be available
+   * in the GFSH command-line utility.
+   * </p>
+   * <U>Default</U>: <code>""</code></p>
+   * <U>Since</U>: GemFire 8.0
    */
   String USER_COMMAND_PACKAGES = "user-command-packages";
   /**
-   * The static definition of the <a href="DistributedSystem.html#off-heap-memory-size">"off-heap-memory-size"</a>
-   * property
+   * The static String definition of the <i>"off-heap-memory-size"</i> property
+   * <a name="off-heap-memory-size"/a></p>
+   * <U>Description</U>: The total size of off-heap memory specified as
+   * off-heap-memory-size=<n>[g|m]. <n> is the size. [g|m] indicates
+   * whether the size should be interpreted as gigabytes or megabytes.
+   * By default no off-heap memory is allocated.
+   * A non-zero value will cause that much memory to be allocated from the operating
+   * system and reserved for off-heap use.
+   * </p>
+   * <U>Default</U>: <code>""</code></p>
+   * <U>Since</U>: Geode 1.0
    */
   String OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size";
   /**
-   * The static definition of the <a href="DistributedSystem.html#redis-port">"redis-port"</a>
-   * property
+   * The static String definition of the <i>"redis-port"</i> property
+   * <a name="redis-port"/a></p>
+   * <U>Description</U>: Specifies the port used by {@link com.gemstone.gemfire.redis.GemFireRedisServer}
+   * which enables redis clients to connect and store data in GemFire distributed system.
+   * see {@link com.gemstone.gemfire.redis.GemFireRedisServer} for other configuration options.</p>
+   * <U>Default</U>: "0" disables GemFireMemcachedServer</p>
+   * <U>Allowed values</U>: 0..65535
    */
   String REDIS_PORT = "redis-port";
   /**
-   * The static definition of the <a href="DistributedSystem.html#redis-bind-address">"redis-bind-address"</a>
-   * property
+   * The static String definition of the <i>"redis-bind-address"</i> property
+   * <a name="redis-bind-address"/a></p>
+   * <U>Description</U>: Specifies the bind address used by {@link com.gemstone.gemfire.redis.GemFireRedisServer}</p>
+   * <U>Default</U>: ""
    */
   String REDIS_BIND_ADDRESS = "redis-bind-address";
   /**
-   * The static definition of the <a href="DistributedSystem.html#redis-password">"redis-password"</a>
-   * property
+   * The static String definition of the <i>"redis-password"</i> property
+   * <a name="redis-password"/a></p>
+   * <U>Description</U>: Specifies the password to authenticate a client of {@link com.gemstone.gemfire.redis.GemFireRedisServer}</p>
+   * <U>Default</U>: ""
    */
   String REDIS_PASSWORD = "redis-password";
   /**
-   * The static definition of the <a href="DistributedSystem.html#lock-memory">"lock-memory"</a>
-   * property
+   * The static String definition of the <i>"lock-memory"</i> property
+   * <a name="lock-memory"/a></p>
+   * <U>Description</U>: Include this option to lock GemFire heap and off-heap memory pages into RAM.
+   * This prevents the operating sy

<TRUNCATED>


[09/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
index f49f068..6c91f4f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/BackwardCompatibilityHigherVersionClientDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
index 8a5d29c..539759f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36269DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
index 9af315e..29f7d9c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36457DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
index 7a4791f..045f1b6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36805DUnitTest.java
@@ -32,7 +32,6 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.RegionDestroyedException;
 import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.client.ServerOperationException;
 import com.gemstone.gemfire.cache.client.internal.PoolImpl;
@@ -46,13 +45,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import com.gemstone.gemfire.test.dunit.*;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * bug test for bug 36805

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
index 0f5045c..fa00bef 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36829DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
index 4a05668..b657995 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug36995DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
index a132881..f0240d5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37210DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
index e35a172..ee4471f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/Bug37805DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
index bce5711..962c496 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerMaxConnectionsJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
index c131442..3d9c039 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTestUtil.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
index 8315019..d756c0a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheServerTransactionsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
index 29fb164..7ce6a5a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClearPropagationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index 47524bd..c9125c6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
index 0401f33..429c566 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientHealthMonitorJUnitTest.java
@@ -41,8 +41,8 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index 4261568..e011b55 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -36,7 +36,6 @@ import com.gemstone.gemfire.cache.InterestResultPolicy;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.client.Pool;
 import com.gemstone.gemfire.cache.client.PoolFactory;
 import com.gemstone.gemfire.cache.client.PoolManager;
@@ -55,14 +54,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-import com.gemstone.gemfire.test.dunit.*;
-import com.jayway.awaitility.Awaitility;
-
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * This test verifies the per-client notify-by-subscription (NBS) override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
index 2f10dc1..1d99560 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerForceInvalidateDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.jayway.awaitility.Awaitility.*;
 import static org.junit.Assert.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
index 3d5bdf7..2633f04 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientServerMiscDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
index e0d672f..ff78641 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConflationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
index 8cedd46..4b7afc0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ConnectionProxyJUnitTest.java
@@ -45,8 +45,8 @@ import org.junit.experimental.categories.Category;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
index 74987f0..17ea18d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DataSerializerPropogationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
index 99f4a80..95fce69 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DestroyEntryPropagationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
index 0821592..984a488 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientBug39997DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
index 9ccc3c9..48afb65 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientQueueSizeDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
index b2b1b5c..0f2652d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientReconnectDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.net.SocketException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
index b1f0095..3b68f45 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientStatsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
index 6bfbff3..5727d83 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableRegistrationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
index 46fd108..717acf0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableResponseMatrixDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
index a18adf7..eb4cd7e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/EventIDVerificationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
index b75ca4c..485caa1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
index 2c12118..de8d5c4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
index 4f62f67..eaa45ef 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAStartupAndFailoverDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
index 5879bd4..b087f3b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InstantiatorPropagationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*;
 import static org.junit.Assert.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index b191a85..eec2ffb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
index f5c4bc0..befaeda 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListEndpointDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
index 280ab66..3b1454e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListRecoveryDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.EOFException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
index e16eb9c..b689c58 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestRegrListenerDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
index 6f23ff8..daac7dd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestResultPolicyDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
index 83a9689..6476371 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelJUnitTest.java
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
index a426b8e..17f2246 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RedundancyLevelTestBase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
index 468d82a..f131c7b 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegionCloseDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
index b390f51..f0c8cb3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestBeforeRegionCreationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
index a4a8d16..6147b53 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/RegisterInterestKeysDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
index e69d3d8..595fb5d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ReliableMessagingDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
index 3638eaf..83d0093 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UnregisterInterestDUnitTest.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
index 055a424..41d20d8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/UpdatePropagationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static junit.framework.TestCase.assertNotNull;
 import static org.junit.Assert.assertEquals;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
index 53267b5..c3b2d97 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/VerifyUpdatesFromNonInterestEndPointDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
index cfde00a..596756f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
index 3a1d901..f96926f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.asyncqueue;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
index 5d2e8ac..7ced010 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.asyncqueue;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static junitparams.JUnitParamsRunner.*;
 import static org.junit.Assert.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
index 1092721..a757c56 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheConfigDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.compression;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
index ddf814e..56ce303 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.compression;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
index 16398a7..0bfa910 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.compression;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java
index abcca13..64c2cdb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/AbstractPoolCacheJUnitTest.java
@@ -22,7 +22,7 @@
  */
 package com.gemstone.gemfire.internal.datasource;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.sql.Connection;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java
index a9a20c0..40da84d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/CleanUpJUnitTest.java
@@ -33,7 +33,7 @@ import javax.naming.Context;
 import java.sql.Connection;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.fail;
 
 //import javax.sql.PooledConnection;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
index c69ddf0..779705e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolCacheImplJUnitTest.java
@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.fail;
 
 /*

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java
index 15832d9..4f4d3b2 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/ConnectionPoolingJUnitTest.java
@@ -40,7 +40,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java
index 768b0c0..71ccf4b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/DataSourceFactoryJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.datasource;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.sql.Connection;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java
index 03673bc..bf7dcb1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/datasource/RestartJUnitTest.java
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
 import javax.transaction.TransactionManager;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java
index ce54aa1..a1dd18e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/BlockingTimeOutJUnitTest.java
@@ -39,7 +39,7 @@ import java.sql.Statement;
 import java.util.Properties;
 import java.util.Random;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertNotNull;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java
index bbec7c4..1ef9ea3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/CacheUtils.java
@@ -39,7 +39,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
index b1f6b1b..d586d61 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
@@ -36,7 +36,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * This test case is to test the following test scenarios: 1) Get Simple DS

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java
index 216e4b0..a0262e0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/ExceptionJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
index 84d1978..f4d3e58 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.sql.Connection;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java
index 7795056..4dab61d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/JtaIntegrationJUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
 import javax.transaction.Transaction;
 import javax.transaction.TransactionManager;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java
index 0468821..ceb8d63 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionImplJUnitTest.java
@@ -29,7 +29,7 @@ import javax.transaction.Synchronization;
 import javax.transaction.UserTransaction;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertTrue;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java
index c4a344e..ac000d9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionManagerImplJUnitTest.java
@@ -27,7 +27,7 @@ import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
index 727e1ea..de9581a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java
index 303d4f4..4a013fa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/UserTransactionImplJUnitTest.java
@@ -29,7 +29,7 @@ import javax.transaction.Transaction;
 import javax.transaction.UserTransaction;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
index a7edbd4..4b651cb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.BufferedReader;
@@ -139,7 +139,7 @@ public class ExceptionsDUnitTest extends JUnit4DistributedTestCase {
     wr.close();
     props.setProperty(CACHE_XML_FILE, path);
 //    String tableName = "";
-    //		  props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10339");
+    //		  props.setProperty(DistributionConfig.ConfigurationProperties.MCAST_PORT, "10339");
     try {
       //			   ds = DistributedSystem.connect(props);
       ds = (new ExceptionsDUnitTest()).getSystem(props);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
index 2440f35..8e12224 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.CACHE_XML_FILE;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.CACHE_XML_FILE;
 import static org.junit.Assert.*;
 
 import java.io.BufferedReader;
@@ -149,7 +149,7 @@ public class IdleTimeOutDUnitTest extends JUnit4DistributedTestCase {
     wr.close();
     props.setProperty(CACHE_XML_FILE, path);
     String tableName = "";
-    //	        props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "10339");
+    //	        props.setProperty(DistributionConfig.ConfigurationProperties.MCAST_PORT, "10339");
     try {
       //	  	      ds = DistributedSystem.connect(props);
       ds = (new IdleTimeOutDUnitTest()).getSystem(props);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
index 85f265c..59e776d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
index c6284d6..7c110ca 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
index 0e7660f..f63e571 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
index 86d4d51..acaf287 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
index a3b3b53..c9c640e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.jta.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
index fdf1f7c..5588f85 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
@@ -41,7 +41,7 @@ import java.io.FileNotFoundException;
 import java.util.Properties;
 import java.util.Scanner;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
index 83cf09e..17b784c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.logging;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
index bec2bc4..19bfbaa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.logging;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
index 6a3cf07..89ec3da 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
@@ -39,7 +39,7 @@ import org.junit.rules.TestName;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.logging.log4j.custom.CustomConfiguration.*;
 import static org.assertj.core.api.Assertions.assertThat;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java
index 43a8d4b..79bc3a9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/InlineKeyJUnitTest.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionShortcut;
 import com.gemstone.gemfire.cache.util.ObjectSizer;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.cache.*;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.Test;
@@ -29,8 +29,8 @@ import org.junit.experimental.categories.Category;
 import java.util.Properties;
 import java.util.UUID;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -40,7 +40,7 @@ public class InlineKeyJUnitTest {
     Properties props = new Properties();
     props.setProperty(LOCATORS, "");
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "1m");
+    props.setProperty(ConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "1m");
     GemFireCacheImpl result = (GemFireCacheImpl) new CacheFactory(props).create();
     return result;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java
index 78aed21..0d2effe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapIndexJUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.internal.offheap;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.RegionFactory;
 import com.gemstone.gemfire.cache.query.*;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.After;
@@ -29,8 +29,8 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
@@ -48,7 +48,7 @@ public class OffHeapIndexJUnitTest {
     Properties props = new Properties();
     props.setProperty(LOCATORS, "");
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "100m");
+    props.setProperty(ConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "100m");
     this.gfc = (GemFireCacheImpl) new CacheFactory(props).create();
   }
   @After


[11/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
index ac3c23e..be5e8c7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/RoleDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
index 05be3d8..fbd0ab9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java
@@ -38,7 +38,7 @@ import static com.googlecode.catchexception.apis.BDDCatchException.caughtExcepti
 import static com.googlecode.catchexception.apis.BDDCatchException.when;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.BDDAssertions.then;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Integration tests for ServerLauncher class. These tests may require file system and/or network I/O.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
index 6b73898..1baf48d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.DataPolicy;
@@ -49,7 +49,7 @@ import java.lang.management.ManagementFactory;
 import java.net.BindException;
 import java.net.InetAddress;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -415,7 +415,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
         .setForce(true)
         .setMemberName(getUniqueName())
         .setRedirectOutput(true)
-        .set(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "0");
+        .set(DistributionConfig.ConfigurationProperties.MCAST_PORT, "0");
 
     assertTrue(builder.getForce());
     this.launcher = builder.build();
@@ -696,7 +696,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn
         .setMemberName(getUniqueName())
         .setRedirectOutput(true)
         .set(logLevel, "config")
-        .set(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "0");
+        .set(DistributionConfig.ConfigurationProperties.MCAST_PORT, "0");
 
     assertFalse(builder.getForce());
     this.launcher = builder.build();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
index 183851f..6d20673 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherRemoteIntegrationTest.java
@@ -47,7 +47,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
@@ -1299,8 +1299,8 @@ public class ServerLauncherRemoteIntegrationTest extends AbstractServerLauncherR
   @Override
   protected List<String> getJvmArguments() {
     final List<String> jvmArguments = new ArrayList<String>();
-    jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + DistributedSystemConfigProperties.LOG_LEVEL+"=config");
-    jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + DistributedSystemConfigProperties.MCAST_PORT+"=0");
+    jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + ConfigurationProperties.LOG_LEVEL+"=config");
+    jvmArguments.add("-D" + DistributionConfig.GEMFIRE_PREFIX + ConfigurationProperties.MCAST_PORT+"=0");
     return jvmArguments;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
index c2036c7..f8c9831 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java
@@ -45,7 +45,7 @@ import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.junit.Assert.*;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * The ServerLauncherTest class is a test suite of unit tests testing the contract, functionality and invariants

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java
index 5b61d76..c0d0827 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherWithProviderIntegrationTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.Mockito;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
index 4c22cfd..7c70dc4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/Bug40751DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.DataInput;
@@ -111,7 +111,7 @@ public class Bug40751DUnitTest extends JUnit4CacheTestCase {
     Properties props = new Properties();
     System.setProperty("p2p.oldIO", "true");
     props.setProperty(CONSERVE_SOCKETS, "true");
-    //    props.setProperty(DistributionConfig.DistributedSystemConfigProperties.MCAST_PORT, "12333");
+    //    props.setProperty(DistributionConfig.ConfigurationProperties.MCAST_PORT, "12333");
     //    props.setProperty(DistributionConfig.DISABLE_TCP_NAME, "true");
     return props;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
index 3c48fb9..a6e047f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ConsoleDistributionManagerDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.net.InetAddress;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 d94dab1..9d0740e 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
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.InternalGemFireException;
 import com.gemstone.gemfire.UnmodifiableException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
index 86e0fdc..7cd41bd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.net.InetAddress;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index e1e38d3..7cc475f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -37,7 +37,7 @@ import java.util.Enumeration;
 import java.util.Properties;
 import java.util.logging.Level;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
index ba16278..b97c832 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/LDM.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
index cc99bad..7c54f6d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java
index a936dd1..304dcd1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/DLockReentrantLockJUnitTest.java
@@ -27,8 +27,8 @@ import org.junit.experimental.categories.Category;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 @Category(IntegrationTest.class)
 public class DLockReentrantLockJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
index d13f476..9c7180e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
@@ -40,7 +40,7 @@ import java.io.File;
 import java.net.InetAddress;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
index 9389916..78f752a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
@@ -39,7 +39,7 @@ import java.util.Properties;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 @Category({ UnitTest.class, SecurityTest.class })
 public class GMSAuthenticatorJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 4e2b690..d29553c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -52,7 +52,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
index cb10074..fcf77a0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
@@ -40,7 +40,7 @@ import java.io.ObjectOutputStream;
 import java.net.InetAddress;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
index 7ea48ce..44c3cb8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/StatRecorderJUnitTest.java
@@ -38,8 +38,8 @@ import org.junit.experimental.categories.Category;
 import java.util.Properties;
 import java.util.concurrent.RejectedExecutionException;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index 3a6060e..58dbe48 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed.internal.membership.gms.messenger;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
index c761c0d..ba9be84 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
@@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyInt;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index 4bf7ecb..954aff4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.distributed.internal.tcpserver;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
index e776e2a..77982c5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
@@ -21,15 +21,13 @@ 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 com.gemstone.gemfire.cache30.CacheMapTxnDUnitTest;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.VM;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java
index 9a72a48..4460203 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXExpiryJUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Same tests as that of {@link TXExpiryJUnitTest} after setting
@@ -46,7 +46,7 @@ public class DistTXExpiryJUnitTest extends TXExpiryJUnitTest {
   protected void createCache() throws CacheException {
     Properties p = new Properties();
     p.setProperty(MCAST_PORT, "0"); // loner
-    p.setProperty(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
+    p.setProperty(ConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
     this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
         .connect(p));
     AttributesFactory af = new AttributesFactory();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
index 8d95bcc..791e7f4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Run the basic transaction functionality tests in TXJUnitTest after setting

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java
index 9dc6a96..7c2bf47 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXManagerImplJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static junit.framework.TestCase.*;
 
 import java.util.Properties;
@@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.CacheTransactionManager;
 import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.cache.TXManagerImpl;
 import com.gemstone.gemfire.internal.cache.TXManagerImplJUnitTest;
 import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
@@ -44,7 +44,7 @@ public class DistTXManagerImplJUnitTest extends TXManagerImplJUnitTest {
     Properties props = new Properties();
     props.put(MCAST_PORT, "0");
     props.put(LOCATORS, "");
-    props.put(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
+    props.put(ConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
     cache = new CacheFactory(props).create();
     region = cache.createRegionFactory(RegionShortcut.REPLICATE).create("testRegion");
     CacheTransactionManager txmgr = cache.getCacheTransactionManager();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
index 9d4623b..91e0cc0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
index be91e81..33a16b4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXReleasesOffHeapOnCloseJUnitTest.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.disttx;
 
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.CacheTransactionManager;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.offheap.TxReleasesOffHeapOnCloseJUnitTest;
 import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -26,8 +26,8 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 
 /**
@@ -46,8 +46,8 @@ public class DistTXReleasesOffHeapOnCloseJUnitTest extends
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "1m");
-    props.put(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
+    props.setProperty(ConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "1m");
+    props.put(ConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
     cache = new CacheFactory(props).create();
     CacheTransactionManager txmgr = cache.getCacheTransactionManager();
     assert(txmgr.isDistributed());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
index b8165d5..9e053ac 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
index 32f6dae..e1ad0f5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java
index 851078d..f1a7590 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterJUnitTest.java
@@ -21,8 +21,8 @@ import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Same tests as that of {@link TXWriterJUnitTest} after setting
@@ -45,7 +45,7 @@ public class DistTXWriterJUnitTest extends TXWriterJUnitTest {
   protected void createCache() throws CacheException {
     Properties p = new Properties();
     p.setProperty(MCAST_PORT, "0"); // loner
-    p.setProperty(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
+    p.setProperty(ConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
     this.cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(p));
     AttributesFactory<?, ?> af = new AttributesFactory<String, String>();
     af.setScope(Scope.DISTRIBUTED_NO_ACK);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java
index bd6a2f2..c2ca80d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWriterOOMEJUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Same tests as that of {@link TXWriterOOMEJUnitTest} after setting
@@ -45,7 +45,7 @@ public class DistTXWriterOOMEJUnitTest extends TXWriterOOMEJUnitTest {
   protected void createCache() throws CacheException {
     Properties p = new Properties();
     p.setProperty(MCAST_PORT, "0"); // loner
-    p.setProperty(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
+    p.setProperty(ConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
     this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
         .connect(p));
     AttributesFactory<?, ?> af = new AttributesFactory<String, String>();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
index 362127e..1025923 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
index f696795..69a2003 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
@@ -18,8 +18,8 @@ package com.gemstone.gemfire.disttx;
 
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.PRTXJUnitTest;
 import com.gemstone.gemfire.test.junit.categories.DistributedTransactionsTest;
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Same tests as that of {@link PRTXJUnitTest} after setting
@@ -47,7 +47,7 @@ public class PRDistTXJUnitTest extends PRTXJUnitTest {
   protected void createCache() throws Exception {
     Properties p = new Properties();
     p.setProperty(MCAST_PORT, "0"); // loner
-    p.setProperty(DistributedSystemConfigProperties.DISTRIBUTED_TRANSACTIONS, "true");
+    p.setProperty(ConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
     this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
         .connect(p));
     createRegion();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
index 880606c..eb8784d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
index 5f28a2e..9721c58 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
index cf1cbe8..400f872 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
@@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category;
 import java.lang.reflect.Method;
 import java.util.Map;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java
index db34dad..3505bc2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/Bug51616JUnitTest.java
@@ -23,8 +23,8 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 @Category(IntegrationTest.class)
 public class Bug51616JUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
index e3e086b..ef07633 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
@@ -42,7 +42,7 @@ import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeFalse;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java
index 5663894..7abd7e5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireVersionIntegrationJUnitTest.java
@@ -27,7 +27,7 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertNotNull;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java
index 9f66653..7071256 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/InlineKeyJUnitTest.java
@@ -28,8 +28,8 @@ import org.junit.experimental.categories.Category;
 import java.util.Properties;
 import java.util.UUID;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
index e7683dd..d0d906a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
@@ -42,7 +42,7 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java
index 68b81bf..8581b85 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarClassLoaderJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
index 4c24a61..5f82cb7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
@@ -44,8 +44,8 @@ import org.junit.experimental.categories.Category;
 import com.gemstone.gemfire.cache.execute.Execution;
 import com.gemstone.gemfire.cache.execute.FunctionService;
 import com.gemstone.gemfire.cache.execute.ResultCollector;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.Host;
@@ -463,7 +463,7 @@ public class JarDeployerDUnitTest extends JUnit4CacheTestCase {
     // Add the alternate directory to the distributed system, get it back out, and then create
     // a JarDeployer object with it.
     Properties properties = new Properties();
-    properties.put(DistributedSystemConfigProperties.DEPLOY_WORKING_DIR, alternateDir.getAbsolutePath());
+    properties.put(ConfigurationProperties.DEPLOY_WORKING_DIR, alternateDir.getAbsolutePath());
     InternalDistributedSystem distributedSystem = getSystem(properties);
     final JarDeployer jarDeployer = new JarDeployer(distributedSystem.getConfig().getDeployWorkingDir());
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
index 4c50ab0..f4b3df8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java
index 19d5e6f..a51c30b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldJUnitTest.java
@@ -31,8 +31,8 @@ import java.io.File;
 import java.util.Collection;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
index 345cefb..2eb0b86 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java
index 720b04c..d4a2653 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameJUnitTest.java
@@ -32,8 +32,8 @@ import java.util.Collection;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
index d37d952..cdb28e1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/RegionOperationsEqualityShouldUseArrayEqualsIntegrationTest.java
@@ -26,8 +26,8 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.fail;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
index 02fee67..7c1b92b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
@@ -25,7 +25,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertTrue;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
index 62b4adf..c8addf8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Map.Entry;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
index 89efa8f..a78f4c3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/BackupJUnitTest.java
@@ -32,7 +32,7 @@ import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java
index d9eea38..5c5c56c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug33726JUnitTest.java
@@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.fail;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java
index 1e6de9a..44a1403 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug34583JUnitTest.java
@@ -30,7 +30,7 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
index 1f85e5f..ae83a39 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37244JUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
index b24673d..e1fff62 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug39079DUnitTest.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
index dfe502e..9030de2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41091DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
index 05966b3..370818f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug41957DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
index 6702a64..f837fda 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug45934DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java
index 4e6f93c..d2357e3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug48182JUnitTest.java
@@ -17,7 +17,7 @@
 package com.gemstone.gemfire.internal.cache;
 
 import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.After;
 import org.junit.Before;
@@ -26,8 +26,8 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -124,7 +124,7 @@ public class Bug48182JUnitTest {
     Properties props = new Properties();
     props.setProperty(LOCATORS, "");
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
+    props.setProperty(ConfigurationProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
     GemFireCacheImpl result = (GemFireCacheImpl) new CacheFactory(props).create();
     return result;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java
index 6f70a27..932504c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheLifecycleListenerJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
index f8314bb..61a7336 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/CacheServiceJUnitTest.java
@@ -23,7 +23,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
index ad1a8aa..776333a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientMessagesRegionCreationAndDestroyJUnitTest.java
@@ -35,7 +35,7 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index 84445b8..f357201 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
index 35b1162..13eed2f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerInvalidAndDestroyedEntryDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
index 1c9b401..860833e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerTransactionDUnitTest.java
@@ -21,12 +21,8 @@ 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 static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -40,7 +36,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.naming.Context;
 import javax.transaction.UserTransaction;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.Region.Entry;
@@ -62,14 +58,8 @@ import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
 import com.gemstone.gemfire.internal.cache.tx.ClientTXStateStub;
 import com.gemstone.gemfire.test.dunit.*;
 
-import javax.naming.Context;
-import javax.transaction.UserTransaction;
-import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java
index 3b7c6df..33179dc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapLocalJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import org.junit.After;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
index 7f03ad1..74283e7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConcurrentMapOpsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
index c0be121..b8ec088 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ConnectDisconnectDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
index 8815318..d754dc3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationDUnitTest.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
index 20deab0..9629db0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
@@ -19,7 +19,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
index 56f533a..109ba79 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOfflineCompactionJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
index 1b78dae..bb19aed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskOldAPIsJUnitTest.java
@@ -22,7 +22,6 @@ import java.io.File;
 import java.util.Properties;
 import java.util.Set;
 
-import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.After;
@@ -38,15 +37,8 @@ import com.gemstone.gemfire.cache.DiskWriteAttributesFactory;
 import com.gemstone.gemfire.cache.EvictionAction;
 import com.gemstone.gemfire.cache.EvictionAttributes;
 import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 
-import java.io.File;
-import java.util.Properties;
-import java.util.Set;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
-import static org.junit.Assert.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Tests the old disk apis to make sure they do the correct thing.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
index 3849be3..3443d60 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
index 591046f..ef1bc77 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.io.File;
 import java.io.FileWriter;



[05/17] incubator-geode git commit: GEODE-1377: Refactoring as per review comments

Posted by ud...@apache.org.
GEODE-1377: Refactoring as per review comments


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

Branch: refs/heads/develop
Commit: ad7fd7e1807ceae3f13b9684c03b4c19cb9f1f78
Parents: 11e6374
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Jun 8 16:45:49 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Jun 10 05:39:36 2016 +1000

----------------------------------------------------------------------
 .../operations/InterestOperationContext.java    |    4 +-
 .../gemfire/distributed/DistributedSystem.java  | 1389 -----------------
 .../DistributedSystemConfigProperties.java      | 1394 ++++++++++++++----
 .../internal/AbstractDistributionConfig.java    |    2 +
 .../internal/DistributionConfig.java            |   18 +-
 .../internal/DistributionConfigImpl.java        |    2 +
 .../internal/RuntimeDistributionConfigImpl.java |    2 +
 .../gemfire/internal/AbstractConfig.java        |    2 +-
 .../gemfire/internal/logging/LogConfig.java     |    2 +-
 .../internal/security/GeodeSecurityUtil.java    |    2 +-
 .../gms/auth/GMSAuthenticatorJUnitTest.java     |   12 +-
 .../query/dunit/QueryMonitorDUnitTest.java      |  958 +++++-------
 12 files changed, 1499 insertions(+), 2288 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
index 18aff9e..2cdd13e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/operations/InterestOperationContext.java
@@ -33,7 +33,7 @@ public abstract class InterestOperationContext extends OperationContext {
 
   /**
    * Constructor for the register interest operation.
-   * 
+   *
    * @param key
    *                the key or list of keys being registered/unregistered
    * @param interestType
@@ -73,7 +73,7 @@ public abstract class InterestOperationContext extends OperationContext {
 
   /**
    * Get the <code>InterestType</code> of this register/unregister operation.
-   * 
+   *
    * @return the <code>InterestType</code> of this request.
    */
   public InterestType getInterestType() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
index 092131b..12e1837 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
@@ -88,1395 +88,6 @@ import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties
  * resources and allows your application to connect to a different
  * distributed system, if desirable.
  *
- * <P>
- *
- * <CENTER>
- * <B><a name="configuration">Configuration</a></B>
- * </CENTER>
- *
- * <P>
- *
- * There are a number of configuration properties that can be set when
- * a program {@linkplain #connect connects} to a distributed system.
- *
- * <P>
- *
- * <B>Distribution Configuration Properties</B>
- *
- * <dl>
- *   <a name="groups"><dt>groups</dt></a>
- *   <dd><U>Description</U>: Defines the list of groups this member belongs to.
- *   Use commas to separate group names.
- *   Note that anything defined by the deprecated roles gemfire property will also be considered a group.
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 7.0</dd>
- * </dl>
- * <dl>
- *   <a name="name"><dt>name</dt></a>
- *   <dd><U>Description</U>: Uniquely identifies a member in its distributed system.
- *   If two members with the same name try to join the same distributed system
- *   then the second join will fail.</dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
-
- * <dl>
- *   <a name="distributed-system-id"><dt>distributed-system-id</dt></a>
- *<dd> A number that uniquely identifies this distributed system, when
- * using the WAN gateway to share data between multiple distributed systems. This
- * setting is only required when using the WAN gateway in conjunction with
- * the Portable Data eXchange (PDX) serialization format.
- * 
- * If set, this setting must be the same for every member in this distributed
- * system. It must be different than the number in other distributed systems
- * that this one will connect to using the WAN.
- * 
- * -1 means no setting.</dd>
- * 
- *   <dd><U>Range</U>-1..255</dd>
- *   <dd><U>Default</U>: "-1"</dd>
- * </dl>
- *
- * <dl>
- *   <a name="mcast-port"><dt>mcast-port</dt></a>
- *   <dd><U>Description</U>: The port used for multicast networking.
- *   If zero, then multicast will be disabled and unicast messaging will
- *   be used.
- *   </dd>
- *   <dd><U>Default</U>: "0"</dd>
- * </dl>
- *
- * <dl>
- *   <a name="mcast-address"><dt>mcast-address</dt></a>
- *   <dd><U>Description</U>: The IP address used for multicast
- *   networking.  If mcast-port is zero, then mcast-address is
- *   ignored.
- *   </dd>
- *   <dd><U>Default</U>: "239.192.81.1"</dd>
- * </dl>
- * <dl>
- *   <a name="mcast-ttl"><dt>mcast-ttl</dt></a>
- *   <dd><U>Description</U>: Determines how far through your network
- *   the multicast packets used by GemFire will propagate.
- *   <dd><U>Default</U>: "32"</dd>
- *   <dd><U>Allowed values</U>: 0..255</dd>
- *   <dd><U>Since</U>: 4.1</dd>
- * </dl>
- * <dl>
- *   <a name="mcast-send-buffer-size"><dt>mcast-send-buffer-size</dt></a>
- *   <dd><U>Description</U>: Sets the size of the socket buffer used for
- *    outgoing multicast transmissions.
- *   <dd><U>Default</U>: "65535"</dd>
- *   <dd><U>Allowed values</U>: 2048..Operating System maximum</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- * <dl>
- *   <a name="mcast-recv-buffer-size"><dt>mcast-recv-buffer-size</dt></a>
- *   <dd><U>Description</U>: Sets the size of the socket buffer used for
- *    incoming multicast transmissions.  You should set this high if there will be
- *    high volumes of messages.
- *   <dd><U>Default</U>: "1048576"</dd>
- *   <dd><U>Allowed values</U>: 2048..Operating System maximum</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- * <dl>
- *   <a name="mcast-flow-control"><dt>mcast-flow-control</dt></a>
- *   <dd><U>Description</U>: Configures the flow-of-control protocol for
- *    multicast messaging.  There are three settings that are separated
- *    by commas:  byteAllowance (integer), rechargeThreshold (float) and
- *    rechargeBlockMs (integer).  The byteAllowance determines how many bytes
- *    can be sent without a recharge from other processes.  The rechargeThreshold
- *    tells receivers how low the sender's initial to remaining allowance
- *    ratio should be before sending a recharge.  The rechargeBlockMs
- *    tells the sender how long to wait for a recharge before explicitly
- *    requesting one.</dd>
- *   <dd><U>Deprecated</U>: as of 9.0 GemFire does not include a flow-of-control protocol for multicast messaging.</dd>
- *   <dd><U>Default</U>: "1048576,0.25,5000"</dd>
- *   <dd><U>Allowed values</U>: 100000-maxInt, 0.1-0.5, 500-60000</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- *
- * <dl>
- *   <a name="udp-send-buffer-size"><dt>udp-send-buffer-size</dt></a>
- *   <dd><U>Description</U>: Sets the size of the socket buffer used for
- *    outgoing udp point-to-point transmissions.
- *   <dd><U>Default</U>: "65535"</dd>
- *   <dd><U>Allowed values</U>: 2048..Operating System maximum</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- * <dl>
- *   <a name="udp-recv-buffer-size"><dt>udp-recv-buffer-size</dt></a>
- *   <dd><U>Description</U>: Sets the size of the socket buffer used for
- *    incoming udp point-to-point transmissions.  Note: if multicast is not
- *    enabled and disable-tcp is not enabled, a reduced default size of
- *    65535 is used.
- *   <dd><U>Default</U>: "1048576 if multicast is enabled or disable-tcp is true, 131071 if not"</dd>
- *   <dd><U>Allowed values</U>: 2048..Operating System maximum</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- * <dl>
- *   <a name="udp-fragment-size"><dt>udp-fragment-size</dt></a>
- *   <dd><U>Description</U>: When messages are sent over datagram sockets,
- *    GemFire breaks large messages down into fragments for transmission.
- *    This property sets the maximum fragment size for transmission.
- *   <dd><U>Default</U>: "60000"</dd>
- *   <dd><U>Allowed values</U>: 1000..60000</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- * <dl>
- *   <a name="disable-tcp"><dt>disable-tcp</dt></a>
- *   <dd><U>Description</U>: Turns off use of tcp/ip sockets, forcing the
- *    cache to use datagram sockets for all communication.  This is useful
- *    if you have a large number of processes in the distributed cache since
- *    it eliminates the per-connection reader-thread that is otherwise required.
- *    However, udp communications are somewhat slower than tcp/ip communications
- *    due to the extra work required in Java to break messages down to
- *    transmittable sizes, and the extra work required to guarantee
- *    message delivery.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- *   <dd><U>Allowed values</U>: true or false</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- * <dl>
- *   <a name="tcp-port"><dt>tcp-port</dt></a>
- *   <dd><U>Description</U>: A 16-bit integer that determines the tcp/ip port number to listen on
- *     for cache communications.  If zero, the operating system will select
- *     an available port to listen on.  Each process on a machine must have
- *     its own tcp-port.  Note that some operating systems restrict the range
- *     of ports usable by non-privileged users, and using restricted port
- *     numbers can cause runtime errors in GemFire startup.
- *   </dd>
- *   <dd><U>Default</U>: "0"</dd>
- *   <dd><U>Allowed values</U>: 0..65535</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- * <dl>
- *   <a name="member-timeout"><dt>member-timeout</dt></a>
- *   <dd><U>Description</U>: Sets the timeout interval, in milliseconds, used
- *   to determine whether another process is alive or not.  When another process
- *   appears to be gone, GemFire sends it an ARE-YOU-DEAD message and waits
- *   for the member-timeout period for it to respond and declare it is not dead.
- *   </dd>
- *   <dd><U>Default</U>: "5000"</dd>
- *   <dd><U>Allowed values</U>: 1000-600000</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- * <dl>
- *   <a name="bind-address"><dt>bind-address</dt></a>
- *   <dd><U>Description</U>: The IP address that this distributed system's
- *   server sockets will listen on.
- *   If set to an empty string then the local machine's
- *   default address will be listened on.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- * <!--
- * <dl>
- *   <a name="server-bind-address"><dt>server-bind-address</dt></a>
- *   <dd><U>Description</U>: The IP address that this distributed system's
- *   server sockets in a client-server topology will listen on.
- *   If set to an empty string then all of the local machine's
- *   addresses will be listened on.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- * -->
- * <dl>
- *   <a name="membership-port-range"><dt>membership-port-range</dt></a>
- *   <dd><U>Description</U>: The allowed range of ports for use in forming an
- *   unique membership identifier (UDP), for failure detection purposes (TCP) and
- *   to listen on for peer connections (TCP). This range is given as two numbers
- *   separated by a minus sign. Minimum 3 values in range are required to
- *   successfully startup.
- *   </dd>
- *   <dd><U>Default</U>: 1024-65535</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="locators"><dt>locators</dt></a>
- *   <dd><U>Description</U>: A list of locators (host and port) that
- *   are used to find other member of the distributed system.  This
- *   attribute's value is a possibly empty comma separated list.  Each
- *   element must be of the form "hostName[portNum]" and may be of the
- *   form "host:bindAddress[port]" if a specific bind address is to be
- *   used on the locator machine.  The square
- *   brackets around the portNum are literal character and must be
- *   specified.<p>
- *   Since IPv6 bind addresses may contain colons, you may use an at symbol
- *   instead of a colon to separate the host name and bind address.
- *   For example, "server1@fdf0:76cf:a0ed:9449::5[12233]" specifies a locator
- *   running on "server1" and bound to fdf0:76cf:a0ed:9449::5 on port 12233.<p>
- *   If "locators" is empty
- *   then this distributed system will be isolated from all other GemFire
- *   processes.<p>
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="locator-wait-time"><dt>locator-wait-time</dt></a>
- *   <dd><U>Description</U>: The number of seconds to wait for a locator to start
- *   if one is not available when attempting to join the distributed system.  This
- *   setting can be used when locators and peers are being started all at once in
- *   order to have the peers be patient and wait for the locators to finish starting
- *   up before attempting to join the distributed system..<p>
- *   </dd>
- *   <dd><U>Default</U>: "0"</dd>
- * 
- * <dl>
- *   <a name="remote-locators"><dt>remote-locators</dt></a>
- *   <dd><U>Description</U>: A list of locators (host and port) that a cluster
- *   will use in order to connect to a remote site in a multi-site (WAN) 
- *   configuration. This attribute's value is a possibly comma separated list.
- *   <p>For each remote locator, provide a hostname and/or address 
- *   (separated by '@', if you use both), followed by a port number in brackets.
- *   <p>Examples:
- *   remote-locators=address1[port1],address2[port2]
- *   <p>
- *   remote-locators=hostName1@address1[port1],hostName2@address2[port2]
- *   <p>
- *   remote-locators=hostName1[port1],hostName2[port2]<p>
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="start-locator"><dt>start-locator</dt></a>
- *   <dd><U>Description</U>: A host name or bind-address and port 
- *   ("host[port],peer=<true|false>,server=<true|false>")
- *   that are used to start a locator in the same process as the DistributedSystem.
- *   The locator is started when the DistributedSystem connects,
- *   and is stopped when the DistributedSystem disconnects.  To start a
- *   locator that is not tied to the DistributedSystem's lifecycle, see
- *   the {@link Locator} class in this same package.<p>
- *   
- *   The peer and server parameters are optional. They specify whether
- *   the locator can be used for peers to discover each other, or for clients
- *   to discover peers. By default both are true.
- *   </dd>
- *   <dd><U>Default</U>: "" (doesn't start a locator)</dd>
- * </dl>
- *
- * <dl>
- *   <a name="ssl-enabled"><dt>ssl-enabled</dt></a>
- *   <dd><U>Description</U>: If true, all gemfire socket communication is
- *   configured to use SSL through JSSE.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- *   <dd><U>Deprecated</U>: as of 8.0 use <a href="#cluster-ssl-enabled"><code>cluster-ssl-enabled</code></a> instead.</dd>
- * </dl>
- *
- * <dl>
- *   <a name="ssl-protocols"><dt>ssl-protocols</dt></a>
- *   <dd><U>Description</U>: A space separated list of the SSL protocols to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>
- *   <dd><U>Default</U>: "any"</dd>
- *   <dd><U>Deprecated</U>: as of 8.0 use <a href="#cluster-ssl-protocols"><code>cluster-ssl-protocols</code></a> instead.</dd>
- * </dl>
- *
- * <dl>
- *   <a name="ssl-ciphers"><dt>ssl-ciphers</dt></a>
- *   <dd><U>Description</U>: A space separated list of the SSL cipher suites to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>
- *   <dd><U>Default</U>: "any"</dd>
- *   <dd><U>Deprecated</U>: as of 8.0 use <a href="#cluster-ssl-ciphers"><code>cluster-ssl-ciphers</code></a> instead.</dd>
- * </dl>
- *
- * <dl>
- *   <a name="ssl-require-authentication"><dt>ssl-require-authentication</dt></a>
- *   <dd><U>Description</U>: If false, allow ciphers that do not require the client
- *   side of the connection to be authenticated.
- *   </dd>
- *   <dd><U>Default</U>: "true"</dd>
- *   <dd><U>Deprecated</U>: as of 8.0 use <a href="#cluster-ssl-require-authentication"><code>cluster-ssl-require-authentication</code></a> instead.</dd>
- * </dl>
- *
- * <dl>
- *   <a name="cluster-ssl-enabled"><dt>cluster-ssl-enabled</dt></a>
- *   <dd><U>Description</U>: If true, all gemfire socket communication is
- *   configured to use SSL through JSSE. Preferably Use cluster-ssl-* properties
- *   rather than ssl-* properties.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="cluster-ssl-protocols"><dt>cluster-ssl-protocols</dt></a>
- *   <dd><U>Description</U>: A space separated list of the SSL protocols to
- *   enable. Those listed must be supported by the available providers.Preferably
- *   use cluster-ssl-* properties rather than ssl-* properties.
- *   </dd>
- *   <dd><U>Default</U>: "any"</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="cluster-ssl-ciphers"><dt>cluster-ssl-ciphers</dt></a>
- *   <dd><U>Description</U>: A space separated list of the SSL cipher suites to
- *   enable. Those listed must be supported by the available providers.Preferably
- *   use cluster-ssl-* properties rather than ssl-* properties.
- *   </dd>
- *   <dd><U>Default</U>: "any"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="cluster-ssl-require-authentication"><dt>cluster-ssl-require-authentication</dt></a>
- *   <dd><U>Description</U>: If false, allow ciphers that do not require the
- *   client side of the connection to be authenticated.Preferably use
- *   cluster-ssl-* properties rather than ssl-* properties.
- *   </dd>
- *   <dd><U>Default</U>: "true"</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="cluster-ssl-keystore"><dt>cluster-ssl-keystore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing
- *   certificate and private key.</dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="cluster-ssl-keystore-type"><dt>cluster-ssl-keystore-type</dt></a>
- *   <dd><U>Description</U>For Java keystore file format, this property has the
- *   value jks (or JKS).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="cluster-ssl-keystore-password"><dt>cluster-ssl-keystore-password</dt></a>
- *   <dd><U>Description</U>Password to access the private key from the keystore
- *   file specified by javax.net.ssl.keyStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="cluster-ssl-truststore"><dt>cluster-ssl-truststore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing the
- *   collection of CA certificates trusted by distributed member (trust store).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="cluster-ssl-truststore-password"><dt>cluster-ssl-truststore-password</dt></a>
- *   <dd><U>Description</U>Password to unlock the keystore file (store password)
- *   specified by javax.net.ssl.trustStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="ack-wait-threshold"><dt>ack-wait-threshold</dt></a>
- *   <dd><U>Description</U>: The number of seconds the distributed
- *   system will wait for a message to be acknowledged before it sends
- *   a <i>warning</i> level alert to signal that something might be wrong with the system
- *   node that is unresponsive.  After sending this alert the waiter
- *   continues to wait. The alerts are logged in the log as warnings
- *   and will cause an alert notification in the Admin API and GemFire
- *   JMX Agent.</dd>
- *   <dd><U>Default</U>: "15"</dd>
- *   <dd><U>Allowed values</U>: 1..2147483647</dd>
- * </dl>
- *
- * <dl>
- *   <a name="ack-severe-alert-threshold"><dt>ack-severe-alert-threshold</dt></a>
- *   <dd><U>Description</U>:
- *   The number of seconds the distributed
- *   system will wait after the ack-wait-threshold for a message to be
- *   acknowledged before it issues an alert at <i>severe</i> level.  The
- *   default value is zero, which turns off this feature.<p>
- *   when ack-severe-alert-threshold is used, GemFire will also initiate
- *   additional checks to see if the process is alive.  These checks will
- *   begin when the ack-wait-threshold is reached and will continue until
- *   GemFire has been able to communicate with the process and ascertain its
- *   status.
- *   <dd><U>Default</U>: "0"</dd>
- *   <dd><U>Allowed values</U>: 0..2147483647</dd>
- * </dl>
- *
- * <dl>
- *   <a name="conserve-sockets"><dt>conserve-sockets</dt></a>
- *   <dd><U>Description</U>: If "true" then a minimal number of sockets
- *   will be used when connecting to the distributed system. This conserves
- *   resource usage but can cause performance to suffer.
- *   If "false" then every application thread that sends
- *   distribution messages to other members of the distributed system
- *   will own its own sockets and have exclusive access to them.
- *   The length of time a thread can have exclusive access to a socket
- *   can be configured with "socket-lease-time".
- *   <dd><U>Default</U>: "true"</dd>
- *   <dd><U>Allowed values</U>: true|false</dd>
- *   <dd><U>Since</U>: 4.1</dd>
- * </dl>
- * <dl>
- *   <a name="socket-lease-time"><dt>socket-lease-time</dt></a>
- *   <dd><U>Description</U>: The number of milliseconds a thread
- *   can keep exclusive access to a socket that it is not actively using.
- *   Once a thread loses its lease to a socket it will need to re-acquire
- *   a socket the next time it sends a message.
- *   A value of zero causes socket leases to never expire.
- *   This property is ignored if "conserve-sockets" is true.
- *   <dd><U>Default</U>: "15000"</dd>
- *   <dd><U>Allowed values</U>: 0..600000</dd>
- *   <dd><U>Since</U>: 4.1</dd>
- * </dl>
- * <dl>
- *   <a name="socket-buffer-size"><dt>socket-buffer-size</dt></a>
- *   <dd><U>Description</U>: The size of each socket buffer, in bytes.
- *   Smaller buffers conserve memory. Larger buffers can improve performance;
- *   in particular if large messages are being sent.
- *   <dd><U>Default</U>: "32768"</dd>
- *   <dd><U>Allowed values</U>: 128..16777215</dd>
- *   <dd><U>Since</U>: 4.1</dd>
- * </dl>
- * <dl>
- *   <a name="conflate-events"><dt>conflate-events</dt></a>
- *   <dd><U>Description</U>: This is a client-side property that is passed to
- *   the server. Allowable values are "server", "true", and "false". With the
- *   "server" setting, this client&apos;s servers use their own client queue
- *   conflation settings. With a "true" setting, the servers disregard their
- *   own configuration and enable conflation of events for all regions for the
- *   client. A "false" setting causes the client&apos;s servers to disable
- *   conflation for all regions for the client.
- *   <dd><U>Default</U>: "server"</dd>
- *   <dd><U>Since</U>: 5.7</dd>
- * </dl>
- * <dl>
- *   <a name="durable-client-id"><dt>durable-client-id</dt></a>
- *   <dd><U>Description</U>: The id to be used by this durable client. When a
- *   durable client connects to a server, this id is used by the server to
- *   identify it. The server will accumulate updates for a durable client
- *   while it is disconnected and deliver these events to the client when it
- *   reconnects.
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 5.5</dd>
- * </dl>
- * <dl>
- *   <a name="durable-client-timeout"><dt>durable-client-timeout</dt></a>
- *   <dd><U>Description</U>: The number of seconds a disconnected durable
- *   client is kept alive and updates are accumulated for it by the server
- *   before it is terminated.
- *   <dd><U>Default</U>: "300"</dd>
- *   <dd><U>Since</U>: 5.5</dd>
- * </dl>
- *<dl>
- *   <a name="security-"><dt>security-</dt></a>
- *   <dd><U>Description</U>: Mechanism to define client credentials.
- *   All tags with "security-" prefix is packaged together as security properties 
- *   and passed as an argument to getCredentials of Authentication module.
- *   These tags cannot have null values. 
- *   </dd>
- *   <dd><U>Default</U>: Optional</dd>
- *   <dd><U>Allowed values</U>: any string</dd>
- * </dl>
- * 
- *<dl>
- *   <a name="security-client-auth-init"><dt>security-client-auth-init</dt></a>
- *   <dd><U>Description</U>: Authentication module name for Clients that requires to act
- *   upon credentials read from the gemfire.properties file.
- *   Module must implement AuthInitialize interface.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Allowed values</U>: jar file:class name</dd>
- *</dl>
- * 
- * <dl>
- * <a name="delta-propagation">
- * <dt>delta-propagation</dt>
- * </a>
- * <dd><U>Description</U>: "true" indicates that server propagates delta
- * generated from {@link com.gemstone.gemfire.Delta} type of objects. If "false"
- * then server propagates full object but not delta. </dd>
- * <dd><U>Default</U>: "true"</dd>
- * <dd><U>Allowed values</U>: true|false</dd>
- * </dl> 
- * 
- * <b>Network Partitioning Detection</b>
- * 
- * <dl>
- *   <a name="enable-network-partition-detection"><dt>enable-network-partition-detection</dt></a>
- *   <dd><U>Description</U>: Turns on network partitioning detection algorithms, which
- *   detect loss of quorum and shuts down losing partitions.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="disable-auto-reconnect"><dt>disable-auto-reconnect</dt></a>
- *   <dd><U>Description</U>: By default GemFire will attempt to reconnect and
- *   reinitialize the cache when it has been forced out of the distributed system
- *   by a network-partition event or has otherwise been shunned by other members.
- *   This setting will turn off this behavior.</dd>
- *   <dd><U>Default</U>: "false"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="max-wait-time-reconnect"><dt>max-wait-time-reconnect</dt></a>
- *   <dd><U>Description</U>: Specifies the time in milliseconds to wait before each reconnect attempt when
- *   a member of the distributed system is forced out of the system and auto-reconnect
- *   is enabled (see <a href="#disable-auto-reconnect"><code>disable-auto-reconnect</code></a>) or if the deprecated required-roles
- *   feature is being used and a role-loss has triggered a shutdown and reconnect.
- *   </dd>
- *   <dd><U>Default</U>: "60000"</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- *
- *
- * <b>Redundancy Management</b>
- * 
- * <dl>
- *   <a name="enforce-unique-host"><dt>enforce-unique-host</dt></a>
- *   <dd><U>Description</U>: Whether or not partitioned regions will
- *   put redundant copies of the same data in different JVMs running on the same physical host.
- *   
- *   By default, partitioned regions will try to put redundancy copies on different physical hosts, but it may 
- *   put them on the same physical host if no other hosts are available. Setting this property to true
- *   will prevent partitions regions from ever putting redundant copies of data on the same physical host.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="redundancy-zone"><dt>redundancy-zone</dt></a>
- *   <dd><u>Description</u>: Defines the redundancy zone from this member. If this property is set, partitioned
- *   regions will not put two redundant copies of data in two members with the same redundancy zone setting.   
- *   </dd>
- *   <dd><u>Default</u>: ""</dd>
- * </dl>
- *
- * <B>Logging Configuration Properties</B>
- *
- * <dl>
- *   <a name="log-file"><dt>log-file</dt></a>
- *   <dd><U>Description</U>: Name of the file to write logging
- *   messages to.  If the file name if "" (default) then messages are
- *   written to standard out.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- *
- * <dl>
- *   <a name="log-level"><dt>log-level</dt></a>
- *   <dd><U>Description</U>:The type of log messages that will
- *   actually write to the log file.
- *   </dd>
- *   <dd><U>Default</U>: "config"</dd>
- *   <dd><U>Allowed values</U>: all|finest|finer|fine|config|info|warning|severe|none</dd>
- * </dl>
- *
- * <dl>
- *   <a name="statistic-sampling-enabled"><dt>statistic-sampling-enabled</dt></a>
- *   <dd><U>Description</U>: "true" causes the statistics to be
- *   sampled periodically and operating system statistics to be
- *   fetched each time a sample is taken.  "false" disables sampling
- *   which also disables operating system statistic collection.  Non
- *   OS statistics will still be recorded in memory and can be viewed
- *   by administration tools.  However, charts will show no activity
- *   and no statistics will be archived while sampling is
- *   disabled.
- *   Starting in 7.0 the default value has been changed to true.
- *   If statistic sampling is disabled it will also cause various
- *   metrics seen in gfsh and pulse to always be zero.
- *   </dd>
- *   <dd><U>Default</U>: "true"</dd>
- *   <dd><U>Allowed values</U>: true|false</dd>
- * </dl>
- *
- * <dl>
- *   <a name="statistic-sample-rate"><dt>statistic-sample-rate</dt></a>
- *   <dd><U>Description</U>:The rate, in milliseconds, at which samples
- *   of the statistics will be taken.
- *   If set to a value less than 1000 the rate will be set to 1000 because
- *   the VSD tool does not support sub-second sampling.
- *   </dd>
- *   <dd><U>Default</U>: "1000"</dd>
- *   <dd><U>Allowed values</U>: 100..60000</dd>
- * </dl>
- *
- * <dl>
- *   <a name="statistic-archive-file"><dt>statistic-archive-file</dt></a>
- *   <dd><U>Description</U>: The file that statistic samples are
- *   written to.  An empty string (default) disables statistic
- *   archival.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- *
- * <dl>
- *   <a name="enable-time-statistics"><dt>enable-time-statistics</dt></a>
- *   <dd><U>Description</U>: "true" causes additional time-based statistics to be
- *   gathered for gemfire operations.  This can aid in discovering
- *   where time is going in cache operations, albeit at the expense of
- *   extra clock probes on every operation.  "false" disables the additional
- *   time-based statistics.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- *   <dd><U>Allowed values</U>: true or false</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- *
- * <dl>
- *   <a name="log-file-size-limit"><dt>log-file-size-limit</dt></a>
- *   <dd><U>Description</U>: Limits, in megabytes, how large the current log
- *   file can grow before it is closed and logging rolls on to a new file.
- *   Set to zero to disable log rolling.
- *   </dd>
- *   <dd><U>Default</U>: "0"</dd>
- *   <dd><U>Allowed values</U>: 0..1000000</dd>
- * </dl>
- * <dl>
- *   <a name="log-disk-space-limit"><dt>log-disk-space-limit</dt></a>
- *   <dd><U>Description</U>: Limits, in megabytes, how much disk space can be
- *   consumed by old inactive log files. When the limit is
- *   exceeded the oldest inactive log file is deleted.
- *   Set to zero to disable automatic log file deletion.
- *   </dd>
- *   <dd><U>Default</U>: "0"</dd>
- *   <dd><U>Allowed values</U>: 0..1000000</dd>
- * </dl>
- *
- * <dl>
- *   <a name="archive-file-size-limit"><dt>archive-file-size-limit</dt></a>
- *   <dd><U>Description</U>: Limits, in megabytes, how large the current statistic archive
- *   file can grow before it is closed and archival rolls on to a new file.
- *   Set to zero to disable archive rolling.
- *   </dd>
- *   <dd><U>Default</U>: "0"</dd>
- *   <dd><U>Allowed values</U>: 0..1000000</dd>
- * </dl>
- * <dl>
- *   <a name="archive-disk-space-limit"><dt>archive-disk-space-limit</dt></a>
- *   <dd><U>Description</U>: Limits, in megabytes, how much disk space can be
- *   consumed by old inactive statistic archive files. When the limit is
- *   exceeded the oldest inactive archive is deleted.
- *   Set to zero to disable automatic archive deletion.
- *   </dd>
- *   <dd><U>Default</U>: "0"</dd>
- *   <dd><U>Allowed values</U>: 0..1000000</dd>
- * </dl>
- *
- * <dl>
- *   <a name="roles"><dt>roles</dt></a>
- *   <dd><U>Description</U>: Specifies the application roles that this member
- *   performs in the distributed system. This is a comma delimited list of
- *   user-defined strings. Any number of members can be configured to perform
- *   the same role, and a member can be configured to perform any number of
- *   roles.
- *   Note that anything defined by the groups gemfire property will also be considered a role.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- *   <dd><U>Deprecated</U>: This feature is scheduled to be removed.</dd>
- * </dl>
- *
- * <dl>
- *   <a name="max-wait-time-reconnect"><dt>max-wait-time-reconnect</dt></a>
- *   <dd><U>Description</U>: Specifies the time in milliseconds to wait before each reconnect attempt when
- *   a member of the distributed system is forced out of the system and auto-reconnect
- *   is enabled (see <a href="#disable-auto-reconnect"><code>disable-auto-reconnect</code></a>) or if the deprecated required-roles
- *   feature is being used and a role-loss has triggered a shutdown and reconnect.
- *   </dd>
- *   <dd><U>Default</U>: "60000"</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- *
- * <dl>
- *   <a name="max-num-reconnect-tries"><dt>max-num-reconnect-tries</dt></a>
- *   <dd><U>Description</U>: Specifies the maximum number or times to attempt
- *   to reconnect to the distributed system when required roles are missing.
- *   This does not apply to reconnect attempts due to a forced disconnect.
- *   </dd>
- *   <dd><U>Deprecated</U>: this setting is scheduled to be removed.</dd>
- *   <dd><U>Default</U>: "3"</dd>
- *   <dd><U>Since</U>: 5.0</dd>
- * </dl>
- *
- * <B>Cache Configuration Properties</B>
- *
- * <dl>
- *   <a name="cache-xml-file"><dt>cache-xml-file</dt></a>
- *   <dd><U>Description</U>: Specifies the name of the XML file or resource
- *   to initialize the cache with when it is
- *   {@linkplain com.gemstone.gemfire.cache.CacheFactory#create created}.
- *   Create will first look for a file that matches the value of this property.
- *   If a file is not found then it will be searched for using
- *   {@link java.lang.ClassLoader#getResource}.  If the value of this
- *   property is the empty string (<code>""</code>), then the cache
- *   will not be declaratively initialized.</dd>
- *   <dd><U>Default</U>: "cache.xml"</dd>
- * </dl>
- *
- * <dl>
- *   <a name="memcached-port"><dt>memcached-port</dt></a>
- *   <dd><U>Description</U>: Specifies the port used by {@link GemFireMemcachedServer}
- *   which enables memcached clients to connect and store data in GemFire distributed system.
- *   see {@link GemFireMemcachedServer} for other configuration options.</dd>
- *   <dd><U>Default</U>: "0" disables GemFireMemcachedServer</dd>
- *   <dd><U>Allowed values</U>: 0..65535</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="memcached-protocol"><dt>memcached-protocol</dt></a>
- *   <dd><U>Description</U>: Specifies the protocol used by {@link GemFireMemcachedServer}</dd>
- *   <dd><U>Default</U>: "ASCII"</dd>
- *   <dd><U>Allowed values</U>: "ASCII" "BINARY"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="memcached-bind-address"><dt>memcached-bind-address</dt></a>
- *   <dd><U>Description</U>: Specifies the bind address used by {@link GemFireMemcachedServer}</dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="redis-port"><dt>redis-port</dt></a>
- *   <dd><U>Description</U>: Specifies the port used by {@link GemFireRedisServer}
- *   which enables redis clients to connect and store data in GemFire distributed system.
- *   see {@link GemFireRedisServer} for other configuration options.</dd>
- *   <dd><U>Default</U>: "0" disables GemFireMemcachedServer</dd>
- *   <dd><U>Allowed values</U>: 0..65535</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="redis-bind-address"><dt>redis-bind-address</dt></a>
- *   <dd><U>Description</U>: Specifies the bind address used by {@link GemFireRedisServer}</dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="redis-password"><dt>redis-password</dt></a>
- *   <dd><U>Description</U>: Specifies the password to authenticate a client of {@link GemFireRedisServer}</dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- * 
- * <B>Asynchronous Message Properties</B>
- *
- * <dl>
- *   <a name="async-distribution-timeout"><dt>async-distribution-timeout</dt></a>
- *   <dd><U>Description</U>: The number of milliseconds before a
- *   publishing process should attempt to distribute a cache operation
- *   before switching over to asynchronous messaging for this process.
- *   To enable asynchronous messaging, the value must be set above
- *   zero. If a thread that is publishing to the cache exceeds this value
- *   when attempting to distribute to this process, it will switch to
- *   asynchronous messaging until this process catches up, departs, or
- *   some specified limit is reached, such as <a href="#async-queue-timeout">
- *   async-queue-timeout</a> or <a href="#async-max-queue-size">
- *   async-max-queue-size</a>.
- *   </dd>
- *   <dd><U>Default</U>: "0"</dd>
- *   <dd><U>Allowed values</U>: 0..60000</dd>
- * </dl>
- * <dl>
- *   <a name="async-queue-timeout"><dt>async-queue-timeout</dt></a>
- *   <dd><U>Description</U>: The number of milliseconds a queuing
- *   publisher may enqueue asynchronous messages without any distribution
- *   to this process before that publisher requests this process to
- *   depart. If a queuing publisher has not been able to send this process
- *   any cache operations prior to the timeout, this process will attempt
- *   to close its cache and disconnect from the distributed system.
- *   </dd>
- *   <dd><U>Default</U>: "60000"</dd>
- *   <dd><U>Allowed values</U>: 0..86400000</dd>
- * </dl>
- * <dl>
- *   <a name="async-max-queue-size"><dt>async-max-queue-size</dt></a>
- *   <dd><U>Description</U>: The maximum size in megabytes that a
- *   publishing process should be allowed to asynchronously enqueue
- *   for this process before asking this process to depart from the
- *   distributed system.
- *   </dd>
- *   <dd><U>Default</U>: "8"</dd>
- *   <dd><U>Allowed values</U>: 0..1024</dd>
- * </dl>
- * 
- * <b>JMX Management</b>
- * 
- * <dl>
- *   <a name="jmx-manager"><dt>jmx-manager</dt></a>
- *   <dd><U>Description</U>: If true then this member is willing to be a jmx-manager.
- *   All the other jmx-manager properties will be used when it does become a manager.
- *   If this property is false then all other jmx-manager properties are ignored.
- *   </dd>
- *   <dd><U>Default</U>: "false except on locators"</dd>
- * </dl>
- *
- * <dl>
- *   <a name="jmx-manager-start"><dt>jmx-manager-start</dt></a>
- *   <dd><U>Description</U>: If true then this member will start a jmx manager when
- *   it creates a cache. Management tools like gfsh can be configured to connect
- *   to the jmx-manager. In most cases you should not set this because a jmx manager will
- *   automatically be started when needed on a member that sets "jmx-manager" to true.
- *   Ignored if jmx-manager is false.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-port"><dt>jmx-manager-port</dt></a>
- *   <dd><U>Description</U>: The port this jmx manager will listen to for client connections.
- *   If this property is set to zero then GemFire will not allow remote client connections 
- *   but you can alternatively use the standard system properties supported by the JVM 
- *   for configuring access from remote JMX clients.
- *   Ignored if jmx-manager is false.
- *   </dd>
- *   <dd><U>Default</U>: "1099"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-ssl"><dt>jmx-manager-ssl</dt></a>
- *   <dd><U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
- *   will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
- *   but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
- *   without needing to configure it for the other GemFire connections.
- *   Ignored if jmx-manager is false.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- *   <dd><U>Deprecated</U>: as of 8.0 use <a href="#jmx-manager-ssl-enabled"><code>jmx-manager-ssl-enabled</code></a> instead.</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-ssl-enabled"><dt>jmx-manager-ssl-enabled</dt></a>
- *   <dd><U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
- *   will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
- *   but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
- *   without needing to configure it for the other GemFire connections.
- *   Ignored if jmx-manager is false.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- * </dl> 
- * 
- * <dl>
- *   <a name="jmx-manager-ssl-ciphers"><dt>jmx-manager-ssl-ciphers</dt></a>
- *   <dd><U>Description</U>: A space seperated list of the SSL cipher suites to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>   
- *   <dd><U>Default</U>: "any"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-ssl-protocols"><dt>jmx-manager-ssl-protocols</dt></a>
- *   <dd><U>Description</U>: A space seperated list of the SSL protocols to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>
- *   <dd><U>Default</U>: "any"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-ssl-require-authentication"><dt>jmx-manager-ssl-require-authentication</dt></a>
- *   <dd><U>Description</U>: If false, allow ciphers that do not require the client
- *   side of the connection to be authenticated.
- *   </dd>   
- *   <dd><U>Default</U>: "true"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-ssl-keystore"><dt>jmx-manager-ssl-keystore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing
- *   certificate and private key.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-ssl-keystore-type"><dt>jmx-manager-ssl-keystore-type</dt></a>
- *   <dd><U>Description</U>For Java keystore file format, this property has the
- *   value jks (or JKS).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-ssl-keystore-password"><dt>jmx-manager-ssl-keystore-password</dt></a>
- *   <dd><U>Description</U>Password to access the private key from the keystore
- *   file specified by javax.net.ssl.keyStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-ssl-truststore"><dt>jmx-manager-ssl-truststore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing the
- *   collection of CA certificates trusted by manager (trust store).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-ssl-truststore-password"><dt>jmx-manager-ssl-truststore-password</dt></a>
- *   <dd><U>Description</U>Password to unlock the keystore file (store password)
- *   specified by javax.net.ssl.trustStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-bind-address"><dt>jmx-manager-bind-address</dt></a>
- *   <dd><U>Description</U>: By default the jmx-manager when configured with a port will listen
- *   on all the local host's addresses. You can use this property to configure what ip address
- *   or host name the jmx-manager will listen on. In addition, if the embedded http server is
- *   started, it will also bind to this address if it is set.
- *   Ignored if jmx-manager is false or jmx-manager-port is zero.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-hostname-for-clients"><dt>jmx-manager-hostname-for-clients</dt></a>
- *   <dd><U>Description</U>: Lets you control what hostname will be given to clients that ask
- *   the locator for the location of a jmx manager. By default the ip address that the jmx-manager
- *   reports is used. But for clients on a different network this property allows you to configure
- *   a different hostname that will be given to clients.
- *   Ignored if jmx-manager is false or jmx-manager-port is zero.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="jmx-manager-password-file"><dt>jmx-manager-password-file</dt></a>
- *   <dd><U>Description</U>: By default the jmx-manager will allow clients without credentials to connect.
- *   If this property is set to the name of a file then only clients that connect with credentials that
- *   match an entry in this file will be allowed.
- *   Most JVMs require that the file is only readable by the owner.
- *   For more information about the format of this file see Oracle's documentation of the
- *   com.sun.management.jmxremote.password.file system property.
- *   Ignored if jmx-manager is false or if jmx-manager-port is zero.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- *
- * <dl>
- *   <a name="jmx-manager-access-file"><dt>jmx-manager-access-file</dt></a>
- *   <dd><U>Description</U>: By default the jmx-manager will allow full access to all mbeans by any client.
- *   If this property is set to the name of a file then it can restrict clients to only being able to read
- *   mbeans; they will not be able to modify mbeans. The access level can be configured differently in this
- *   file for each user name defined in the password file.
- *   For more information about the format of this file see Oracle's documentation of the
- *   com.sun.management.jmxremote.access.file system property.
- *   Ignored if jmx-manager is false or if jmx-manager-port is zero.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- * </dl>
- *
- * <dl>
- *   <a name="jmx-manager-http-port"><dt>jmx-manager-http-port</dt></a>
- *   <dd><U>Description</U>: If non-zero then when the jmx manager is started, an embedded
- *   web server will also be started and will listen on this port.
- *   The web server is used to host the GemFire Pulse application.
- *   If you are hosting the Pulse web app in your own web server, then disable
- *   this embedded server by setting this property to zero.
- *   Ignored if jmx-manager is false.
- *   </dd>
- *   <dd><U>Default</U>: "7070"</dd>
- *   <dd><U>Deprecated</U>: as of 8.0 use <a href="#http-service-port"><code>http-service-port</code></a> instead.</dd>
- * </dl>
- *
- * <dl>
- *   <a name="jmx-manager-update-rate"><dt>jmx-manager-update-rate</dt></a>
- *   <dd><U>Description</U>: The rate, in milliseconds, at which this member will push updates
- *   to any jmx managers. Currently this value should be greater than or equal to the
- *   statistic-sample-rate. Setting this value too high will cause stale values to be
- *   seen by gfsh and pulse.
- *   </dd>
- *   <dd><U>Default</U>: "2000"</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="http-service-port"><dt>http-service-port</dt></a>
- *   <dd><U>Description</U>: Specifies the port used by the GemFire HTTP service. If
- *   configured with non-zero value, then an HTTP service will listen on this port.
- *   A value of "0" disables Gemfire HTTP service.
- *   </dd>
- *   <dd><U>Default</U>: "7070" </dd>
- *   <dd><U>Allowed values</U>: 0..65535</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- *  
- * <dl>
- *   <a name="http-service-bind-address"><dt>http-service-bind-address</dt></a>
- *   <dd><U>Description</U>: The address where the GemFire HTTP service will listen
- *   for remote connections. One can use this property to configure what ip
- *   address or host name the HTTP service will listen on. When not set, by
- *   default the HTTP service will listen on the local host's address.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <b> HTTP Service SSL Configuration </b>
- * 
- * <dl>
- *   <a name="http-service-ssl-enabled"><dt>http-service-ssl-enabled</dt></a>
- *   <dd><U>Description</U>: Specifies if http service is started with separate ssl configuration.
- *   If not specified, global property cluster-ssl-enabled (and its other related properties) are used
- *   to secure http service. All http-service-ssl-* properties are inherited from cluster-ssl-* properties. 
- *   User can ovverride them using specific http-service-ssl-* property.
- *   </dd>
- *   <dd><U>Default</U>: <code>false</code></dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl> 
- * 
- * <dl>
- *   <a name="http-service-ssl-ciphers"><dt>http-service-ssl-ciphers</dt></a>
- *   <dd><U>Description</U>: A space separated list of the SSL cipher suites to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>
- *   <dd><U>Default</U>: <code>any</code></dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl>
- *  
- * <dl>
- *   <a name="http-service-ssl-protocols"><dt>http-service-ssl-protocols</dt></a>
- *   <dd><U>Description</U>: A space separated list of the SSL protocols to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>
- *   <dd><U>Default</U>: <code>any</code></dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl>
- *  
- * <dl>
- *   <a name="http-service-ssl-require-authentication"><dt>http-service-ssl-require-authentication</dt></a>
- *   <dd><U>Description</U>: If false, allow ciphers that do not require the client
- *   side of the connection to be authenticated.
- *   </dd>
- *   <dd><U>Default</U>: <code>false</code></dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="http-service-ssl-keystore"><dt>http-service-ssl-keystore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing
- *   certificate and private key.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="http-service-ssl-keystore-type"><dt>http-service-ssl-keystore-type</dt></a>
- *   <dd><U>Description</U>For Java keystore file format, this property has the
- *   value jks (or JKS).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="http-service-ssl-keystore-password"><dt>http-service-ssl-keystore-password</dt></a>
- *   <dd><U>Description</U>Password to access the private key from the keystore
- *   file specified by javax.net.ssl.keyStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="http-service-ssl-truststore"><dt>http-service-ssl-truststore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing the
- *   collection of CA certificates trusted by server (trust store).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl>
- *  
- * <dl>
- *   <a name="http-service-ssl-truststore-password"><dt>http-service-ssl-truststore-password</dt></a>
- *   <dd><U>Description</U>Password to unlock the keystore file (store password)
- *   specified by javax.net.ssl.trustStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="start-dev-rest-api"><dt>start-dev-rest-api</dt></a>
- *   <dd><U>Description</U>: If true then developer(API) REST service will be
- *   started when cache is created. REST service can be configured using
- *   <code>http-service-port</code> and <code>http-service-bind-address</code>
- *   properties.</dd>
- *   <dd><U>Default</U>: "false"</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <b>Off-Heap Memory</b>
- * 
- * <dl>
- *   <a name="off-heap-memory-size"><dt>off-heap-memory-size</dt></a>
- *   <dd><U>Description</U>: The total size of off-heap memory specified as
- *   off-heap-memory-size=<n>[g|m]. <n> is the size. [g|m] indicates
- *   whether the size should be interpreted as gigabytes or megabytes.
- *   By default no off-heap memory is allocated.
- *   A non-zero value will cause that much memory to be allocated from the operating
- *   system and reserved for off-heap use.
- *   </dd>
- *   <dd><U>Default</U>: <code>""</code></dd>
- *   <dd><U>Since</U>: 9.0</dd>
- * </dl>
- * 
- * <b>Cluster Configuration Service</b>
- * <dl>
- *   <a name="enable-cluster-configuration"><dt>enable-cluster-configuration</dt></a>
- *   <dd><U>Description</U>: "true" causes creation of cluster configuration service on dedicated locators. The cluster configuration service on dedicated locator(s) 
- *   would serve the configuration to new members joining the distributed system and also save the configuration changes caused by the Gfsh commands.
- *   This property is only applicable to dedicated locators. 
- *   </dd>
- *   <dd><U>Default</U>: "true"</dd> 
- *   <dd><U>Allowed values</U>: true or false</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="use-cluster-configuration"><dt>use-cluster-configuration</dt></a>
- *   <dd><U>Description</U>: This property is only applicable for data members (non client and non locator) 
- *   "true" causes a member to request and uses the configuration from cluster configuration services running on dedicated locators. 
- *   "false" causes a member to not request the configuration from the configuration services running on the locator(s).
- *   </dd>
- *   <dd><U>Default</U>: "true"</dd> 
- *   <dd><U>Allowed values</U>: true or false</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="load-cluster-configuration-from-dir"><dt>load-cluster-configuration-from-dir</dt></a>
- *   <dd><U>Description</U>: "true" causes loading of cluster configuration from "cluster_config" directory in the locator. 
- *   This property is only applicable to dedicated locators which have "enable-cluster-configuration" set to true.
- *   </dd>
- *   <dd><U>Default</U>: "false"</dd>
- *   <dd><U>Allowed values</U>: true or false</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- *  * <dl>
- *   <a name="cluster-configuration-dir"><dt>cluster-configuration-dir</dt></a>
- *   <dd><U>Description</U>: This property specifies the directory in which the cluster configuration related disk-store and artifacts are stored  
- *   This property is only applicable to dedicated locators which have "enable-cluster-configuration" set to true.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Allowed values</U></dd>
- *   <dd><U>Since</U>: 8.1</dd>
- * </dl>
- * 
- * <b> Server SSL Configuration </b>
- * 
- * <dl>
- *   <a name="server-ssl-enabled"><dt>server-ssl-enabled</dt></a>
- *   <dd><U>Description</U>: Specifies if server is started with separate ssl configuration.
- *   If not specified global property ssl-enabled (and its other related properties) are used
- *   to create server socket
- *   </dd>
- *   <dd><U>Default</U>: <code>false</code></dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl> 
- * 
- * <dl>
- *   <a name="server-ssl-ciphers"><dt>server-ssl-ciphers</dt></a>
- *   <dd><U>Description</U>: A space seperated list of the SSL cipher suites to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>
- *   <dd><U>Default</U>: <code>any</code></dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- *  
- * <dl>
- *   <a name="server-ssl-protocols"><dt>server-ssl-protocols</dt></a>
- *   <dd><U>Description</U>: A space seperated list of the SSL protocols to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>
- *   <dd><U>Default</U>: <code>any</code></dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- *  
- * <dl>
- *   <a name="server-ssl-require-authentication"><dt>server-ssl-require-authentication</dt></a>
- *   <dd><U>Description</U>: If false, allow ciphers that do not require the client
- *   side of the connection to be authenticated.
- *   </dd>
- *   <dd><U>Default</U>: <code>any</code></dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="server-ssl-keystore"><dt>server-ssl-keystore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing
- *   certificate and private key.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="server-ssl-keystore-type"><dt>server-ssl-keystore-type</dt></a>
- *   <dd><U>Description</U>For Java keystore file format, this property has the
- *   value jks (or JKS).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="server-ssl-keystore-password"><dt>server-ssl-keystore-password</dt></a>
- *   <dd><U>Description</U>Password to access the private key from the keystore
- *   file specified by javax.net.ssl.keyStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="server-ssl-truststore"><dt>server-ssl-truststore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing the
- *   collection of CA certificates trusted by server (trust store).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="server-ssl-truststore-password"><dt>server-ssl-truststore-password</dt></a>
- *   <dd><U>Description</U>Password to unlock the keystore file (store password)
- *   specified by javax.net.ssl.trustStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <b> Gateway SSL Configuration </b>
- * 
- * <dl>
- *   <a name="gateway-ssl-enabled"><dt>gateway-ssl-enabled</dt></a>
- *   <dd><U>Description</U>: Specifies if gateway is started with separate ssl configuration.
- *   If not specified global property ssl-enabled (and its other related properties) are used
- *   to create gateway socket
- *   </dd>
- *   <dd><U>Default</U>: <code>false</code></dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl> 
- * 
- * <dl>
- *   <a name="gateway-ssl-ciphers"><dt>gateway-ssl-ciphers</dt></a>
- *   <dd><U>Description</U>: A space seperated list of the SSL cipher suites to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>
- *   <dd><U>Default</U>: <code>any</code></dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- *  
- * <dl>
- *   <a name="gateway-ssl-protocols"><dt>gateway-ssl-protocols</dt></a>
- *   <dd><U>Description</U>: A space seperated list of the SSL protocols to enable.
- *   Those listed must be supported by the available providers.
- *   </dd>
- *   <dd><U>Default</U>: <code>any</code></dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- *  
- * <dl>
- *   <a name="gateway-ssl-require-authentication"><dt>gateway-ssl-require-authentication</dt></a>
- *   <dd><U>Description</U>: If false, allow ciphers that do not require the Gateway Sender
- *   side of the connection to be authenticated.
- *   </dd>
- *   <dd><U>Default</U>: <code>any</code></dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="gateway-ssl-keystore"><dt>gateway-ssl-keystore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing
- *   certificate and private key.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="gateway-ssl-keystore-type"><dt>gateway-ssl-keystore-type</dt></a>
- *   <dd><U>Description</U>For Java keystore file format, this property has the
- *   value jks (or JKS).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="gateway-ssl-keystore-password"><dt>gateway-ssl-keystore-password</dt></a>
- *   <dd><U>Description</U>Password to access the private key from the keystore
- *   file specified by javax.net.ssl.keyStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="gateway-ssl-truststore"><dt>gateway-ssl-truststore</dt></a>
- *   <dd><U>Description</U>Location of the Java keystore file containing the
- *   collection of CA certificates trusted by server (trust store).
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="gateway-ssl-truststore-password"><dt>gateway-ssl-truststore-password</dt></a>
- *   <dd><U>Description</U>Password to unlock the keystore file (store password)
- *   specified by javax.net.ssl.trustStore.
- *   </dd>
- *   <dd><U>Default</U>: ""</dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- * <b>Miscellaneous</b> 
- *
- * <dl>
- *   <a name="lock-memory"><dt>lock-memory</dt></a>
- *   <dd><U>Description</U>: Include this option to lock GemFire heap and off-heap memory pages into RAM.
- *   This prevents the operating system from swapping the pages out to disk, which can cause sever
- *   performance degradation. When you use this command, also configure the operating system limits for
- *   locked memory.
- *   </dd>
- *   <dd><U>Default</U>: <code>"false"</code></dd>
- *   <dd><U>Since</U>: 9.0</dd>
- * </dl>
- * 
- * <dl>
- *   <a name="deploy-working-dir"><dt>deploy-working-dir</dt></a>
- *   <dd><U>Description</U>: Specifies the working directory which this
- *   distributed member will use to persist deployed JAR files.  This directory
- *   should be unchanged when restarting the member so that it can read what
- *   was previously persisted. The default is the current working directory
- *   as determined by <code>System.getProperty("user.dir")</code>.
- *   </dd>
- *   <dd><U>Default</U>: <code>System.getProperty("user.dir")</code></dd>
- *   <dd><U>Since</U>: 7.0</dd>
- * </dl>
- *
- * <dl>
- *   <a name="user-command-packages"><dt>user-command-packages</dt></a>
- *   <dd><U>Description</U>: A comma separated list of Java packages that
- *   contain classes implementing the <code>CommandMarker</code> interface.
- *   Matching classes will be loaded when the VM starts and will be available
- *   in the GFSH command-line utility.
- *   </dd>
- *   <dd><U>Default</U>: <code>""</code></dd>
- *   <dd><U>Since</U>: 8.0</dd>
- * </dl>
- * 
- *
  * @since GemFire 3.0
  */
 public abstract class DistributedSystem implements StatisticsFactory {


[17/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties


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

Branch: refs/heads/develop
Commit: b5ed093507a3a48fdd1f5cc556656b7cbb902f55
Parents: cc249d5
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Fri Jun 10 06:06:49 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Jun 10 06:06:56 2016 +1000

----------------------------------------------------------------------
 .../ClientServerRegionFactoryDelegate.java      |    2 +-
 .../internal/RegionFactoryDelegate.java         |    2 +-
 .../gemfire/modules/HibernateJUnitTest.java     |    2 +-
 .../gemstone/gemfire/modules/SecondVMTest.java  |    2 +-
 .../session/bootstrap/AbstractCache.java        |    2 +-
 .../modules/session/TestSessionsBase.java       |    2 +-
 .../LocatorLauncherAssemblyIntegrationTest.java |    2 +-
 .../LauncherLifecycleCommandsDUnitTest.java     |    2 +-
 .../LauncherLifecycleCommandsJUnitTest.java     |    2 +-
 .../SharedConfigurationEndToEndDUnitTest.java   |    2 +-
 .../internal/web/RestInterfaceJUnitTest.java    |    2 +-
 .../web/controllers/RestAPITestBase.java        |    2 +-
 .../RestAPIsAndInterOpsDUnitTest.java           |    4 +-
 ...APIsOnMembersFunctionExecutionDUnitTest.java |    2 +-
 .../RestAPIsQueryAndFEJUnitTest.java            |    2 +-
 .../controllers/RestAPIsWithSSLDUnitTest.java   |    4 +-
 .../gemfire/admin/DistributedSystemConfig.java  |    2 +-
 .../internal/AdminDistributedSystemImpl.java    |    2 +-
 .../admin/internal/CacheServerConfigImpl.java   |    2 +-
 .../gemfire/admin/internal/CacheServerImpl.java |    2 +-
 .../internal/DistributedSystemConfigImpl.java   |    2 +-
 .../internal/DistributionLocatorConfigImpl.java |    2 +-
 .../EnabledManagedEntityController.java         |    2 +-
 .../admin/internal/ManagedEntityConfigXml.java  |    4 +-
 .../admin/internal/ManagedSystemMemberImpl.java |    2 +-
 .../admin/jmx/internal/AgentConfigImpl.java     |    2 +-
 .../jmx/internal/MemberInfoWithStatsMBean.java  |    2 +-
 .../cache/client/ClientCacheFactory.java        |    4 +-
 .../client/internal/AuthenticateUserOp.java     |    2 +-
 .../gemfire/distributed/AbstractLauncher.java   |    2 +-
 .../distributed/ConfigurationProperties.java    | 1583 +++++++++++++++++
 .../gemfire/distributed/DistributedSystem.java  |    4 +-
 .../DistributedSystemConfigProperties.java      | 1590 ------------------
 .../gemfire/distributed/LocatorLauncher.java    |    2 +-
 .../gemfire/distributed/ServerLauncher.java     |    4 +-
 .../internal/AbstractDistributionConfig.java    |    2 +-
 .../internal/DistributionConfig.java            | 1003 +++++------
 .../internal/DistributionConfigImpl.java        |    4 +-
 .../internal/InternalDistributedSystem.java     |    4 +-
 .../distributed/internal/InternalLocator.java   |    2 +-
 .../distributed/internal/LocatorStats.java      |    2 +-
 .../internal/RuntimeDistributionConfigImpl.java |    2 +-
 .../internal/SharedConfiguration.java           |    2 +-
 .../membership/gms/auth/GMSAuthenticator.java   |    2 +-
 .../membership/gms/membership/GMSJoinLeave.java |    4 +-
 .../gemfire/internal/AbstractConfig.java        |    2 +-
 .../gemfire/internal/MigrationClient.java       |    6 +-
 .../gemfire/internal/MigrationServer.java       |    6 +-
 .../gemstone/gemfire/internal/SystemAdmin.java  |    4 +-
 .../gemfire/internal/admin/SSLConfig.java       |    2 +-
 .../admin/remote/RemoteTransportConfig.java     |    2 +-
 .../internal/cache/CacheServerLauncher.java     |   10 +-
 .../gemfire/internal/cache/DiskStoreImpl.java   |    2 +-
 .../gemfire/internal/cache/PoolStats.java       |    2 +-
 .../cache/tier/sockets/AcceptorImpl.java        |    2 +-
 .../cache/tier/sockets/CacheClientNotifier.java |    2 +-
 .../tier/sockets/ClientProxyMembershipID.java   |    2 +-
 .../internal/cache/tier/sockets/HandShake.java  |    2 +-
 .../cache/tier/sockets/ServerConnection.java    |    2 +-
 .../tier/sockets/ServerHandShakeProcessor.java  |    2 +-
 .../internal/cache/xmlcache/CacheXml.java       |    4 +-
 .../internal/logging/LogWriterFactory.java      |    2 +-
 .../internal/security/GeodeSecurityUtil.java    |    3 +-
 .../security/shiro/CustomAuthRealm.java         |    2 +-
 .../gemfire/internal/tcp/Connection.java        |    2 +-
 .../management/internal/cli/CommandManager.java |    6 +-
 .../internal/cli/commands/ConfigCommands.java   |    2 +-
 .../cli/commands/LauncherLifecycleCommands.java |    2 +-
 .../internal/cli/commands/ShellCommands.java    |    2 +-
 .../cli/functions/ChangeLogLevelFunction.java   |    2 +-
 .../GetMemberConfigInformationFunction.java     |    2 +-
 .../internal/cli/i18n/CliStrings.java           |   14 +-
 .../internal/cli/shell/JmxOperationInvoker.java |    2 +-
 .../DurableClientCommandsController.java        |   12 +-
 .../gemfire/redis/GemFireRedisServer.java       |    2 +-
 .../com/gemstone/gemfire/CopyJUnitTest.java     |    2 +-
 .../gemfire/DiskInstantiatorsJUnitTest.java     |    2 +-
 .../com/gemstone/gemfire/GemFireTestCase.java   |    2 +-
 .../gemfire/JtaNoninvolvementJUnitTest.java     |    2 +-
 .../gemfire/LocalStatisticsJUnitTest.java       |    2 +-
 .../com/gemstone/gemfire/LonerDMJUnitTest.java  |    2 +-
 .../com/gemstone/gemfire/TXExpiryJUnitTest.java |    2 +-
 .../java/com/gemstone/gemfire/TXJUnitTest.java  |    2 +-
 .../com/gemstone/gemfire/TXWriterTestCase.java  |    2 +-
 .../BindDistributedSystemJUnitTest.java         |    4 +-
 .../internal/DistributedSystemTestCase.java     |    2 +-
 .../admin/internal/HealthEvaluatorTestCase.java |    2 +-
 .../gemfire/cache/CacheListenerJUnitTest.java   |    4 +-
 .../cache/CacheRegionClearStatsDUnitTest.java   |    2 +-
 .../cache/ClientServerTimeSyncDUnitTest.java    |   21 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |    2 +-
 .../cache/ConnectionPoolFactoryJUnitTest.java   |    2 +-
 .../gemfire/cache/PoolManagerJUnitTest.java     |    4 +-
 .../gemstone/gemfire/cache/ProxyJUnitTest.java  |    4 +-
 .../gemfire/cache/RegionFactoryJUnitTest.java   |    2 +-
 ...ventQueueEvictionAndExpirationJUnitTest.java |    2 +-
 .../SerialAsyncEventQueueImplJUnitTest.java     |    2 +-
 .../client/ClientCacheFactoryJUnitTest.java     |    2 +-
 .../client/ClientRegionFactoryJUnitTest.java    |    4 +-
 .../ClientServerRegisterInterestsDUnitTest.java |    2 +-
 .../AutoConnectionSourceImplJUnitTest.java      |    4 +-
 .../CacheServerSSLConnectionDUnitTest.java      |    2 +-
 .../internal/ConnectionPoolImplJUnitTest.java   |    4 +-
 .../cache/client/internal/LocatorTestBase.java  |    9 +-
 .../client/internal/QueueManagerJUnitTest.java  |    4 +-
 .../internal/SSLNoClientAuthDUnitTest.java      |    2 +-
 .../pooling/ConnectionManagerJUnitTest.java     |    4 +-
 .../management/MXMemoryPoolListenerExample.java |   12 +-
 .../management/MemoryThresholdsDUnitTest.java   |    2 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |    2 +-
 .../ExceptionHandlingJUnitTest.java             |    4 +-
 .../mapInterface/MapFunctionalJUnitTest.java    |    4 +-
 .../mapInterface/PutAllGlobalLockJUnitTest.java |    2 +-
 .../PutOperationContextJUnitTest.java           |    4 +-
 .../GetOperationContextImplJUnitTest.java       |    4 +-
 .../query/Bug32947ValueConstraintJUnitTest.java |    2 +-
 .../gemfire/cache/query/CacheUtils.java         |    2 +-
 .../cache/query/PdxStringQueryJUnitTest.java    |    2 +-
 .../gemfire/cache/query/QueryTestUtils.java     |    2 +-
 .../cache/query/dunit/HelperTestCase.java       |    2 +-
 ...itionedRegionCompactRangeIndexDUnitTest.java |    2 +-
 .../QueryParamsAuthorizationDUnitTest.java      |    4 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |    2 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |    2 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |    2 +-
 .../functional/IUMRSingleRegionJUnitTest.java   |    2 +-
 .../functional/IndexCreationJUnitTest.java      |    2 +-
 .../MultiRegionIndexUsageJUnitTest.java         |    2 +-
 .../NegativeNumberQueriesJUnitTest.java         |    2 +-
 ...syncIndexUpdaterThreadShutdownJUnitTest.java |    2 +-
 .../index/CompactRangeIndexJUnitTest.java       |    2 +-
 .../index/CopyOnReadIndexDUnitTest.java         |    2 +-
 .../index/CopyOnReadIndexJUnitTest.java         |    2 +-
 .../DeclarativeIndexCreationJUnitTest.java      |    2 +-
 .../NewDeclarativeIndexCreationJUnitTest.java   |    2 +-
 .../index/PdxCopyOnReadQueryJUnitTest.java      |    2 +-
 ...gRegionCreationIndexUpdateTypeJUnitTest.java |    2 +-
 .../index/PutAllWithIndexPerfDUnitTest.java     |    2 +-
 .../cache/snapshot/RegionSnapshotJUnitTest.java |    2 +-
 .../cache/snapshot/SnapshotTestCase.java        |    4 +-
 .../gemfire/cache30/Bug38741DUnitTest.java      |    2 +-
 .../gemfire/cache30/Bug40255JUnitTest.java      |    2 +-
 .../gemfire/cache30/Bug40662JUnitTest.java      |    2 +-
 .../gemfire/cache30/Bug44418JUnitTest.java      |    4 +-
 .../gemfire/cache30/CacheLogRollDUnitTest.java  |    2 +-
 ...cheRegionsReliablityStatsCheckDUnitTest.java |    2 +-
 .../gemfire/cache30/CacheXml45DUnitTest.java    |    2 +-
 .../cache30/CacheXmlGeode10DUnitTest.java       |    2 +-
 .../gemfire/cache30/CacheXmlTestCase.java       |    2 +-
 .../cache30/ClientMembershipDUnitTest.java      |    4 +-
 .../ClientRegisterInterestDUnitTest.java        |    2 +-
 .../cache30/ClientServerCCEDUnitTest.java       |    2 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |    2 +-
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |    2 +-
 .../DistributedAckRegionCCEDUnitTest.java       |    2 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |    2 +-
 .../cache30/DistributedAckRegionDUnitTest.java  |    2 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |    2 +-
 .../DistributedMulticastRegionDUnitTest.java    |    2 +-
 .../DistributedNoAckRegionCCEDUnitTest.java     |    2 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |    2 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |    2 +-
 .../cache30/GlobalRegionCCEDUnitTest.java       |    2 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |    9 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |    2 +-
 .../OffHeapLRUEvictionControllerDUnitTest.java  |    2 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |    2 +-
 .../gemfire/cache30/QueueMsgDUnitTest.java      |    2 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |    4 +-
 .../RegionReliabilityListenerDUnitTest.java     |    2 +-
 .../cache30/RegionReliabilityTestCase.java      |    2 +-
 .../gemfire/cache30/RequiredRolesDUnitTest.java |    2 +-
 .../cache30/RolePerformanceDUnitTest.java       |    2 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       |    2 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |    2 +-
 .../AbstractLauncherIntegrationTest.java        |    2 +-
 .../AbstractLauncherIntegrationTestCase.java    |    2 +-
 .../distributed/AbstractLauncherTest.java       |    2 +-
 ...stractServerLauncherIntegrationTestCase.java |    2 +-
 .../distributed/DistributedMemberDUnitTest.java |    2 +-
 .../DistributedSystemConnectPerf.java           |    2 +-
 .../distributed/DistributedSystemDUnitTest.java |    2 +-
 .../distributed/HostedLocatorsDUnitTest.java    |    2 +-
 .../LauncherMemberMXBeanIntegrationTest.java    |    4 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |    4 +-
 .../gemfire/distributed/LocatorJUnitTest.java   |    6 +-
 .../LocatorLauncherIntegrationTest.java         |    2 +-
 .../LocatorLauncherLocalIntegrationTest.java    |    2 +-
 .../LocatorLauncherRemoteIntegrationTest.java   |    2 +-
 .../distributed/LocatorLauncherTest.java        |    2 +-
 .../gemfire/distributed/RoleDUnitTest.java      |    2 +-
 .../ServerLauncherIntegrationTest.java          |    2 +-
 .../ServerLauncherLocalIntegrationTest.java     |    8 +-
 .../ServerLauncherRemoteIntegrationTest.java    |    6 +-
 .../gemfire/distributed/ServerLauncherTest.java |    2 +-
 ...rverLauncherWithProviderIntegrationTest.java |    2 +-
 .../distributed/internal/Bug40751DUnitTest.java |    4 +-
 .../ConsoleDistributionManagerDUnitTest.java    |    2 +-
 .../internal/DistributionConfigJUnitTest.java   |    2 +-
 .../internal/DistributionManagerDUnitTest.java  |    2 +-
 .../InternalDistributedSystemJUnitTest.java     |    2 +-
 .../gemfire/distributed/internal/LDM.java       |    2 +-
 .../internal/ProductUseLogDUnitTest.java        |    2 +-
 .../locks/DLockReentrantLockJUnitTest.java      |    4 +-
 .../membership/MembershipJUnitTest.java         |    2 +-
 .../gms/auth/GMSAuthenticatorJUnitTest.java     |    2 +-
 .../gms/fd/GMSHealthMonitorJUnitTest.java       |    2 +-
 .../locator/GMSLocatorRecoveryJUnitTest.java    |    2 +-
 .../gms/membership/StatRecorderJUnitTest.java   |    4 +-
 .../messenger/JGroupsMessengerJUnitTest.java    |    2 +-
 .../gms/mgr/GMSMembershipManagerJUnitTest.java  |    2 +-
 .../TcpServerBackwardCompatDUnitTest.java       |    2 +-
 .../gemfire/disttx/CacheMapDistTXDUnitTest.java |    4 +-
 .../gemfire/disttx/DistTXExpiryJUnitTest.java   |    6 +-
 .../gemfire/disttx/DistTXJUnitTest.java         |    2 +-
 .../disttx/DistTXManagerImplJUnitTest.java      |    6 +-
 .../gemfire/disttx/DistTXOrderDUnitTest.java    |    2 +-
 .../DistTXReleasesOffHeapOnCloseJUnitTest.java  |   10 +-
 .../disttx/DistTXRestrictionsDUnitTest.java     |    2 +-
 .../disttx/DistTXWithDeltaDUnitTest.java        |    2 +-
 .../gemfire/disttx/DistTXWriterJUnitTest.java   |    6 +-
 .../disttx/DistTXWriterOOMEJUnitTest.java       |    6 +-
 .../gemfire/disttx/PRDistTXDUnitTest.java       |    2 +-
 .../gemfire/disttx/PRDistTXJUnitTest.java       |    6 +-
 .../disttx/PRDistTXWithVersionsDUnitTest.java   |    2 +-
 ...entPartitionedRegionWithDistTXDUnitTest.java |    2 +-
 .../internal/AbstractConfigJUnitTest.java       |    2 +-
 .../gemfire/internal/Bug51616JUnitTest.java     |    4 +-
 .../internal/GemFireStatSamplerJUnitTest.java   |    2 +-
 .../GemFireVersionIntegrationJUnitTest.java     |    2 +-
 .../gemfire/internal/InlineKeyJUnitTest.java    |    4 +-
 .../gemfire/internal/JSSESocketJUnitTest.java   |    2 +-
 .../internal/JarClassLoaderJUnitTest.java       |    2 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |    4 +-
 .../internal/PdxDeleteFieldDUnitTest.java       |    2 +-
 .../internal/PdxDeleteFieldJUnitTest.java       |    4 +-
 .../gemfire/internal/PdxRenameDUnitTest.java    |    2 +-
 .../gemfire/internal/PdxRenameJUnitTest.java    |    4 +-
 ...lityShouldUseArrayEqualsIntegrationTest.java |    4 +-
 .../internal/SSLConfigIntegrationJUnitTest.java |    2 +-
 .../gemfire/internal/SSLConfigJUnitTest.java    |    2 +-
 .../gemfire/internal/cache/BackupJUnitTest.java |    2 +-
 .../internal/cache/Bug33726JUnitTest.java       |    2 +-
 .../internal/cache/Bug34583JUnitTest.java       |    2 +-
 .../internal/cache/Bug37244JUnitTest.java       |    2 +-
 .../internal/cache/Bug39079DUnitTest.java       |    2 +-
 .../internal/cache/Bug41091DUnitTest.java       |    2 +-
 .../internal/cache/Bug41957DUnitTest.java       |    2 +-
 .../internal/cache/Bug45934DUnitTest.java       |    2 +-
 .../internal/cache/Bug48182JUnitTest.java       |    8 +-
 .../cache/CacheLifecycleListenerJUnitTest.java  |    2 +-
 .../internal/cache/CacheServiceJUnitTest.java   |    2 +-
 ...ssagesRegionCreationAndDestroyJUnitTest.java |    2 +-
 .../cache/ClientServerGetAllDUnitTest.java      |    2 +-
 ...ServerInvalidAndDestroyedEntryDUnitTest.java |    2 +-
 .../cache/ClientServerTransactionDUnitTest.java |   16 +-
 .../cache/ConcurrentMapLocalJUnitTest.java      |    2 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |    2 +-
 .../cache/ConnectDisconnectDUnitTest.java       |    2 +-
 .../cache/DeltaPropagationDUnitTest.java        |    2 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |    2 +-
 .../cache/DiskOfflineCompactionJUnitTest.java   |    2 +-
 .../internal/cache/DiskOldAPIsJUnitTest.java    |   10 +-
 .../cache/DiskRegCacheXmlJUnitTest.java         |    2 +-
 .../DiskRegCachexmlGeneratorJUnitTest.java      |    2 +-
 .../cache/DiskRegionClearJUnitTest.java         |    2 +-
 .../DiskRegionIllegalArguementsJUnitTest.java   |    2 +-
 ...iskRegionIllegalCacheXMLvaluesJUnitTest.java |    2 +-
 .../internal/cache/DiskRegionTestingBase.java   |    2 +-
 .../cache/DiskStoreFactoryJUnitTest.java        |    2 +-
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |    2 +-
 .../cache/FixedPRSinglehopDUnitTest.java        |    2 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |    2 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |    2 +-
 .../cache/IncrementalBackupDUnitTest.java       |    2 +-
 .../internal/cache/InterruptDiskJUnitTest.java  |    2 +-
 ...InterruptsConserveSocketsFalseDUnitTest.java |    2 +-
 .../LIFOEvictionAlgoEnabledRegionJUnitTest.java |    2 +-
 ...victionAlgoMemoryEnabledRegionJUnitTest.java |    2 +-
 .../internal/cache/MapInterfaceJUnitTest.java   |    2 +-
 .../cache/OffHeapEvictionDUnitTest.java         |    2 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |    2 +-
 .../cache/OfflineSnapshotJUnitTest.java         |    2 +-
 .../cache/P2PDeltaPropagationDUnitTest.java     |    2 +-
 .../cache/PRConcurrentMapOpsJUnitTest.java      |    2 +-
 .../cache/PRDataStoreMemoryJUnitTest.java       |    2 +-
 .../PRDataStoreMemoryOffHeapJUnitTest.java      |    2 +-
 ...dRegionAPIConserveSocketsFalseDUnitTest.java |    2 +-
 ...gionBucketCreationDistributionDUnitTest.java |    2 +-
 ...rtitionedRegionCacheXMLExampleDUnitTest.java |    2 +-
 .../PartitionedRegionDataStoreJUnitTest.java    |    2 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |    2 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |    2 +-
 ...artitionedRegionRedundancyZoneDUnitTest.java |    2 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |    2 +-
 ...RegionSingleHopWithServerGroupDUnitTest.java |    2 +-
 .../cache/PartitionedRegionTestHelper.java      |    4 +-
 .../PersistentPartitionedRegionJUnitTest.java   |    2 +-
 .../internal/cache/RegionListenerJUnitTest.java |    2 +-
 .../cache/RemoteTransactionDUnitTest.java       |    2 +-
 .../internal/cache/RunCacheInOldGemfire.java    |    6 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |    2 +-
 .../internal/cache/TXManagerImplJUnitTest.java  |    4 +-
 .../cache/TXReservationMgrJUnitTest.java        |    4 +-
 .../cache/TombstoneCreationJUnitTest.java       |    2 +-
 .../cache/TransactionsWithDeltaDUnitTest.java   |    4 +-
 .../internal/cache/UpdateVersionJUnitTest.java  |    2 +-
 .../cache/control/MemoryMonitorJUnitTest.java   |    2 +-
 .../control/MemoryMonitorOffHeapJUnitTest.java  |    2 +-
 .../control/RebalanceOperationDUnitTest.java    |    2 +-
 ...ltiThreadedOplogPerJUnitPerformanceTest.java |    2 +-
 .../cache/execute/Bug51193DUnitTest.java        |    2 +-
 ...ributedRegionFunctionExecutionDUnitTest.java |    2 +-
 .../execute/FunctionServiceStatsDUnitTest.java  |    2 +-
 .../MemberFunctionExecutionDUnitTest.java       |    2 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |    2 +-
 ...egionFunctionExecutionFailoverDUnitTest.java |    3 +-
 .../cache/execute/PRClientServerTestBase.java   |    2 +-
 .../execute/PRFunctionExecutionDUnitTest.java   |    2 +-
 .../cache/ha/BlockingHARegionJUnitTest.java     |    2 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |    2 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |    2 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |    2 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |   10 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |    2 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |    2 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |    2 +-
 .../cache/ha/HAConflationDUnitTest.java         |    2 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |    2 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |    2 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |    2 +-
 .../cache/ha/HARQAddOperationJUnitTest.java     |    2 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |    3 +-
 .../internal/cache/ha/HARegionJUnitTest.java    |    2 +-
 .../cache/ha/HARegionQueueJUnitTest.java        |    2 +-
 .../ha/HARegionQueueStartStopJUnitTest.java     |    4 +-
 .../cache/ha/HARegionQueueStatsJUnitTest.java   |    2 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |    2 +-
 .../ha/OperationsPropagationDUnitTest.java      |    2 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |    2 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |    2 +-
 .../cache/locks/TXLockServiceDUnitTest.java     |    2 +-
 .../internal/cache/lru/LRUClockJUnitTest.java   |    2 +-
 .../cache/lru/TransactionsWithOverflowTest.java |    4 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |    2 +-
 .../cache/partitioned/Bug47388DUnitTest.java    |    2 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |    2 +-
 .../PersistentPartitionedRegionDUnitTest.java   |    2 +-
 .../PersistentRecoveryOrderDUnitTest.java       |    2 +-
 .../tier/sockets/AcceptorImplJUnitTest.java     |    2 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |    2 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |    8 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |    2 +-
 .../CacheServerMaxConnectionsJUnitTest.java     |    2 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |    2 +-
 .../CacheServerTransactionsDUnitTest.java       |    2 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |    2 +-
 .../tier/sockets/ClientConflationDUnitTest.java |    2 +-
 .../sockets/ClientHealthMonitorJUnitTest.java   |    4 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |    9 +-
 .../ClientServerForceInvalidateDUnitTest.java   |    2 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java |    2 +-
 .../cache/tier/sockets/ConflationDUnitTest.java |    2 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java  |    4 +-
 .../DataSerializerPropogationDUnitTest.java     |    2 +-
 .../DestroyEntryPropagationDUnitTest.java       |    2 +-
 .../sockets/DurableClientBug39997DUnitTest.java |    2 +-
 .../DurableClientQueueSizeDUnitTest.java        |    2 +-
 .../DurableClientReconnectDUnitTest.java        |    2 +-
 .../sockets/DurableClientStatsDUnitTest.java    |    2 +-
 .../sockets/DurableRegistrationDUnitTest.java   |    2 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |    2 +-
 .../sockets/EventIDVerificationDUnitTest.java   |    2 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |    2 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |    2 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |    2 +-
 .../InstantiatorPropagationDUnitTest.java       |    2 +-
 .../tier/sockets/InterestListDUnitTest.java     |    2 +-
 .../sockets/InterestListEndpointDUnitTest.java  |    2 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |    2 +-
 .../sockets/InterestRegrListenerDUnitTest.java  |    2 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |    2 +-
 .../tier/sockets/RedundancyLevelJUnitTest.java  |    2 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |    2 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |    2 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |    2 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |    2 +-
 .../sockets/ReliableMessagingDUnitTest.java     |    2 +-
 .../sockets/UnregisterInterestDUnitTest.java    |    2 +-
 .../sockets/UpdatePropagationDUnitTest.java     |    2 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |    2 +-
 .../cache/wan/AsyncEventQueueTestBase.java      |    2 +-
 .../asyncqueue/AsyncEventListenerDUnitTest.java |    2 +-
 .../AsyncEventQueueValidationsJUnitTest.java    |    2 +-
 .../CompressionCacheConfigDUnitTest.java        |    2 +-
 ...ompressionCacheListenerOffHeapDUnitTest.java |    2 +-
 ...ressionRegionOperationsOffHeapDUnitTest.java |    2 +-
 .../datasource/AbstractPoolCacheJUnitTest.java  |    2 +-
 .../internal/datasource/CleanUpJUnitTest.java   |    2 +-
 .../ConnectionPoolCacheImplJUnitTest.java       |    2 +-
 .../datasource/ConnectionPoolingJUnitTest.java  |    2 +-
 .../datasource/DataSourceFactoryJUnitTest.java  |    2 +-
 .../internal/datasource/RestartJUnitTest.java   |    2 +-
 .../internal/jta/BlockingTimeOutJUnitTest.java  |    2 +-
 .../gemfire/internal/jta/CacheUtils.java        |    2 +-
 .../internal/jta/DataSourceJTAJUnitTest.java    |    2 +-
 .../internal/jta/ExceptionJUnitTest.java        |    2 +-
 .../jta/GlobalTransactionJUnitTest.java         |    2 +-
 .../internal/jta/JtaIntegrationJUnitTest.java   |    2 +-
 .../internal/jta/TransactionImplJUnitTest.java  |    2 +-
 .../jta/TransactionManagerImplJUnitTest.java    |    2 +-
 .../jta/TransactionTimeOutJUnitTest.java        |    2 +-
 .../jta/UserTransactionImplJUnitTest.java       |    2 +-
 .../internal/jta/dunit/ExceptionsDUnitTest.java |    4 +-
 .../jta/dunit/IdleTimeOutDUnitTest.java         |    4 +-
 .../jta/dunit/LoginTimeOutDUnitTest.java        |    2 +-
 .../jta/dunit/MaxPoolSizeDUnitTest.java         |    2 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java  |    2 +-
 .../dunit/TxnManagerMultiThreadDUnitTest.java   |    2 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java |    2 +-
 .../DistributedSystemLogFileJUnitTest.java      |    2 +-
 .../logging/LocatorLogFileJUnitTest.java        |    2 +-
 .../logging/LogWriterPerformanceTest.java       |    2 +-
 .../CustomConfigWithCacheIntegrationTest.java   |    2 +-
 .../internal/offheap/InlineKeyJUnitTest.java    |    8 +-
 .../internal/offheap/OffHeapIndexJUnitTest.java |    8 +-
 .../internal/offheap/OffHeapRegionBase.java     |    8 +-
 .../offheap/OffHeapValidationJUnitTest.java     |    8 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java    |    2 +-
 .../TxReleasesOffHeapOnCloseJUnitTest.java      |    8 +-
 .../statistics/StatisticsDUnitTest.java         |    2 +-
 .../internal/stats50/AtomicStatsJUnitTest.java  |    2 +-
 .../ConcurrentHashMapIteratorJUnitTest.java     |    2 +-
 .../management/CacheManagementDUnitTest.java    |    2 +-
 .../management/ClientHealthStatsDUnitTest.java  |    2 +-
 .../DataBrowserJSONValidationJUnitTest.java     |    4 +-
 .../management/LocatorManagementDUnitTest.java  |    2 +-
 .../gemfire/management/ManagementTestBase.java  |    2 +-
 .../management/OffHeapManagementDUnitTest.java  |    2 +-
 .../gemfire/management/TypedJsonJUnitTest.java  |    2 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |    2 +-
 .../stats/DistributedSystemStatsJUnitTest.java  |    2 +-
 .../bean/stats/MBeanStatsTestCase.java          |    4 +-
 .../internal/cli/CliUtilDUnitTest.java          |    2 +-
 .../cli/HeadlessGfshIntegrationTest.java        |    2 +-
 .../cli/commands/CliCommandTestBase.java        |    2 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |    2 +-
 ...eateAlterDestroyRegionCommandsDUnitTest.java |    2 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |    2 +-
 .../commands/DiskStoreCommandsDUnitTest.java    |    2 +-
 .../cli/commands/FunctionCommandsDUnitTest.java |    2 +-
 .../commands/GemfireDataCommandsDUnitTest.java  |    2 +-
 ...WithCacheLoaderDuringCacheMissDUnitTest.java |    2 +-
 .../HTTPServiceSSLSupportJUnitTest.java         |    2 +-
 .../commands/HelpCommandsIntegrationTest.java   |    2 +-
 .../cli/commands/IndexCommandsDUnitTest.java    |    2 +-
 ...stAndDescribeDiskStoreCommandsDUnitTest.java |    6 +-
 .../ListAndDescribeRegionDUnitTest.java         |    4 +-
 .../cli/commands/ListIndexCommandDUnitTest.java |    2 +-
 .../cli/commands/MemberCommandsDUnitTest.java   |    2 +-
 .../MiscellaneousCommandsDUnitTest.java         |    2 +-
 ...laneousCommandsExportLogsPart3DUnitTest.java |    2 +-
 .../cli/commands/QueueCommandsDUnitTest.java    |    6 +-
 .../SharedConfigurationCommandsDUnitTest.java   |    2 +-
 .../cli/commands/ShowDeadlockDUnitTest.java     |    4 +-
 .../cli/commands/ShowMetricsDUnitTest.java      |    2 +-
 .../cli/commands/ShowStackTraceDUnitTest.java   |    4 +-
 .../cli/commands/UserCommandsDUnitTest.java     |    4 +-
 .../functions/DataCommandFunctionJUnitTest.java |    2 +-
 .../SharedConfigurationDUnitTest.java           |    2 +-
 .../SharedConfigurationUsingDirDUnitTest.java   |    2 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.java      |    2 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |    2 +-
 .../pulse/TestSubscriptionsDUnitTest.java       |    2 +-
 .../GeodeSecurityUtilCustomRealmJUnitTest.java  |    2 +-
 .../GeodeSecurityUtilWithIniFileJUnitTest.java  |    2 +-
 .../JsonAuthorizationCacheStartRule.java        |    2 +-
 .../internal/security/MultiUserDUnitTest.java   |    2 +-
 .../internal/security/ShiroCacheStartRule.java  |    2 +-
 .../ReadOpFileAccessControllerJUnitTest.java    |    4 +-
 .../DomainObjectsAsValuesJUnitTest.java         |    3 +-
 .../GemcachedDevelopmentJUnitTest.java          |    2 +-
 .../gemfire/memcached/IntegrationJUnitTest.java |    2 +-
 .../gemfire/pdx/AutoSerializableJUnitTest.java  |    2 +-
 .../ClientsWithVersioningRetryDUnitTest.java    |    2 +-
 .../pdx/DistributedSystemIdDUnitTest.java       |    2 +-
 .../gemfire/pdx/JSONFormatterJUnitTest.java     |    2 +-
 .../pdx/JSONPdxClientServerDUnitTest.java       |    2 +-
 .../gemfire/pdx/PdxAttributesJUnitTest.java     |    2 +-
 .../gemfire/pdx/PdxClientServerDUnitTest.java   |    2 +-
 .../pdx/PdxInstanceFactoryJUnitTest.java        |    2 +-
 .../gemfire/pdx/PdxInstanceJUnitTest.java       |    2 +-
 .../gemfire/pdx/PdxSerializableJUnitTest.java   |    2 +-
 .../gemfire/pdx/PdxStringJUnitTest.java         |    2 +-
 .../gemstone/gemfire/redis/AuthJUnitTest.java   |    6 +-
 .../gemfire/redis/ConcurrentStartTest.java      |    4 +-
 .../gemstone/gemfire/redis/HashesJUnitTest.java |    2 +-
 .../gemstone/gemfire/redis/ListsJUnitTest.java  |    2 +-
 .../gemfire/redis/RedisDistDUnitTest.java       |    8 +-
 .../gemstone/gemfire/redis/SetsJUnitTest.java   |    2 +-
 .../gemfire/redis/SortedSetsJUnitTest.java      |    2 +-
 .../gemfire/redis/StringsJunitTest.java         |    2 +-
 .../security/ClientAuthenticationTestUtils.java |    2 +-
 .../security/ClientAuthorizationTestCase.java   |    2 +-
 .../security/P2PAuthenticationDUnitTest.java    |   10 +-
 .../gemfire/security/SecurityTestUtils.java     |    2 +-
 .../generator/LdapUserCredentialGenerator.java  |    2 +-
 .../generator/SSLCredentialGenerator.java       |    2 +-
 .../test/dunit/DistributedTestUtils.java        |    2 +-
 .../gemfire/test/dunit/LogWriterUtils.java      |    2 +-
 .../cache/internal/JUnit4CacheTestCase.java     |    2 +-
 .../internal/JUnit4DistributedTestCase.java     |    6 +-
 .../test/dunit/standalone/DUnitLauncher.java    |    2 +-
 .../test/dunit/standalone/ProcessManager.java   |    2 +-
 ...ingGetPropertiesDisconnectsAllDUnitTest.java |    2 +-
 ...ingGetPropertiesDisconnectsAllDUnitTest.java |    2 +-
 .../gemfire/test/golden/GoldenTestCase.java     |    4 +-
 .../gemfire/test/process/ProcessWrapper.java    |    2 +-
 .../com/main/WANBootStrapping_Site1_Add.java    |    2 +-
 .../com/main/WANBootStrapping_Site1_Remove.java |    4 +-
 .../com/main/WANBootStrapping_Site2_Add.java    |    2 +-
 .../com/main/WANBootStrapping_Site2_Remove.java |    2 +-
 .../gemfire/cache/query/cq/CQJUnitTest.java     |    2 +-
 .../cq/dunit/CqDataUsingPoolDUnitTest.java      |    2 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java  |    2 +-
 .../cq/dunit/CqQueryUsingPoolDUnitTest.java     |    2 +-
 .../cache/query/cq/dunit/CqStateDUnitTest.java  |    2 +-
 .../PartitionedRegionCqQueryDUnitTest.java      |    2 +-
 .../cache/query/dunit/PdxQueryCQTestBase.java   |    2 +-
 .../query/dunit/QueryMonitorDUnitTest.java      |  330 ++--
 .../cache/snapshot/ClientSnapshotDUnitTest.java |    2 +-
 .../cache/PRDeltaPropagationDUnitTest.java      |    2 +-
 .../internal/cache/PutAllCSDUnitTest.java       |    2 +-
 .../cache/RemoteCQTransactionDUnitTest.java     |    2 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java   |    2 +-
 .../cache/ha/HADispatcherDUnitTest.java         |    4 +-
 .../sockets/ClientToServerDeltaDUnitTest.java   |    2 +-
 .../DeltaPropagationWithCQDUnitTest.java        |    2 +-
 ...ToRegionRelationCQRegistrationDUnitTest.java |    2 +-
 .../tier/sockets/DurableClientTestCase.java     |    2 +-
 .../CacheServerManagementDUnitTest.java         |    4 +-
 .../cli/commands/ClientCommandsDUnitTest.java   |    2 +-
 .../DurableClientCommandsDUnitTest.java         |    3 +-
 .../security/ClientAuthzObjectModDUnitTest.java |    8 +-
 .../gemfire/security/MultiUserAPIDUnitTest.java |    4 +-
 ...ceneIndexCreationOffHeapIntegrationTest.java |    4 +-
 .../cache/lucene/LuceneIntegrationTest.java     |    9 +-
 .../LuceneIndexRecoveryHAIntegrationTest.java   |    2 +-
 .../LuceneServiceImplIntegrationTest.java       |    2 +-
 .../IndexRepositoryImplPerformanceTest.java     |    2 +-
 ...neIndexXmlGeneratorIntegrationJUnitTest.java |    2 +-
 ...uceneIndexXmlParserIntegrationJUnitTest.java |    2 +-
 .../pulse/testbed/GemFireDistributedSystem.java |    2 +-
 .../gemfire/tools/pulse/tests/Server.java       |    2 +-
 .../util/AutoBalancerIntegrationJUnitTest.java  |    2 +-
 .../internal/cache/UpdateVersionDUnitTest.java  |    2 +-
 .../cache/wan/CacheClientNotifierDUnitTest.java |    2 +-
 .../gemfire/internal/cache/wan/WANTestBase.java |    2 +-
 .../cache/wan/disttx/DistTXWANDUnitTest.java    |    2 +-
 .../wan/misc/NewWanAuthenticationDUnitTest.java |    2 +-
 .../SenderWithTransportFilterDUnitTest.java     |    2 +-
 .../wan/misc/WANConfigurationJUnitTest.java     |    2 +-
 .../wan/misc/WANLocatorServerDUnitTest.java     |    2 +-
 ...llelGatewaySenderQueueOverflowDUnitTest.java |    2 +-
 .../SerialGatewaySenderQueueDUnitTest.java      |    2 +-
 .../wan/wancommand/WANCommandTestBase.java      |    2 +-
 ...anCommandCreateGatewayReceiverDUnitTest.java |    4 +-
 .../WanCommandCreateGatewaySenderDUnitTest.java |    2 +-
 ...WanCommandGatewayReceiverStartDUnitTest.java |    4 +-
 .../WanCommandGatewayReceiverStopDUnitTest.java |    4 +-
 .../WanCommandGatewaySenderStartDUnitTest.java  |    2 +-
 .../WanCommandGatewaySenderStopDUnitTest.java   |    2 +-
 .../wan/wancommand/WanCommandListDUnitTest.java |    2 +-
 .../WanCommandPauseResumeDUnitTest.java         |    2 +-
 .../wancommand/WanCommandStatusDUnitTest.java   |    4 +-
 .../ClusterConfigurationDUnitTest.java          |    2 +-
 .../ConnectCommandWithHttpAndSSLDUnitTest.java  |    2 +-
 582 files changed, 2996 insertions(+), 3062 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
index 5facd2f..f493e99 100644
--- a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
+++ b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.modules.util.RegionConfiguration;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
 
 public class ClientServerRegionFactoryDelegate extends RegionFactoryDelegate {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
index d3c098d..82a74b7 100644
--- a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
+++ b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Iterator;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class RegionFactoryDelegate  {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
index d92d688..d2802c6 100644
--- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
+++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
@@ -44,7 +44,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.logging.Level;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
index d4df02c..bcfeab4 100644
--- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
+++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java
@@ -16,7 +16,7 @@
 */
 package com.gemstone.gemfire.modules;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.io.IOException;
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
index 74c7152..c14f829 100644
--- a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
+++ b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
@@ -36,7 +36,7 @@ import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public abstract class AbstractCache {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
index f2ef993..5726013 100644
--- a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
+++ b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
@@ -16,7 +16,7 @@
 */
 package com.gemstone.gemfire.modules.session;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.beans.PropertyChangeEvent;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
index 9bec901..c37c0b5 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java
@@ -38,7 +38,7 @@ import java.io.File;
 
 import static org.junit.Assert.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * These tests are part of assembly as they require the REST war file to be present.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index a0d65b0..da4c4ab 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -64,7 +64,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
index 54460c3..fe8d0be 100755
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
@@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category;
 import java.io.File;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
index 93cb31a..899f187 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
@@ -50,7 +50,7 @@ import java.util.Set;
 
 import static com.gemstone.gemfire.cache.RegionShortcut.PARTITION;
 import static com.gemstone.gemfire.cache.RegionShortcut.REPLICATE;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
 import static com.gemstone.gemfire.internal.FileUtil.delete;
 import static com.gemstone.gemfire.internal.FileUtil.deleteMatching;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
index fdba506..8246671 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
@@ -49,7 +49,7 @@ import java.io.InputStreamReader;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
index d5bc12f..e61743a 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
@@ -17,7 +17,7 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index b601b3a..837aebe 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -21,8 +21,6 @@ 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 com.gemstone.gemfire.cache.*;
@@ -58,7 +56,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Dunit Test containing inter - operations between REST Client and Gemfire cache client

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index 80d30e6..7199e1b 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
index b63b6ec..8321caf 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.net.InetAddress;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index e6b16d0..f01ab4b 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -21,8 +21,6 @@ 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 com.gemstone.gemfire.cache.*;
@@ -61,7 +59,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
index 303242b..5ef389f 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
index a5ca836..25dce1d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
@@ -49,7 +49,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Represents a GemFire distributed system for remote administration/management.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
index 2653e8f..eb5b646 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.admin.CacheServerConfig;
 import com.gemstone.gemfire.admin.CacheVmConfig;
 import com.gemstone.gemfire.internal.admin.GemFireVM;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * An implementation of <code>CacheVmConfig</code>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
index 114dc5b..325c943 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionManager;
 import com.gemstone.gemfire.internal.admin.GemFireVM;
 import com.gemstone.gemfire.internal.admin.remote.RemoteApplicationVM;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Implements the administrative interface to a cache server.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
index d85a610..517f5a6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
@@ -32,7 +32,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * An implementation of the configuration object for an

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
index 1a73767..88d939a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import java.net.InetAddress;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Provides an implementation of

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
index 3f944d6..ff139c5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
@@ -32,7 +32,7 @@ import java.io.File;
 import java.util.Iterator;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Implements the actual administration (starting, stopping, etc.) of

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
index 5e26d61..ff6deca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.admin.internal;
 
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import org.xml.sax.*;
@@ -58,7 +58,7 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
   public static final String REMOTE_COMMAND = "remote-command";
 
   /** The name of the <code>locators</code> element. */
-  public static final String LOCATORS = DistributedSystemConfigProperties.LOCATORS;
+  public static final String LOCATORS = ConfigurationProperties.LOCATORS;
 
   /** The name of the <code>ssl</code> element. */
   public static final String SSL = "ssl";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
index 4cd93b1..e0ba1bb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.admin.ConfigurationParameter;
 import com.gemstone.gemfire.admin.ManagedEntityConfig;
 import com.gemstone.gemfire.internal.admin.GemFireVM;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
 
 /**
  * A <code>SystemMember</code> that is also managed (or manageable) by

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
index bffb59f..6c24816 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
@@ -35,7 +35,7 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Provides the JMX Agent configuration properties.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
index cf90a3e..d14e5e6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.admin.jmx.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.admin.*;
 import com.gemstone.gemfire.admin.jmx.Agent;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
index 250df74..19cc8f5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
@@ -30,8 +30,8 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Factory class used to create the singleton {@link ClientCache client cache} and connect to one or more GemFire Cache Servers. If the application wants to connect to GemFire as a peer it should use {@link com.gemstone.gemfire.cache.CacheFactory} instead.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
index 1d3360f..ca3b6f0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
@@ -44,7 +44,7 @@ import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Authenticates this client (or a user) on a server. This op ideally should get

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
index ec1a4f9..7fccfb1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java
@@ -46,7 +46,7 @@ import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * The AbstractLauncher class is a base class for implementing various launchers to construct and run different GemFire


[13/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 f037e95..b793e34 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
@@ -34,7 +34,7 @@ import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Provides an implementation of <code>DistributionConfig</code> that
@@ -1142,7 +1142,7 @@ public class DistributionConfigImpl
     // a no-op since multicast discovery has been removed
     // and the default mcast port is now zero
 
-    //    ConfigSource cs = getAttSourceMap().get(DistributedSystemConfigProperties.MCAST_PORT);
+    //    ConfigSource cs = getAttSourceMap().get(ConfigurationProperties.MCAST_PORT);
 //    if (cs == null) {
 //      String locators = getLocators();
 //      if (locators != null && !locators.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index af81cc1..67f5478 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -73,8 +73,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * The concrete implementation of {@link DistributedSystem} that

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 483778d..de191e8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -71,7 +71,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Provides the implementation of a distribution <code>Locator</code>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
index 2102893..f59ed84 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
 
 /**
  * This class maintains statistics for the locator

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
index 89cab6a..c1384c3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
@@ -25,7 +25,7 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Provides an implementation of <code>DistributionConfig</code> that

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
index d8d26b5..1c32050 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
@@ -83,7 +83,7 @@ import com.gemstone.gemfire.management.internal.configuration.messages.SharedCon
 import com.gemstone.gemfire.management.internal.configuration.utils.XmlUtils;
 import com.gemstone.gemfire.management.internal.configuration.utils.ZipUtils;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 @SuppressWarnings({ "deprecation", "unchecked" })
 public class SharedConfiguration {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
index 9af29ec..b82fdb1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
@@ -37,7 +37,7 @@ import java.util.Properties;
 import java.util.Set;
 
 import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.*;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 // static messages
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 910ba2c..8dce1a5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -46,8 +46,8 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.START_LOCATOR;
 import static com.gemstone.gemfire.distributed.internal.membership.gms.ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL;
 import static com.gemstone.gemfire.internal.DataSerializableFixedID.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 b3b46cc..4d0c5a8 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
@@ -29,7 +29,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 /**
  * Provides an implementation of the {@link Config} interface
  * that implements functionality that all {@link Config} implementations

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
index 33d3765..2c81e90 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
@@ -33,8 +33,8 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * MigrationClient is used to retrieve all of the data for a region from

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
index cf5eea0..aba9f97 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.admin.internal.InetAddressUtil;
 import com.gemstone.gemfire.cache.Cache;
@@ -34,8 +34,8 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * MigrationServer creates a cache using a supplied cache.xml and then

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
index 5e561ed..cc03ad6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.*;
 import com.gemstone.gemfire.admin.AdminException;
@@ -47,7 +47,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.START_LOCATOR;
 
 /**
  * Provides static methods for various system administation tasks.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
index 17fbf94..36c553e 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.admin;
 
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Iterator;
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
index 8421c9a..d846fa1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Tranport config for RemoteGfManagerAgent.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
index e982e32..e8c6643 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
@@ -22,8 +22,8 @@ import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
 import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
@@ -43,8 +43,8 @@ import java.net.URL;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOG_FILE;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SERVER_BIND_ADDRESS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOG_FILE;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.SERVER_BIND_ADDRESS;
 
 /**
  * Launcher program to start a cache server.
@@ -263,7 +263,7 @@ public class CacheServerLauncher  {
       "critical-off-heap-percentage";
   public static final String EVICTION_OFF_HEAP_PERCENTAGE =
       "eviction-off-heap-percentage";
-  protected static final String LOCK_MEMORY = DistributedSystemConfigProperties.LOCK_MEMORY;
+  protected static final String LOCK_MEMORY = ConfigurationProperties.LOCK_MEMORY;
 
   protected final File processDirOption(final Map<String, Object> options, final String dirValue) throws FileNotFoundException {
     final File inputWorkingDirectory = new File(dirValue);
@@ -1197,7 +1197,7 @@ public class CacheServerLauncher  {
 
   /**
    * Reads {@link DistributedSystem#PROPERTY_FILE} and determines if the
-   * {@link DistributedSystemConfigProperties#LOG_FILE} property is set to stdout
+   * {@link ConfigurationProperties#LOG_FILE} property is set to stdout
    * @return true if the logging would go to stdout
    */
   private static boolean isLoggingToStdOut() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
index 126d713..6c963e6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
@@ -72,7 +72,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Represents a (disk-based) persistent store for region data. Used for both

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
index 9c19461..2161de7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.*;
 import com.gemstone.gemfire.distributed.internal.DistributionStats;
 import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
 
 /**
  * GemFire statistics about a Pool 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
index 85b2041..ffcb8c5 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
@@ -56,7 +56,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Implements the acceptor thread on the bridge server. Accepts connections from

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
index df9bbd4..30ab4a4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -54,7 +54,7 @@ import java.security.Principal;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Class <code>CacheClientNotifier</code> works on the server and manages

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
index 4d1c1d2..9bbf284 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.Logger;
 import java.io.*;
 import java.util.Arrays;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * This class represents a ConnectionProxy of the CacheClient

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
index 2408009..a926772 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
@@ -56,7 +56,7 @@ import java.security.cert.X509Certificate;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class HandShake implements ClientHandShake
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
index 1a66030..e7c102c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
@@ -60,7 +60,7 @@ import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Provides an implementation for the server socket end of the hierarchical

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index 1c373c1..425b4bd 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -46,7 +46,7 @@ import java.net.SocketTimeoutException;
 import java.security.Principal;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * A <code>ServerHandShakeProcessor</code> verifies the client's version compatibility with server.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
index 4ee3585..71171fd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
@@ -17,7 +17,7 @@
 package com.gemstone.gemfire.internal.cache.xmlcache;
 
 import com.gemstone.gemfire.cache.CacheXmlException;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import org.xml.sax.*;
@@ -691,7 +691,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
   /** The name of the <code>overflow-directory</code> attribute */
   protected static final String OVERFLOW_DIRECTORY = "overflow-directory";
   /** The name of the <code>socket-buffer-size</code> attribute */
-  protected static final String SOCKET_BUFFER_SIZE = DistributedSystemConfigProperties.SOCKET_BUFFER_SIZE;
+  protected static final String SOCKET_BUFFER_SIZE = ConfigurationProperties.SOCKET_BUFFER_SIZE;
   /** The name of the <code>socket-read-timeout</code> attribute */
   protected static final String SOCKET_READ_TIMEOUT = "socket-read-timeout";
   /** The name of the <code>maximum-queue-memory</code> attribute */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
index 37ce630..21d631a 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.logging;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
index 961f68a..1a4f91b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
@@ -20,7 +20,6 @@ package com.gemstone.gemfire.internal.security;
 import com.gemstone.gemfire.cache.operations.OperationContext;
 import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
 import com.gemstone.gemfire.cache.operations.OperationContext.Resource;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.security.shiro.CustomAuthRealm;
 import com.gemstone.gemfire.internal.security.shiro.ShiroPrincipal;
@@ -48,7 +47,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class GeodeSecurityUtil {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
index fff008f..6da9656 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
@@ -43,7 +43,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import static com.gemstone.gemfire.management.internal.security.ResourceConstants.ACCESS_DENIED_MESSAGE;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class CustomAuthRealm extends AuthorizingRealm{
   public static final String REALM_NAME = "CUSTOMAUTHREALM";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
index 80c8a56..85e3511 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
@@ -49,7 +49,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /** <p>Connection is a socket holder that sends and receives serialized
     message objects.  A Connection may be closed to preserve system

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
index b408d86..76166c1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli;
 
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.management.cli.CliMetaData;
@@ -37,7 +37,7 @@ import java.lang.reflect.Method;
 import java.util.*;
 import java.util.Map.Entry;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * 
@@ -95,7 +95,7 @@ public class CommandManager {
     
     // Find by  packages specified in the distribution config
     if (this.cacheProperties != null) {
-      String cacheUserCmdPackages = this.cacheProperties.getProperty(DistributedSystemConfigProperties.USER_COMMAND_PACKAGES);
+      String cacheUserCmdPackages = this.cacheProperties.getProperty(ConfigurationProperties.USER_COMMAND_PACKAGES);
       if (cacheUserCmdPackages != null && !cacheUserCmdPackages.isEmpty()) {
         StringTokenizer tokenizer = new StringTokenizer(cacheUserCmdPackages, ",");
         while (tokenizer.hasMoreTokens()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
index 26083a5..de17d1c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommands.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.SystemFailure;
 import com.gemstone.gemfire.cache.CacheClosedException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
index e19c0ea..22749ea 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -90,7 +90,7 @@ import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * The LauncherLifecycleCommands class encapsulates all GemFire launcher commands for GemFire tools (like starting

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 034d921..6b1a330 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
@@ -85,7 +85,7 @@ import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
index c4bbeef..a69e852 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli.functions;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
index 9006f8e..09ea679 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
@@ -35,7 +35,7 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /****
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
index cc80de8..787edcc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.management.internal.cli.i18n;
 
 import com.gemstone.gemfire.cache.PartitionAttributesFactory;
 import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
@@ -26,7 +26,7 @@ import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
 
 import java.text.MessageFormat;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**-*
  * Contains 'String' constants used as key to the Localized strings to be used
@@ -1715,7 +1715,7 @@ public class CliStrings {
   public static final String START_SERVER__J__HELP = "Argument passed to the JVM on which the server will run. For example, --J=-Dfoo.bar=true will set the system property \"foo.bar\" to \"true\".";
   public static final String START_SERVER__LOCATORS = LOCATORS;
   public static final String START_SERVER__LOCATORS__HELP = "Sets the list of Locators used by the Cache Server to join the appropriate GemFire cluster.";
-  public static final String START_SERVER__LOCK_MEMORY = DistributedSystemConfigProperties.LOCK_MEMORY;
+  public static final String START_SERVER__LOCK_MEMORY = ConfigurationProperties.LOCK_MEMORY;
   public static final String START_SERVER__LOCK_MEMORY__HELP = "Causes GemFire to lock heap and off-heap memory pages into RAM. This prevents the operating system from swapping the pages out to disk, which can cause severe performance degradation. When you use this option, also configure the operating system limits for locked memory.";
   public static final String START_SERVER__LOCATOR_WAIT_TIME = "locator-wait-time";
   public static final String START_SERVER__LOCATOR_WAIT_TIME_HELP = "Sets the number of seconds the server will wait for a locator to become available during startup before giving up.";
@@ -1735,15 +1735,15 @@ public class CliStrings {
   public static final String START_SERVER__MEMCACHED_PROTOCOL__HELP = "Sets the protocol that the GemFire memcached service uses (ASCII or BINARY).";
   public static final String START_SERVER__MEMCACHED_BIND_ADDRESS = MEMCACHED_BIND_ADDRESS;
   public static final String START_SERVER__MEMCACHED_BIND_ADDRESS__HELP = "Sets the IP address the GemFire memcached service listens on for memcached clients. The default is to bind to the first non-loopback address for this machine.";
-  public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE = DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE;
+  public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE = ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
   public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE__HELP = "The total size of off-heap memory specified as off-heap-memory-size=<n>[g|m]. <n> is the size. [g|m] indicates whether the size should be interpreted as gigabytes or megabytes. A non-zero size causes that much memory to be allocated from the operating system and reserved for off-heap use.";
   public static final String START_SERVER__PROPERTIES = "properties-file";
   public static final String START_SERVER__PROPERTIES__HELP = "The gemfire.properties file for configuring the Cache Server's distributed system. The file's path can be absolute or relative to the gfsh working directory.";
-  public static final String START_SERVER__REDIS_PORT = DistributedSystemConfigProperties.REDIS_PORT;
+  public static final String START_SERVER__REDIS_PORT = ConfigurationProperties.REDIS_PORT;
   public static final String START_SERVER__REDIS_PORT__HELP = "Sets the port that the GemFire Redis service listens on for Redis clients.";
-  public static final String START_SERVER__REDIS_BIND_ADDRESS = DistributedSystemConfigProperties.REDIS_BIND_ADDRESS;
+  public static final String START_SERVER__REDIS_BIND_ADDRESS = ConfigurationProperties.REDIS_BIND_ADDRESS;
   public static final String START_SERVER__REDIS_BIND_ADDRESS__HELP = "Sets the IP address the GemFire Redis service listens on for Redis clients. The default is to bind to the first non-loopback address for this machine.";
-  public static final String START_SERVER__REDIS_PASSWORD = DistributedSystemConfigProperties.REDIS_PASSWORD;
+  public static final String START_SERVER__REDIS_PASSWORD = ConfigurationProperties.REDIS_PASSWORD;
   public static final String START_SERVER__REDIS_PASSWORD__HELP = "Sets the authentication password for GemFireRedisServer";
   public static final String START_SERVER__SECURITY_PROPERTIES = "security-properties-file";
   public static final String START_SERVER__SECURITY_PROPERTIES__HELP = "The gfsecurity.properties file for configuring the Server's security configuration in the distributed system. The file's path can be absolute or relative to gfsh directory.";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
index d7c8f69..fc366ce 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
@@ -45,7 +45,7 @@ import java.util.*;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * OperationInvoker JMX Implementation

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
index 40b93eb..8cb7275 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.web.controllers;
 
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.lang.StringUtils;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
@@ -44,7 +44,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.GET, value = "/durable-clients/{durable-client-id}/cqs")
   @ResponseBody
-  public String listDurableClientContinuousQueries(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
+  public String listDurableClientContinuousQueries(@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                                    @RequestParam(value = CliStrings.LIST_DURABLE_CQS__MEMBER, required = false) final String memberNameId,
                                                    @RequestParam(value = CliStrings.LIST_DURABLE_CQS__GROUP, required = false) final String[] groups)
   {
@@ -65,7 +65,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.GET, value = "/durable-clients/{durable-client-id}/cqs/events")
   @ResponseBody
-  public String countDurableClientContinuousQueryEvents(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
+  public String countDurableClientContinuousQueryEvents(@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                                         @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, required = false) final String memberNameId,
                                                         @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP, required = false) final String[] groups)
   {
@@ -74,7 +74,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.GET, value = "/durable-clients/{durable-client-id}/cqs/{durable-cq-name}/events")
   @ResponseBody
-  public String countDurableClientContinuousQueryEvents(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
+  public String countDurableClientContinuousQueryEvents(@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                                         @PathVariable("durable-cq-name") final String durableCqName,
                                                         @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, required = false) final String memberNameId,
                                                         @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP, required = false) final String[] groups)
@@ -108,7 +108,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.POST, value = "/durable-clients/{durable-client-id}", params = "op=close")
   @ResponseBody
-  public String closeDurableClient(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
+  public String closeDurableClient(@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                    @RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__MEMBER, required = false) final String memberNameId,
                                    @RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__GROUP, required = false) final String[] groups)
   {
@@ -129,7 +129,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.POST, value = "/durable-clients/{durable-client-id}/cqs/{durable-cq-name}", params = "op=close")
   @ResponseBody
-  public String closeDurableContinuousQuery(@PathVariable(DistributedSystemConfigProperties.DURABLE_CLIENT_ID) final String durableClientId,
+  public String closeDurableContinuousQuery(@PathVariable(ConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                             @PathVariable("durable-cq-name")final String durableCqName,
                                             @RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__MEMBER, required = false) final String memberNameId,
                                             @RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__GROUP, required = false) final String[] groups)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
index ce496eb..81f87d5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.redis;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.cache.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
index 444d9c1..a785b88 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
@@ -30,7 +30,7 @@ import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
index c4044f5..beacd0d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
@@ -31,7 +31,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
index def39f0..337f971 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
@@ -25,7 +25,7 @@ import org.junit.rules.TestName;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertTrue;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
index 16a3d40..04d5427 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
@@ -32,7 +32,7 @@ import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
index ba515dd..ab5b8e1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
@@ -22,7 +22,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Tests the functionality of JOM {@link Statistics}.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
index f675903..9b721d8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
@@ -31,7 +31,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 8650e9a..f1c2809 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
@@ -33,7 +33,7 @@ import org.junit.experimental.categories.Category;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
index 4487191..68244d9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/TXJUnitTest.java
@@ -36,7 +36,7 @@ import org.junit.rules.TestName;
 import javax.transaction.Synchronization;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java
index 84a2de7..f6076fd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/TXWriterTestCase.java
@@ -27,7 +27,7 @@ import org.junit.Before;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Extracted from TXWriterJUnitTest to share with TXWriterOOMEJUnitTest.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
index 54eebab..ebae559 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/BindDistributedSystemJUnitTest.java
@@ -25,8 +25,8 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.BIND_ADDRESS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.BIND_ADDRESS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.START_LOCATOR;
 import static org.junit.Assert.assertEquals;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
index c3d665e..277e1a3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
@@ -22,7 +22,7 @@ import org.junit.Before;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Provides common setUp and tearDown for testing the Admin API.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
index 904a9b6..10ca3bd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
@@ -23,7 +23,7 @@ import org.junit.Before;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Superclass of tests for the {@linkplain

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
index 8b39409..27b2d5a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheListenerJUnitTest.java
@@ -31,8 +31,8 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
index ce43f70..ad80db6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/CacheRegionClearStatsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
index bbde730..3267d3e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ClientServerTimeSyncDUnitTest.java
@@ -15,15 +15,12 @@
  * limitations under the License.
  */
 package com.gemstone.gemfire.cache;
-
-import org.junit.experimental.categories.Category;
-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 org.junit.experimental.categories.Category;
+import org.junit.Test;
+
+import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.client.ClientCacheFactory;
@@ -39,9 +36,9 @@ import org.junit.Ignore;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
 
-@Category(DistributedTest.class)
+@Category(DistributedTest.class)
 public class ClientServerTimeSyncDUnitTest extends JUnit4CacheTestCase {
 
   public ClientServerTimeSyncDUnitTest() {
@@ -121,7 +118,7 @@ public class ClientServerTimeSyncDUnitTest extends JUnit4CacheTestCase {
     }
   }
   
-  @Test
+  @Test
   public void testNothing() {
     // place-holder to keep dunit runner from barfing
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
index f414621..6c72563 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolAndLoaderDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
index 424e219..c41cdc1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
index 42ee559..0339d16 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/PoolManagerJUnitTest.java
@@ -29,8 +29,8 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
index 7fa6cb7..49fee6c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ProxyJUnitTest.java
@@ -34,8 +34,8 @@ import org.junit.experimental.categories.Category;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
index fe607ab..e80e1d3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
@@ -39,7 +39,7 @@ import java.util.Arrays;
 import java.util.Properties;
 
 import static com.gemstone.gemfire.cache.RegionShortcut.*;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
index 4c5944b..9add46b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/AsyncEventQueueEvictionAndExpirationJUnitTest.java
@@ -31,7 +31,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
index 79f58b7..adbf53d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/asyncqueue/internal/SerialAsyncEventQueueImplJUnitTest.java
@@ -25,7 +25,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
index 2fd5b79..7152da3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
@@ -51,7 +51,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.junit.runners.MethodSorters.NAME_ASCENDING;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
index 9494bbf..4599b39 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientRegionFactoryJUnitTest.java
@@ -36,8 +36,8 @@ import java.util.Arrays;
 import java.util.Properties;
 
 import static com.gemstone.gemfire.cache.client.ClientRegionShortcut.*;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index fdefbfe..7ae34ae 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.client;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index 544d7b2..ef23d00 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -52,8 +52,8 @@ import java.util.Properties;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 6c2f3ec..ee5cc62 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.client.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java
index 77e081f..1cc6c80 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/ConnectionPoolImplJUnitTest.java
@@ -37,8 +37,8 @@ import java.net.InetSocketAddress;
 import java.net.SocketTimeoutException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index 2f79e50..c12ed25 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -16,14 +16,7 @@
  */
 package com.gemstone.gemfire.cache.client.internal;
 
-import org.junit.experimental.categories.Category;
-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 com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.client.Pool;
@@ -42,7 +35,7 @@ import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java
index 6839dcf..79f922a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/QueueManagerJUnitTest.java
@@ -45,8 +45,8 @@ import java.util.*;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
index c372374..6fee251 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/SSLNoClientAuthDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.client.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index c417ea6..28a5342 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -52,8 +52,8 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.fail;
 
 @Category(IntegrationTest.class)



[08/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
index f25b884..c112d09 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapRegionBase.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.cache.RegionShortcut;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.compression.Compressor;
 import com.gemstone.gemfire.compression.SnappyCompressor;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.cache.*;
 import com.gemstone.gemfire.internal.offheap.annotations.OffHeapIdentifier;
 import com.gemstone.gemfire.internal.offheap.annotations.Released;
@@ -40,8 +40,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**
@@ -64,7 +64,7 @@ public abstract class OffHeapRegionBase {
     Properties props = new Properties();
     props.setProperty(LOCATORS, "");
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
+    props.setProperty(ConfigurationProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
     GemFireCacheImpl result = (GemFireCacheImpl) new CacheFactory(props).setPdxPersistent(isPersistent).create();
     unconfigureOffHeapStorage();
     return result;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
index ba1b8d3..0863165 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OffHeapValidationJUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionShortcut;
 import com.gemstone.gemfire.compression.SnappyCompressor;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.HeapDataOutputStream;
 import com.gemstone.gemfire.internal.Version;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -37,8 +37,8 @@ import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**
@@ -64,7 +64,7 @@ public class OffHeapValidationJUnitTest {
     Properties props = new Properties();
     props.setProperty(LOCATORS, "");
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
+    props.setProperty(ConfigurationProperties.OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
     GemFireCacheImpl result = (GemFireCacheImpl) new CacheFactory(props).create();
     return result;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
index 02a8050..7b7a57c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.offheap;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.jayway.awaitility.Awaitility.*;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
index eced418..50fff36 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/TxReleasesOffHeapOnCloseJUnitTest.java
@@ -17,15 +17,15 @@
 package com.gemstone.gemfire.internal.offheap;
 
 import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 
 @Category(IntegrationTest.class)
@@ -37,7 +37,7 @@ public class TxReleasesOffHeapOnCloseJUnitTest {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "1m");
+    props.setProperty(ConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "1m");
     cache = new CacheFactory(props).create();
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index 5f46199..1e7a4e4 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.statistics;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
index 69a3c26..1fc1d23 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
@@ -31,7 +31,7 @@ import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
index ca1fb64..52b3eb9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/util/concurrent/ConcurrentHashMapIteratorJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.util.concurrent;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
index 8cbbf03..550a6cb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.jayway.awaitility.Awaitility.*;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
index 9c805f2..abcd3ba 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
index cbf9be4..87ab1d8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
@@ -44,7 +44,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.fail;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
index ac608a6..9d2d546 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index 2915f06..4d120f0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
index b42930a..7001e37 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java
index 288b31e..e6ad317 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/TypedJsonJUnitTest.java
@@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index c0978b7..5457ed3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
index da2610a..43a0d79 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
@@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
index 54b93e8..dd6af18 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.bean.stats;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
@@ -27,7 +27,7 @@ import org.junit.Before;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertNotNull;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
index a7c2ce4..b8369a5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
index 2a72c31..a4725ec 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java
@@ -29,7 +29,7 @@ import org.junit.rules.TestName;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
 import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
 import static org.junit.Assert.assertNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index 60e9268..1b9d770 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@ -43,7 +43,7 @@ import java.util.regex.Pattern;
 
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Base class for all the CLI/gfsh command dunit tests.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 dad9102..5720955 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
@@ -44,7 +44,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
 import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
 import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index d2f142d..5704ad7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -58,7 +58,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+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.jayway.awaitility.Awaitility.waitAtMost;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 067847a..6f70e57 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
@@ -39,7 +39,7 @@ import java.io.IOException;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 b06754b..32cea6a 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
@@ -46,7 +46,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+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;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index 73b8818..735de4f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -41,7 +41,7 @@ import java.util.Properties;
 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;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Dunit class for testing gemfire function commands : execute function, destroy function, list function

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 3bbea2f..8208e80 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -56,7 +56,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Dunit class for testing gemfire data commands : get, put, remove, select, rebalance

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
index 3ba03a2..90e018f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java
@@ -40,7 +40,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.Host.getHost;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
index fadfa4d..7a96adf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
index 0e909c1..bbb11db 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
@@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase.commandResultToString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 4166499..2691e09 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
@@ -38,7 +38,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 @Category(DistributedTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
index 411a80a..d37e568 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java
@@ -17,7 +17,7 @@
 package com.gemstone.gemfire.management.internal.cli.commands;
 
 import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.management.cli.Result;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -35,7 +35,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.assertNotNull;
 import static com.gemstone.gemfire.test.dunit.Host.getHost;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * The ListAndDescribeDiskStoreCommandsDUnitTest class is a test suite of functional tests cases testing the proper
@@ -123,7 +123,7 @@ public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBas
   private Properties createDistributedSystemProperties(final String gemfireName) {
     final Properties distributedSystemProperties = new Properties();
 
-    distributedSystemProperties.setProperty(DistributedSystemConfigProperties.LOG_LEVEL, getDUnitLogLevel());
+    distributedSystemProperties.setProperty(ConfigurationProperties.LOG_LEVEL, getDUnitLogLevel());
     distributedSystemProperties.setProperty(NAME, gemfireName);
 
     return distributedSystemProperties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index 91b8671..f88ce4c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
@@ -37,7 +37,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index 61708a6..8ca68cb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -43,7 +43,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the index-based GemFire shell

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
index e5dc688..d6cc239 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
@@ -39,7 +39,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 import static com.gemstone.gemfire.test.dunit.NetworkUtils.getServerHostName;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index 44438f0..ab061d4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index 6d6e9ce..d4648cb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@ -41,7 +41,7 @@ import java.util.Properties;
 import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
 import static com.gemstone.gemfire.test.dunit.Assert.fail;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Dunit class for testing gemfire function commands : export logs

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 c1877fe..152e55a 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
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
@@ -46,8 +46,8 @@ import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 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;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 c527809..87a7ab9 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
@@ -43,7 +43,7 @@ import java.io.IOException;
 import java.util.Properties;
 import java.util.Set;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
 import static com.gemstone.gemfire.management.internal.cli.CliUtil.getAllNormalMembers;
 import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index f7a17f2..2530c14 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.execute.Function;
@@ -48,7 +48,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
index 25b8b87..0571263 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java
@@ -44,7 +44,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
 import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 @Category(DistributedTest.class)
 public class ShowMetricsDUnitTest extends CliCommandTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
index 6854cf2..164169b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.management.cli.Result.Status;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
@@ -33,7 +33,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.gemstone.gemfire.test.dunit.Assert.assertFalse;
 import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
index 069e929..c29e3ea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/UserCommandsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.ClassBuilder;
 import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.internal.FileUtil;
@@ -154,7 +154,7 @@ public class UserCommandsDUnitTest extends CliCommandTestBase {
     });
 
     Properties properties = new Properties();
-    properties.setProperty(DistributedSystemConfigProperties.USER_COMMAND_PACKAGES, "junit.ucdunit");
+    properties.setProperty(ConfigurationProperties.USER_COMMAND_PACKAGES, "junit.ucdunit");
     setUpJmxManagerOnVm0ThenConnect(properties);
 
     CommandResult cmdResult = executeCommand("ucdunitcmd");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
index 905fd16..edf49c3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunctionJUnitTest.java
@@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.List;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 2dd880a..3c17f9f 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
@@ -46,7 +46,7 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.Host.getHost;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
index 1cef3d4..cc5eecf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
@@ -38,7 +38,7 @@ import java.util.Arrays;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
 import static com.gemstone.gemfire.test.dunit.Host.getHost;
 import static com.jayway.awaitility.Awaitility.waitAtMost;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
index 7485e92..a306233 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/utils/XmlUtilsAddNewNodeJUnitTest.java
@@ -42,7 +42,7 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
index 5cbf715..91eddf4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientIdsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.pulse;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
index f483cef..d71de15 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestSubscriptionsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.pulse;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
index dfd7763..fcd5b96 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
 import org.junit.BeforeClass;
 import org.junit.experimental.categories.Category;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * this test and ShiroUtilWithIniFileJunitTest uses the same test body, but initialize the SecurityUtils differently.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
index b3fb6e8..edcf998 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * this test and ShiroUtilCustomRealmJUunitTest uses the same test body, but initialize the SecurityUtils differently.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
index b753c6e..223ff91 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
@@ -22,7 +22,7 @@ import org.junit.rules.ExternalResource;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class JsonAuthorizationCacheStartRule extends ExternalResource {
   private Cache cache;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
index fdaa75d..e6dd1d5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
@@ -41,7 +41,7 @@ import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.*;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 @Category({ DistributedTest.class, SecurityTest.class })
 public class MultiUserDUnitTest extends CliCommandTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
index c0efddd..49cbbaa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
@@ -22,7 +22,7 @@ import org.junit.rules.ExternalResource;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class ShiroCacheStartRule extends ExternalResource {
   private Cache cache;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
index 5a3d0a8..2ea40a4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/unsafe/ReadOpFileAccessControllerJUnitTest.java
@@ -45,8 +45,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java
index b55a5a7..f148ff3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/DomainObjectsAsValuesJUnitTest.java
@@ -16,13 +16,12 @@
  */
 package com.gemstone.gemfire.memcached;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Future;
-import java.util.logging.Logger;
 
 import net.spy.memcached.MemcachedClient;
 import org.junit.After;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java
index dc6bc07..4f8859c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/GemcachedDevelopmentJUnitTest.java
@@ -39,7 +39,7 @@ import java.util.concurrent.Future;
 import java.util.logging.Logger;
 import java.util.logging.StreamHandler;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
index b6931d6..0705d29 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.memcached;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.net.InetAddress;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java
index b4527e4..9501a51 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/AutoSerializableJUnitTest.java
@@ -43,7 +43,7 @@ import java.net.URLClassLoader;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
index e536ca6..eae37fa 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/ClientsWithVersioningRetryDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.pdx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
index 85e12cf..a5b26ca 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.pdx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java
index 6fbc9de..24174cf 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONFormatterJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.pdx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.text.SimpleDateFormat;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
index d249fb9..adfb050 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.pdx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java
index 4547e9c..71c7c0b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxAttributesJUnitTest.java
@@ -36,7 +36,7 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
index 309cbdc..47b6dee 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.pdx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java
index 6027565..529a698 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceFactoryJUnitTest.java
@@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category;
 import java.io.*;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
index aba891e..509a0ed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
@@ -37,7 +37,7 @@ import java.lang.reflect.InvocationTargetException;
 import java.math.BigInteger;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java
index f38a2eb..2accf07 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxSerializableJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.pdx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java
index a2d3204..0091c5e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxStringJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.pdx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Date;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java
index 6c64663..0241a04 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/AuthJUnitTest.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.redis;
 
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.GemFireCache;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -32,7 +32,7 @@ import redis.clients.jedis.exceptions.JedisDataException;
 import java.io.IOException;
 import java.util.Random;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)
@@ -64,7 +64,7 @@ public class AuthJUnitTest {
     cf.set(LOG_LEVEL, "error");
     cf.set(MCAST_PORT, "0");
     cf.set(LOCATORS, "");
-    cf.set(DistributedSystemConfigProperties.REDIS_PASSWORD, PASSWORD);
+    cf.set(ConfigurationProperties.REDIS_PASSWORD, PASSWORD);
     cache = cf.create();
     server = new GemFireRedisServer("localhost", port);
     server.start();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java
index 45bd1dd..4538ca6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/ConcurrentStartTest.java
@@ -29,8 +29,8 @@ import org.junit.Test;
 import org.junit.contrib.java.lang.system.RestoreSystemProperties;
 import org.junit.experimental.categories.Category;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertFalse;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java
index 8b095a0..351de74 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/HashesJUnitTest.java
@@ -30,7 +30,7 @@ import redis.clients.jedis.Jedis;
 import java.io.IOException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java
index 4bfef66..fe4134c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/ListsJUnitTest.java
@@ -32,7 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
index a55b687..c10e521 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/RedisDistDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.redis;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Random;
@@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category;
 import redis.clients.jedis.Jedis;
 
 import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
@@ -89,8 +89,8 @@ public class RedisDistDUnitTest extends JUnit4DistributedTestCase {
         CacheFactory cF = new CacheFactory();
         String locator = SocketCreator.getLocalHost().getHostName() + "[" + locatorPort + "]";
         cF.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
-        cF.set(DistributedSystemConfigProperties.REDIS_BIND_ADDRESS, localHost);
-        cF.set(DistributedSystemConfigProperties.REDIS_PORT, "" + port);
+        cF.set(ConfigurationProperties.REDIS_BIND_ADDRESS, localHost);
+        cF.set(ConfigurationProperties.REDIS_PORT, "" + port);
         cF.set(MCAST_PORT, "0");
         cF.set(LOCATORS, locator);
         cF.create();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java
index 02a9d9f..7872e41 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/SetsJUnitTest.java
@@ -33,7 +33,7 @@ import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 



[16/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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
new file mode 100644
index 0000000..e74ae05
--- /dev/null
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
@@ -0,0 +1,1583 @@
+/*
+ * 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.distributed;
+
+/**
+ * This interface defines all the configuration properties that can be used.
+ * <U>Since</U>: Geode 1.0
+ */
+public interface ConfigurationProperties {
+
+  /**
+   * The static string definition of the <i>"ack-severe-alert-threshold"</i> property <a name="ack-severe-alert-threshold"/>
+   * <p>
+   * <U>Description</U>:
+   * The number of seconds the distributed
+   * system will wait after the ack-wait-threshold for a message to be
+   * acknowledged before it issues an alert at <i>severe</i> level.  The
+   * default value is zero, which turns off this feature.
+   * When ack-severe-alert-threshold is used, GemFire will also initiate
+   * additional checks to see if the process is alive.  These checks will
+   * begin when the ack-wait-threshold is reached and will continue until
+   * GemFire has been able to communicate with the process and ascertain its
+   * status.<p>
+   * <U>Default</U>: "0"
+   * <p>
+   * <U>Allowed values</U>: 0..2147483647
+   */
+  String ACK_SEVERE_ALERT_THRESHOLD = "ack-severe-alert-threshold";
+  /**
+   * The static String definition of the <i>"ack-wait-threshold"</i> property
+   * <a name="ack-wait-threshold"/a></p>
+   * <U>Description</U>: The number of seconds the distributed
+   * system will wait for a message to be acknowledged before it sends
+   * a <i>warning</i> level alert to signal that something might be wrong with the system
+   * node that is unresponsive.  After sending this alert the waiter
+   * continues to wait. The alerts are logged in the log as warnings
+   * and will cause an alert notification in the Admin API and GemFire
+   * JMX Agent.</p>
+   * <U>Default</U>: "15"</p>
+   * <U>Allowed values</U>: 1..2147483647
+   */
+  String ACK_WAIT_THRESHOLD = "ack-wait-threshold";
+  /**
+   * The static String definition of the <i>"archive-disk-space-limit"</i> property
+   * <a name="archive-disk-space-limit"/a></p>
+   * <U>Description</U>: Limits, in megabytes, how much disk space can be
+   * consumed by old inactive statistic archive files. When the limit is
+   * exceeded the oldest inactive archive is deleted.
+   * Set to zero to disable automatic archive deletion.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..1000000
+   */
+  String ARCHIVE_DISK_SPACE_LIMIT = "archive-disk-space-limit";
+  /**
+   * The static String definition of the <i>"archive-file-size-limit"</i> property
+   * <a name="archive-file-size-limit"/a></p>
+   * <U>Description</U>: Limits, in megabytes, how large the current statistic archive
+   * file can grow before it is closed and archival rolls on to a new file.
+   * Set to zero to disable archive rolling.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..1000000
+   */
+  String ARCHIVE_FILE_SIZE_LIMIT = "archive-file-size-limit";
+  /**
+   * The static String definition of the <i>"async-distribution-timeout"</i> property
+   * <a name="async-distribution-timeout"/a></p>
+   * <U>Description</U>: The number of milliseconds before a
+   * publishing process should attempt to distribute a cache operation
+   * before switching over to asynchronous messaging for this process.
+   * To enable asynchronous messaging, the value must be set above
+   * zero. If a thread that is publishing to the cache exceeds this value
+   * when attempting to distribute to this process, it will switch to
+   * asynchronous messaging until this process catches up, departs, or
+   * some specified limit is reached, such as <a href="#async-queue-timeout">
+   * async-queue-timeout</a> or <a href="#async-max-queue-size">
+   * async-max-queue-size</a>.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..60000
+   */
+  String ASYNC_DISTRIBUTION_TIMEOUT = "async-distribution-timeout";
+  /**
+   * The static String definition of the <i>"async-max-queue-size"</i> property
+   * <a name="async-max-queue-size"/a></p>
+   * <U>Description</U>: The maximum size in megabytes that a
+   * publishing process should be allowed to asynchronously enqueue
+   * for this process before asking this process to depart from the
+   * distributed system.
+   * </p>
+   * <U>Default</U>: "8"</p>
+   * <U>Allowed values</U>: 0..1024
+   */
+  String ASYNC_MAX_QUEUE_SIZE = "async-max-queue-size";
+  /**
+   * The static String definition of the <i>"async-queue-timeout"</i> property
+   * <a name="async-queue-timeout"/a></p>
+   * <U>Description</U>: The number of milliseconds a queuing
+   * publisher may enqueue asynchronous messages without any distribution
+   * to this process before that publisher requests this process to
+   * depart. If a queuing publisher has not been able to send this process
+   * any cache operations prior to the timeout, this process will attempt
+   * to close its cache and disconnect from the distributed system.
+   * </p>
+   * <U>Default</U>: "60000"</p>
+   * <U>Allowed values</U>: 0..86400000
+   */
+  String ASYNC_QUEUE_TIMEOUT = "async-queue-timeout";
+  /**
+   * The static String definition of the <i>"bind-address"</i> property
+   * <a name="bind-address"/a><p>
+   * <U>Description</U>: The IP address that this distributed system's
+   * server sockets will listen on.
+   * If set to an empty string then the local machine's
+   * default address will be listened on.
+   * <p>
+   * <U>Default</U>: ""
+   */
+  String BIND_ADDRESS = "bind-address";
+  /**
+   * The static String definition of the <i>"cache-xml-file"</i> property
+   * <a name="cache-xml-file"/a></p>
+   * <U>Description</U>: Specifies the name of the XML file or resource
+   * to initialize the cache with when it is
+   * {@linkplain com.gemstone.gemfire.cache.CacheFactory#create created}.
+   * Create will first look for a file that matches the value of this property.
+   * If a file is not found then it will be searched for using
+   * {@link java.lang.ClassLoader#getResource}.  If the value of this
+   * property is the empty string (<code>""</code>), then the cache
+   * will not be declaratively initialized.</p>
+   * <U>Default</U>: "cache.xml"
+   */
+  String CACHE_XML_FILE = "cache-xml-file";
+  /**
+   * The static String definition of the <i>"cluster-configuration-dir"</i> property
+   * <a name="cluster-configuration-dir"/a></p>
+   * <U>Description</U>: This property specifies the directory in which the cluster configuration related disk-store and artifacts are stored
+   * This property is only applicable to dedicated locators which have "enable-cluster-configuration" set to true.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
+  /**
+   * The static String definition of the <i>"cluster-ssl-ciphers"</i> property
+   * <a name="cluster-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space separated list of the SSL cipher suites to
+   * enable. Those listed must be supported by the available providers.Preferably
+   * use cluster-ssl-* properties rather than ssl-* properties.
+   * </p>
+   * <U>Default</U>: "any" </p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String CLUSTER_SSL_CIPHERS = "cluster-ssl-ciphers";
+  /**
+   * The static String definition of the <i>"cluster-ssl-enabled"</i> property
+   * <a name="cluster-ssl-enabled"/a></p>
+   * <U>Description</U>: If true, all gemfire socket communication is
+   * configured to use SSL through JSSE. Preferably Use cluster-ssl-* properties
+   * rather than ssl-* properties.
+   * </p>
+   * <U>Default</U>: "false"</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String CLUSTER_SSL_ENABLED = "cluster-ssl-enabled";
+  /**
+   * The static String definition of the <i>"cluster-ssl-keystore"</i> property
+   * <a name="cluster-ssl-keystore"/a></p>
+   * <U>Description</U>Location of the Java keystore file containing
+   * certificate and private key.</p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String CLUSTER_SSL_KEYSTORE = "cluster-ssl-keystore";
+  /**
+   * The static String definition of the <i>"cluster-ssl-keystore-password"</i> property
+   * <a name="cluster-ssl-keystore-password"/a></p>
+   * <U>Description</U>Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String CLUSTER_SSL_KEYSTORE_PASSWORD = "cluster-ssl-keystore-password";
+  /**
+   * The static String definition of the <i>"cluster-ssl-keystore-type"</i> property
+   * <a name="cluster-ssl-keystore-type"/a></p>
+   * <U>Description</U>For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String CLUSTER_SSL_KEYSTORE_TYPE = "cluster-ssl-keystore-type";
+  /**
+   * The static String definition of the <i>"cluster-ssl-protocols"</i> property
+   * <a name="cluster-ssl-protocols"/a></p>
+   * <U>Description</U>: A space separated list of the SSL protocols to
+   * enable. Those listed must be supported by the available providers.Preferably
+   * use cluster-ssl-* properties rather than ssl-* properties.
+   * </p>
+   * <U>Default</U>: "any"</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String CLUSTER_SSL_PROTOCOLS = "cluster-ssl-protocols";
+  /**
+   * The static String definition of the <i>"cluster-ssl-require-authentication"</i> property
+   * <a name="cluster-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the
+   * client side of the connection to be authenticated.Preferably use
+   * cluster-ssl-* properties rather than ssl-* properties.
+   * </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String CLUSTER_SSL_REQUIRE_AUTHENTICATION = "cluster-ssl-require-authentication";
+  /**
+   * The static String definition of the <i>"cluster-ssl-truststore"</i> property
+   * <a name="cluster-ssl-truststore"/a></p>
+   * <U>Description</U>Location of the Java keystore file containing the
+   * collection of CA certificates trusted by distributed member (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String CLUSTER_SSL_TRUSTSTORE = "cluster-ssl-truststore";
+  /**
+   * The static String definition of the <i>"cluster-ssl-truststore-password"</i> property
+   * <a name="cluster-ssl-truststore-password"/a></p>
+   * <U>Description</U>Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String CLUSTER_SSL_TRUSTSTORE_PASSWORD = "cluster-ssl-truststore-password";
+  /**
+   * The static String definition of the <i>"conflate-events"</i> property
+   * <a name="conflate-events"/a></p>
+   * <U>Description</U>: This is a client-side property that is passed to
+   * the server. Allowable values are "server", "true", and "false". With the
+   * "server" setting, this client&apos;s servers use their own client queue
+   * conflation settings. With a "true" setting, the servers disregard their
+   * own configuration and enable conflation of events for all regions for the
+   * client. A "false" setting causes the client&apos;s servers to disable
+   * conflation for all regions for the client.
+   * <U>Default</U>: "server"</p>
+   * <U>Since</U>: GemFire 5.7
+   */
+  String CONFLATE_EVENTS = "conflate-events";
+  /**
+   * The static String definition of the <i>"conserve-sockets"</i> property
+   * <a name="conserve-sockets"/a></p>
+   * <U>Description</U>: If "true" then a minimal number of sockets
+   * will be used when connecting to the distributed system. This conserves
+   * resource usage but can cause performance to suffer.
+   * If "false" then every application thread that sends
+   * distribution messages to other members of the distributed system
+   * will own its own sockets and have exclusive access to them.
+   * The length of time a thread can have exclusive access to a socket
+   * can be configured with "socket-lease-time".
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true|false</p>
+   */
+  String CONSERVE_SOCKETS = "conserve-sockets";
+  /**
+   * The static String definition of the <i>"delta-propagation"</i> property
+   * <a name="delta-propagation">
+   * <dt>delta-propagation</dt>
+   * </a>
+   * <U>Description</U>: "true" indicates that server propagates delta
+   * generated from {@link com.gemstone.gemfire.Delta} type of objects. If "false"
+   * then server propagates full object but not delta. </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true|false
+   */
+  String DELTA_PROPAGATION = "delta-propagation";
+  /**
+   * The static String definition of the <i>"deploy-working-dir"</i> property
+   * <a name="deploy-working-dir"/a></p>
+   * <U>Description</U>: Specifies the working directory which this
+   * distributed member will use to persist deployed JAR files.  This directory
+   * should be unchanged when restarting the member so that it can read what
+   * was previously persisted. The default is the current working directory
+   * as determined by <code>System.getProperty("user.dir")</code>.
+   * </p>
+   * <U>Default</U>: <code>System.getProperty("user.dir")</code></p>
+   * <U>Since</U>: GemFire 7.0
+   */
+  String DEPLOY_WORKING_DIR = "deploy-working-dir";
+  /**
+   * The static String definition of the <i>"disable-auto-reconnect"</i> property
+   * <a name="disable-auto-reconnect"/a></p>
+   * <U>Description</U>: By default GemFire will attempt to reconnect and
+   * reinitialize the cache when it has been forced out of the distributed system
+   * by a network-partition event or has otherwise been shunned by other members.
+   * This setting will turn off this behavior.</p>
+   * <U>Default</U>: "false"
+   */
+  String DISABLE_AUTO_RECONNECT = "disable-auto-reconnect";
+  /**
+   * The static String definition of the <i>"disable-tcp"</i> property
+   * <a name="disable-tcp"/a><p>
+   * <U>Description</U>: Turns off use of tcp/ip sockets, forcing the
+   * cache to use datagram sockets for all communication.  This is useful
+   * if you have a large number of processes in the distributed cache since
+   * it eliminates the per-connection reader-thread that is otherwise required.
+   * However, udp communications are somewhat slower than tcp/ip communications
+   * due to the extra work required in Java to break messages down to
+   * transmittable sizes, and the extra work required to guarantee
+   * message delivery.
+   * <p>
+   * <U>Default</U>: "false"<p>
+   * <U>Allowed values</U>: true or false<p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String DISABLE_TCP = "disable-tcp";
+  /**
+   * The static String definition of the <i>"distributed-system-id"</i> property<p>
+   * <a name="distributed-system-id"/a>
+   * <U>Decription:</U>A number that uniquely identifies this distributed system, when
+   * using the WAN gateway to share data between multiple distributed systems. This
+   * setting is only required when using the WAN gateway in conjunction with
+   * the <b>P</b>ortable <b>D</b>ata e<b>X</b>change (PDX) serialization format.
+   * <p>
+   * If set, this setting must be the same for every member in this distributed
+   * system. It must be different than the number in other distributed systems
+   * that this one will connect to using the WAN.
+   * -1 means no setting.<p>
+   * <U>Range:</U>-1..255
+   * <p>
+   * <U>Default:</U>: "-1"
+   */
+  String DISTRIBUTED_SYSTEM_ID = "distributed-system-id";
+  /**
+   * The static String definition of the <i>"durable-client-id"</i> property
+   * <a name="durable-client-id"/a></p>
+   * <U>Description</U>: The id to be used by this durable client. When a
+   * durable client connects to a server, this id is used by the server to
+   * identify it. The server will accumulate updates for a durable client
+   * while it is disconnected and deliver these events to the client when it
+   * reconnects.
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 5.5
+   */
+  String DURABLE_CLIENT_ID = "durable-client-id";
+  /**
+   * The static String definition of the <i>"durable-client-timeout"</i> property
+   * <a name="durable-client-timeout"/a></p>
+   * <U>Description</U>: The number of seconds a disconnected durable
+   * client is kept alive and updates are accumulated for it by the server
+   * before it is terminated.
+   * <U>Default</U>: "300"</p>
+   * <U>Since</U>: GemFire 5.5
+   */
+  String DURABLE_CLIENT_TIMEOUT = "durable-client-timeout";
+  /**
+   * The static String definition of the <i>"enable-cluster-configuration"</i> property
+   * <a name="enable-cluster-configuration"/a></p>
+   * <U>Description</U>: "true" causes creation of cluster configuration service on dedicated locators. The cluster configuration service on dedicated
+   * locator(s)
+   * would serve the configuration to new members joining the distributed system and also save the configuration changes caused by the Gfsh commands.
+   * This property is only applicable to dedicated locators.
+   * </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true or false</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String ENABLE_CLUSTER_CONFIGURATION = "enable-cluster-configuration";
+  /**
+   * The static String definition of the <i>"enable-network-partition-detection"</i> property
+   * <a name="enable-network-partition-detection"/a></p>
+   * <U>Description</U>: Turns on network partitioning detection algorithms, which
+   * detect loss of quorum and shuts down losing partitions.
+   * </p>
+   * <U>Default</U>: "false"
+   */
+  String ENABLE_NETWORK_PARTITION_DETECTION = "enable-network-partition-detection";
+  /**
+   * The static String definition of the <i>"enable-time-statistics"</i> property
+   * <a name="enable-time-statistics"/a></p>
+   * <U>Description</U>: "true" causes additional time-based statistics to be
+   * gathered for gemfire operations.  This can aid in discovering
+   * where time is going in cache operations, albeit at the expense of
+   * extra clock probes on every operation.  "false" disables the additional
+   * time-based statistics.
+   * </p>
+   * <U>Default</U>: "false"</p>
+   * <U>Allowed values</U>: true or false</p>
+   * <U>Since</U>: 5.0
+   */
+  String ENABLE_TIME_STATISTICS = "enable-time-statistics";
+  /**
+   * The static String definition of the <i>"enforce-unique-host"</i> property
+   * <a name="enforce-unique-host"/a></p>
+   * <U>Description</U>: Whether or not partitioned regions will
+   * put redundant copies of the same data in different JVMs running on the same physical host.
+   * <p>
+   * By default, partitioned regions will try to put redundancy copies on different physical hosts, but it may
+   * put them on the same physical host if no other hosts are available. Setting this property to true
+   * will prevent partitions regions from ever putting redundant copies of data on the same physical host.
+   * </p>
+   * <U>Default</U>: "false"
+   */
+  String ENFORCE_UNIQUE_HOST = "enforce-unique-host";
+  /**
+   * The static String definition of the <i>"gateway-ssl-ciphers"</i> property
+   * <a name="gateway-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers";
+  /**
+   * The static String definition of the <i>"gateway-ssl-enabled"</i> property
+   * <a name="gateway-ssl-enabled"/a></p>
+   * <U>Description</U>: Specifies if gateway is started with separate ssl configuration.
+   * If not specified global property ssl-enabled (and its other related properties) are used
+   * to create gateway socket
+   * </p>
+   * <U>Default</U>: <code>false</code></p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled";
+  /**
+   * The static String definition of the <i>"gateway-ssl-keystore"</i> property
+   * <a name="gateway-ssl-keystore"/a></p>
+   * <U>Description</U>Location of the Java keystore file containing
+   * certificate and private key.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore";
+  /**
+   * The static String definition of the <i>"gateway-ssl-keystore-password"</i> property
+   * <a name="gateway-ssl-keystore-password"/a></p>
+   * <U>Description</U>Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password";
+  /**
+   * The static String definition of the <i>"gateway-ssl-keystore-type"</i> property
+   * <a name="gateway-ssl-keystore-type"/a></p>
+   * <U>Description</U>For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type";
+  /**
+   * The static String definition of the <i>"gateway-ssl-protocols"</i> property
+   * <a name="gateway-ssl-protocols"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL protocols to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols";
+  /**
+   * The static String definition of the <i>"gateway-ssl-require-authentication"</i> property
+   * <a name="gateway-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the Gateway Sender
+   * side of the connection to be authenticated.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication";
+  /**
+   * The static String definition of the <i>"gateway-ssl-truststore"</i> property
+   * <a name="gateway-ssl-truststore"/a></p>
+   * <U>Description</U>Location of the Java keystore file containing the
+   * collection of CA certificates trusted by server (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore";
+  /**
+   * The static String definition of the <i>"gateway-ssl-truststore-password"</i> property
+   * <a name="gateway-ssl-truststore-password"/a></p>
+   * <U>Description</U>: Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password";
+  /**
+   * The static String definition of the <i>"groups"</i> property.
+   * <a name="groups"/a> <p>
+   * <U>Description</U>: Defines the list of groups this member belongs to.
+   * Use commas to separate group names.
+   * Note that anything defined by the deprecated roles gemfire property will also be considered a group.
+   * <p>
+   * <U>Default</U>: ""
+   * <p>
+   * <U>Since</U>: GemFire 7.0
+   */
+  String GROUPS = "groups";
+  /**
+   * The static String definition of the <i>"http-service-bind-address"</i> property
+   * <a name="http-service-bind-address"/a></p>
+   * <U>Description</U>: The address where the GemFire HTTP service will listen
+   * for remote connections. One can use this property to configure what ip
+   * address or host name the HTTP service will listen on. When not set, by
+   * default the HTTP service will listen on the local host's address.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String HTTP_SERVICE_BIND_ADDRESS = "http-service-bind-address";
+  /**
+   * The static String definition of the <i>"http-service-port"</i> property
+   * <a name="http-service-port"/a></p>
+   * <U>Description</U>: Specifies the port used by the GemFire HTTP service. If
+   * configured with non-zero value, then an HTTP service will listen on this port.
+   * A value of "0" disables Gemfire HTTP service.
+   * </p>
+   * <U>Default</U>: "7070" </p>
+   * <U>Allowed values</U>: 0..65535</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String HTTP_SERVICE_PORT = "http-service-port";
+  /**
+   * The static String definition of the <i>"http-service-ssl-ciphers"</i> property
+   * <a name="http-service-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space separated list of the SSL cipher suites to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers";
+  /**
+   * The static String definition of the <i>"http-service-ssl-enabled"</i> property
+   * a name="http-service-ssl-enabled"/a></p>
+   * <U>Description</U>: Specifies if http service is started with separate ssl configuration.
+   * If not specified, global property cluster-ssl-enabled (and its other related properties) are used
+   * to secure http service. All http-service-ssl-* properties are inherited from cluster-ssl-* properties.
+   * User can ovverride them using specific http-service-ssl-* property.
+   * </p>
+   * <U>Default</U>: <code>false</code></p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled";
+  /**
+   * The static String definition of the <i>"http-service-ssl-keystore"</i> property
+   * <a name="http-service-ssl-keystore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing
+   * certificate and private key.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore";
+  /**
+   * The static String definition of the <i>"http-service-ssl-keystore-password"</i> property
+   * <a name="http-service-ssl-keystore-password"/a></p>
+   * <U>Description</U>: Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password";
+  /**
+   * The static String definition of the <i>"http-service-ssl-keystore-type"</i> property
+   * <a name="http-service-ssl-keystore-type"/a></p>
+   * <U>Description</U>: For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type";
+  /**
+   * The static String definition of the <i>"http-service-ssl-protocols"</i> property
+   * <a name="http-service-ssl-protocols"/a></p>
+   * <U>Description</U>: A space separated list of the SSL protocols to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols";
+  /**
+   * The static String definition of the <i>"http-service-ssl-require-authentication"</i> property
+   * <a name="http-service-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the client
+   * side of the connection to be authenticated.
+   * </p>
+   * <U>Default</U>: <code>false</code></p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication";
+  /**
+   * The static String definition of the <i>"http-service-ssl-truststore"</i> property
+   * <a name="http-service-ssl-truststore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing the
+   * collection of CA certificates trusted by server (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore";
+  /**
+   * The static String definition of the <i>"http-service-ssl-truststore-password"</i> property
+   * <a name="http-service-ssl-truststore-password"/a></p>
+   * <U>Description</U>: Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.1
+   */
+  String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password";
+  /**
+   * The static String definition of the <i>"jmx-manager"</i> property
+   * <a name="jmx-manager"/a></p>
+   * <U>Description</U>: If true then this member is willing to be a jmx-manager.
+   * All the other jmx-manager properties will be used when it does become a manager.
+   * If this property is false then all other jmx-manager properties are ignored.
+   * </p>
+   * <U>Default</U>: "false except on locators"
+   */
+  String JMX_MANAGER = "jmx-manager";
+  /**
+   * The static String definition of the <i>"jmx-manager-access-file"</i> property
+   * <a name="jmx-manager-access-file"/a></p>
+   * <U>Description</U>: By default the jmx-manager will allow full access to all mbeans by any client.
+   * If this property is set to the name of a file then it can restrict clients to only being able to read
+   * mbeans; they will not be able to modify mbeans. The access level can be configured differently in this
+   * file for each user name defined in the password file.
+   * For more information about the format of this file see Oracle's documentation of the
+   * com.sun.management.jmxremote.access.file system property.
+   * Ignored if jmx-manager is false or if jmx-manager-port is zero.
+   * </p>
+   * <U>Default</U>: ""
+   */
+  String JMX_MANAGER_ACCESS_FILE = "jmx-manager-access-file";
+  /**
+   * The static String definition of the <i>"jmx-manager-bind-address"</i> property
+   * <a name="jmx-manager-bind-address"/a></p>
+   * <U>Description</U>: By default the jmx-manager when configured with a port will listen
+   * on all the local host's addresses. You can use this property to configure what ip address
+   * or host name the jmx-manager will listen on. In addition, if the embedded http server is
+   * started, it will also bind to this address if it is set.
+   * Ignored if jmx-manager is false or jmx-manager-port is zero.
+   * </p>
+   * <U>Default</U>: ""
+   */
+  String JMX_MANAGER_BIND_ADDRESS = "jmx-manager-bind-address";
+  /**
+   * The static String definition of the <i>"jmx-manager-hostname-for-clients"</i> property
+   * <a name="jmx-manager-hostname-for-clients"/a></p>
+   * <U>Description</U>: Lets you control what hostname will be given to clients that ask
+   * the locator for the location of a jmx manager. By default the ip address that the jmx-manager
+   * reports is used. But for clients on a different network this property allows you to configure
+   * a different hostname that will be given to clients.
+   * Ignored if jmx-manager is false or jmx-manager-port is zero.
+   * </p>
+   * <U>Default</U>: ""
+   */
+  String JMX_MANAGER_HOSTNAME_FOR_CLIENTS = "jmx-manager-hostname-for-clients";
+  /**
+   * The static String definition of the <i>"jmx-manager-http-port"</i> property
+   * <a name="jmx-manager-http-port"/a></p>
+   * <U>Description</U>: If non-zero then when the jmx manager is started, an embedded
+   * web server will also be started and will listen on this port.
+   * The web server is used to host the GemFire Pulse application.
+   * If you are hosting the Pulse web app in your own web server, then disable
+   * this embedded server by setting this property to zero.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "7070"</p>
+   * <U>Deprecated</U>: as of GemFire8.0 use <a href="#http-service-port"><code>http-service-port</code></a> instead.
+   * @deprecated as of GemFire 8.0 use {@link #HTTP_SERVICE_PORT} instead.
+   */
+  String JMX_MANAGER_HTTP_PORT = "jmx-manager-http-port";
+  /**
+   * The static String definition of the <i>"jmx-manager-password-file"</i> property
+   * <a name="jmx-manager-password-file"/a></p>
+   * <U>Description</U>: By default the jmx-manager will allow clients without credentials to connect.
+   * If this property is set to the name of a file then only clients that connect with credentials that
+   * match an entry in this file will be allowed.
+   * Most JVMs require that the file is only readable by the owner.
+   * For more information about the format of this file see Oracle's documentation of the
+   * com.sun.management.jmxremote.password.file system property.
+   * Ignored if jmx-manager is false or if jmx-manager-port is zero.
+   * </p>
+   * <U>Default</U>: ""
+   */
+  String JMX_MANAGER_PASSWORD_FILE = "jmx-manager-password-file";
+  /**
+   * The static String definition of the <i>"jmx-manager-port"</i> property
+   * <a name="jmx-manager-port"/a></p>
+   * <U>Description</U>: The port this jmx manager will listen to for client connections.
+   * If this property is set to zero then GemFire will not allow remote client connections
+   * but you can alternatively use the standard system properties supported by the JVM
+   * for configuring access from remote JMX clients.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "1099"
+   */
+  String JMX_MANAGER_PORT = "jmx-manager-port";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl"</i> property
+   * <a name="jmx-manager-ssl"/a></p>
+   * <U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
+   * will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
+   * but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
+   * without needing to configure it for the other GemFire connections.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "false"</p>
+   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#jmx-manager-ssl-enabled"><code>jmx-manager-ssl-enabled</code></a> instead.
+   * @deprecated as of GemFire 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead.
+   */
+  String JMX_MANAGER_SSL = "jmx-manager-ssl";
+  /**
+   * The static String definition of the <i>"jmx-manager-start"</i> property
+   * <a name="jmx-manager-start"/a></p>
+   * <U>Description</U>: If true then this member will start a jmx manager when
+   * it creates a cache. Management tools like gfsh can be configured to connect
+   * to the jmx-manager. In most cases you should not set this because a jmx manager will
+   * automatically be started when needed on a member that sets "jmx-manager" to true.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "false"
+   */
+  String JMX_MANAGER_START = "jmx-manager-start";
+  /**
+   * The static String definition of the <i>"jmx-manager-update-rate"</i> property
+   * <a name="jmx-manager-update-rate"/a></p>
+   * <U>Description</U>: The rate, in milliseconds, at which this member will push updates
+   * to any jmx managers. Currently this value should be greater than or equal to the
+   * statistic-sample-rate. Setting this value too high will cause stale values to be
+   * seen by gfsh and pulse.
+   * </p>
+   * <U>Default</U>: "2000"
+   */
+  String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl-ciphers"</i> property
+   * <a name="jmx-manager-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: "any"
+   */
+  String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl-enabled"</i> property
+   * <a name="jmx-manager-ssl-enabled"/a></p>
+   * <U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
+   * will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
+   * but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
+   * without needing to configure it for the other GemFire connections.
+   * Ignored if jmx-manager is false.
+   * </p>
+   * <U>Default</U>: "false"
+   */
+  String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl-keystore"</i> property
+   * <a name="jmx-manager-ssl-keystore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing
+   * certificate and private key.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl-keystore-password"</i> property
+   * <a name="jmx-manager-ssl-keystore-password"/a></p>
+   * <U>Description</U>: Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl-keystore-type"</i> property
+   * <a name="jmx-manager-ssl-keystore-type"/a></p>
+   * <U>Description</U>: For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl-protocols"</i> property
+   * <a name="jmx-manager-ssl-protocols"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL protocols to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: "any"
+   */
+  String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl-require-authentication"</i> property
+   * <a name="jmx-manager-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the client
+   * side of the connection to be authenticated.
+   * </p>
+   * <U>Default</U>: "true"
+   */
+  String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl-truststore"</i> property
+   * <a name="jmx-manager-ssl-truststore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing the
+   * collection of CA certificates trusted by manager (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore";
+  /**
+   * The static String definition of the <i>"jmx-manager-ssl-truststore-password"</i> property
+   * <a name="jmx-manager-ssl-truststore-password"/a></p>
+   * <U>Description</U>: Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password";
+  /**
+   * The static String definition of the <i>"load-cluster-configuration-from-dir"</i> property
+   * <a name="load-cluster-configuration-from-dir"/a></p>
+   * <U>Description</U>: "true" causes loading of cluster configuration from "cluster_config" directory in the locator.
+   * This property is only applicable to dedicated locators which have "enable-cluster-configuration" set to true.
+   * </p>
+   * <U>Default</U>: "false"</p>
+   * <U>Allowed values</U>: true or false</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String LOAD_CLUSTER_CONFIGURATION_FROM_DIR = "load-cluster-configuration-from-dir";
+  /**
+   * The static String definition of the <i>"locator-wait-time"</i> property
+   * <a name="locator-wait-time"/a><p>
+   * <U>Description</U>: The number of seconds to wait for a locator to start
+   * if one is not available when attempting to join the distributed system.  This
+   * setting can be used when locators and peers are being started all at once in
+   * order to have the peers be patient and wait for the locators to finish starting
+   * up before attempting to join the distributed system..<p>
+   * <p>
+   * <U>Default</U>: "0"
+   */
+  String LOCATOR_WAIT_TIME = "locator-wait-time";
+  /**
+   * The static String definition of the <i>"locators"</i> property
+   * <a name="locators"/a><p>
+   * <U>Description</U>: A list of locators (host and port) that
+   * are used to find other member of the distributed system.  This
+   * attribute's value is a possibly empty comma separated list.  Each
+   * element must be of the form "hostName[portNum]" and may be of the
+   * form "host:bindAddress[port]" if a specific bind address is to be
+   * used on the locator machine.  The square
+   * brackets around the portNum are literal character and must be
+   * specified.<p>
+   * Since IPv6 bind addresses may contain colons, you may use an at symbol
+   * instead of a colon to separate the host name and bind address.
+   * For example, "server1@fdf0:76cf:a0ed:9449::5[12233]" specifies a locator
+   * running on "server1" and bound to fdf0:76cf:a0ed:9449::5 on port 12233.<p>
+   * If "locators" is empty
+   * then this distributed system will be isolated from all other GemFire
+   * processes.<p>
+   * <p>
+   * <U>Default</U>: ""
+   */
+  String LOCATORS = "locators";
+  /**
+   * The static String definition of the <i>"log-disk-space-limit"</i> property
+   * <a name="log-disk-space-limit"/a></p>
+   * <U>Description</U>: Limits, in megabytes, how much disk space can be
+   * consumed by old inactive log files. When the limit is
+   * exceeded the oldest inactive log file is deleted.
+   * Set to zero to disable automatic log file deletion.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..1000000
+   */
+  String LOG_DISK_SPACE_LIMIT = "log-disk-space-limit";
+  /**
+   * The static String definition of the <i>"log-file"</i> property
+   * <a name="log-file"/a></p>
+   * <U>Description</U>: Name of the file to write logging
+   * messages to.  If the file name if "" (default) then messages are
+   * written to standard out.
+   * </p>
+   * <U>Default</U>: ""
+   */
+  String LOG_FILE = "log-file";
+  /**
+   * The static String definition of the <i>"log-file-size-limit"</i> property
+   * <a name="log-file-size-limit"/a></p>
+   * <U>Description</U>: Limits, in megabytes, how large the current log
+   * file can grow before it is closed and logging rolls on to a new file.
+   * Set to zero to disable log rolling.
+   * </p>
+   * <U>Default</U>: "0"</p>
+   * <U>Allowed values</U>: 0..1000000
+   */
+  String LOG_FILE_SIZE_LIMIT = "log-file-size-limit";
+  /**
+   * The static String definition of the <i>"log-level"</i> property
+   * <a name="log-level"/a></p>
+   * <U>Description</U>:The type of log messages that will
+   * actually write to the log file.
+   * </p>
+   * <U>Default</U>: "config"</p>
+   * <U>Allowed values</U>: all|finest|finer|fine|config|info|warning|severe|none
+   */
+  String LOG_LEVEL = "log-level";
+  /**
+   * The static String definition of the <i>"max-num-reconnect-tries"</i> property
+   * <a name="max-num-reconnect-tries"/a></p>
+   * <U>Description</U>: Specifies the maximum number or times to attempt
+   * to reconnect to the distributed system when required roles are missing.
+   * This does not apply to reconnect attempts due to a forced disconnect.
+   * </p>
+   * <U>Deprecated</U>: this setting is scheduled to be removed.</p>
+   * <U>Default</U>: "3"</p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String MAX_NUM_RECONNECT_TRIES = "max-num-reconnect-tries";
+  /**
+   * The static String definition of the <i>"max-wait-time-reconnect"</i> property
+   * <a name="max-wait-time-reconnect"/a></p>
+   * <U>Description</U>: Specifies the time in milliseconds to wait before each reconnect attempt when
+   * a member of the distributed system is forced out of the system and auto-reconnect
+   * is enabled (see <a href="#disable-auto-reconnect"><code>disable-auto-reconnect</code></a>) or if the deprecated required-roles
+   * feature is being used and a role-loss has triggered a shutdown and reconnect.
+   * </p>
+   * <U>Default</U>: "60000"</p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String MAX_WAIT_TIME_RECONNECT = "max-wait-time-reconnect";
+  /**
+   * The static String definition of the <i>"mcast-address"</i> property
+   * <a name="mcast-address"/a><p>
+   * <U>Description</U>: The IP address used for multicast
+   * networking.  If mcast-port is zero, then mcast-address is
+   * ignored.
+   * <p>
+   * <U>Default</U>: "239.192.81.1"
+   */
+  String MCAST_ADDRESS = "mcast-address";
+  /**
+   * The static String definition of the <i>"mcast-flow-control"</i> property
+   * <a name="mcast-flow-control"/a><p>
+   * <U>Description</U>: Configures the flow-of-control protocol for
+   * multicast messaging.  There are three settings that are separated
+   * by commas:  byteAllowance (integer), rechargeThreshold (float) and
+   * rechargeBlockMs (integer).  The byteAllowance determines how many bytes
+   * can be sent without a recharge from other processes.  The rechargeThreshold
+   * tells receivers how low the sender's initial to remaining allowance
+   * ratio should be before sending a recharge.  The rechargeBlockMs
+   * tells the sender how long to wait for a recharge before explicitly
+   * requesting one.<p>
+   * <U>Deprecated</U>: as of 9.0 GemFire does not include a flow-of-control protocol for multicast messaging.<p>
+   * <U>Default</U>: "1048576,0.25,5000"<p>
+   * <U>Allowed values</U>: 100000-maxInt, 0.1-0.5, 500-60000<p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String MCAST_FLOW_CONTROL = "mcast-flow-control";
+  /**
+   * The static String definition of the <i>"mcast-port"</i> property
+   * <a name="mcast-port"/a><p>
+   * <U>Description</U>: The port used for multicast networking.
+   * If zero, then multicast will be disabled and unicast messaging will
+   * be used.
+   * <p>
+   * <U>Default</U>: "0"
+   */
+  String MCAST_PORT = "mcast-port";
+  /**
+   * The static String definition of the <i>"mcast-recv-buffer-size"</i> property
+   * <a name="mcast-recv-buffer-size"/a><p>
+   * <U>Description</U>: Sets the size of the socket buffer used for
+   * incoming multicast transmissions.  You should set this high if there will be
+   * high volumes of messages.
+   * <U>Default</U>: "1048576"<p>
+   * <U>Allowed values</U>: 2048..Operating System maximum<p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String MCAST_RECV_BUFFER_SIZE = "mcast-recv-buffer-size";
+  /**
+   * The static String definition of the <i>"mcast-send-buffer-size"</i> property
+   * <a name="mcast-send-buffer-size"/a><p>
+   * <U>Description</U>: Sets the size of the socket buffer used for
+   * outgoing multicast transmissions.
+   * <U>Default</U>: "65535"<p>
+   * <U>Allowed values</U>: 2048..Operating System maximum<p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String MCAST_SEND_BUFFER_SIZE = "mcast-send-buffer-size";
+  /**
+   * The static String definition of the <i>"mcast-ttl"</i> property
+   * <a name="mcast-ttl"/a><p>
+   * <U>Description</U>: Determines how far through your network
+   * the multicast packets used by GemFire will propagate.
+   * <U>Default</U>: "32"<p>
+   * <U>Allowed values</U>: 0..255<p>
+   * <U>Since</U>: GemFire 4.1
+   */
+  String MCAST_TTL = "mcast-ttl";
+  /**
+   * The static String definition of the <i>"member-timeout"</i> property
+   * <a name="member-timeout"/a><p>
+   * <U>Description</U>: Sets the timeout interval, in milliseconds, used
+   * to determine whether another process is alive or not.  When another process
+   * appears to be gone, GemFire sends it an ARE-YOU-DEAD message and waits
+   * for the member-timeout period for it to respond and declare it is not dead.
+   * <p>
+   * <U>Default</U>: "5000"<p>
+   * <U>Allowed values</U>: 1000-600000<p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String MEMBER_TIMEOUT = "member-timeout";
+  /**
+   * The static String definition of the <i>"membership-port-range"</i> property
+   * <a name="membership-port-range"/a><p>
+   * <U>Description</U>: The allowed range of ports for use in forming an
+   * unique membership identifier (UDP), for failure detection purposes (TCP) and
+   * to listen on for peer connections (TCP). This range is given as two numbers
+   * separated by a minus sign. Minimum 3 values in range are required to
+   * successfully startup.
+   * <p>
+   * <U>Default</U>: 1024-65535
+   */
+  String MEMBERSHIP_PORT_RANGE = "membership-port-range";
+  /**
+   * The static String definition of the <i>"memcached-bind-address"</i> property
+   * <a name="memcached-bind-address"/a></p>
+   * <U>Description</U>: Specifies the bind address used by {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer}</p>
+   * <U>Default</U>: ""
+   */
+  String MEMCACHED_BIND_ADDRESS = "memcached-bind-address";
+  /**
+   * The static String definition of the <i>"memcached-port"</i> property
+   * <a name="memcached-port"/a></p>
+   * <U>Description</U>: Specifies the port used by {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer}
+   * which enables memcached clients to connect and store data in GemFire distributed system.
+   * see {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer} for other configuration options.</p>
+   * <U>Default</U>: "0" disables GemFireMemcachedServer</p>
+   * <U>Allowed values</U>: 0..65535
+   */
+  String MEMCACHED_PORT = "memcached-port";
+  /**
+   * The static String definition of the <i>"memcached-protocol"</i> property
+   * <a name="memcached-protocol"/a></p>
+   * <U>Description</U>: Specifies the protocol used by {@link com.gemstone.gemfire.memcached.GemFireMemcachedServer}</p>
+   * <U>Default</U>: "ASCII"</p>
+   * <U>Allowed values</U>: "ASCII" "BINARY"
+   */
+  String MEMCACHED_PROTOCOL = "memcached-protocol";
+  /**
+   * The static string definition of the <i>"name"</i> property
+   * <a name="name"><p>
+   * <U>Description</U>: Uniquely identifies a member in its distributed system.
+   * If two members with the same name try to join the same distributed system
+   * then the second join will fail.<p>
+   * <U>Default</U>: ""
+   */
+  String NAME = "name";
+  /**
+   * The static String definition of the <i>"redundancy-zone"</i> property
+   * <a name="redundancy-zone"/a></p>
+   * <u>Description</u>: Defines the redundancy zone from this member. If this property is set, partitioned
+   * regions will not put two redundant copies of data in two members with the same redundancy zone setting.
+   * </p>
+   * <u>Default</u>: ""
+   */
+  String REDUNDANCY_ZONE = "redundancy-zone";
+  /**
+   * The static String definition of the <i>"remote-locators"</i> property
+   * <a name="remote-locators"/a><p>
+   * <U>Description</U>: A list of locators (host and port) that a cluster
+   * will use in order to connect to a remote site in a multi-site (WAN)
+   * configuration. This attribute's value is a possibly comma separated list.
+   * <p>For each remote locator, provide a hostname and/or address
+   * (separated by '@', if you use both), followed by a port number in brackets.
+   * <p>Examples:
+   * remote-locators=address1[port1],address2[port2]
+   * <p>
+   * remote-locators=hostName1@address1[port1],hostName2@address2[port2]
+   * <p>
+   * remote-locators=hostName1[port1],hostName2[port2]<p>
+   * <p>
+   * <U>Default</U>: ""
+   */
+  String REMOTE_LOCATORS = "remote-locators";
+  /**
+   * The static String definition of the <i>"remove-unresponsive-client"</i>
+   * property
+   */
+  String REMOVE_UNRESPONSIVE_CLIENT = "remove-unresponsive-client";
+  /**
+   * The static String definition of the <i>"roles"</i> property
+   * <a name="roles"/a></p>
+   * <U>Description</U>: Specifies the application roles that this member
+   * performs in the distributed system. This is a comma delimited list of
+   * user-defined strings. Any number of members can be configured to perform
+   * the same role, and a member can be configured to perform any number of
+   * roles.
+   * Note that anything defined by the groups gemfire property will also be considered a role.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 5.0</p>
+   * <U>Deprecated</U>: This feature is scheduled to be removed.
+   * @deprecated : This feature is scheduled to be removed.
+   */
+  String ROLES = "roles";
+  /**
+   * The static String definition of the security prefix "security-" used in conjunction with other security-* properties</i> property
+   * <a name="security-"/a></p>
+   * <U>Description</U>: Mechanism to define client credentials.
+   * All tags with "security-" prefix is packaged together as security properties
+   * and passed as an argument to getCredentials of Authentication module.
+   * These tags cannot have null values.
+   * </p>
+   * <U>Default</U>: Optional</p>
+   * <U>Allowed values</U>: any string
+   */
+  String SECURITY_PREFIX = "security-";
+  /**
+   * The static String definition of the <i>"security-client-accessor"</i>
+   * property
+   */
+  String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor";
+  /**
+   * The static String definition of the <i>"security-client-accessor-pp"</i>
+   * property
+   */
+  String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp";
+  /**
+   * The static String definition of the <i>"security-client-auth-init"</i> property
+   * <a name="security-client-auth-init"/a></p>
+   * <U>Description</U>: Authentication module name for Clients that requires to act
+   * upon credentials read from the gemfire.properties file.
+   * Module must implement AuthInitialize interface.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Allowed values</U>: jar file:class name
+   */
+  String SECURITY_CLIENT_AUTH_INIT = SECURITY_PREFIX + "client-auth-init";
+  /**
+   * The static String definition of the <i>"security-client-authenticator"</i>
+   * property
+   */
+  String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + "client-authenticator";
+  /**
+   * The static String definition of the <i>"security-client-dhalgo"</i>
+   * property
+   */
+  String SECURITY_CLIENT_DHALGO = SECURITY_PREFIX + "client-dhalgo";
+  /**
+   * The static String definition of the <i>"security-log-file"</i>
+   * property
+   */
+  String SECURITY_LOG_FILE = SECURITY_PREFIX + "log-file";
+  /**
+   * The static String definition of the <i>"security-log-level"</i>
+   * property
+   */
+  String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level";
+  /**
+   * The static String definition of the <i>"security-peer-auth-init"</i>
+   * property
+   */
+  String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init";
+  /**
+   * The static String definition of the <i>"security-peer-authenticator"</i>
+   * property
+   */
+  String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator";
+  /**
+   * The static String definition of the <i>"security-peer-verifymember-timeout"</i>
+   * property
+   */
+  String SECURITY_PEER_VERIFY_MEMBER_TIMEOUT = SECURITY_PREFIX + "peer-verifymember-timeout";
+  /**
+   * The static String definition of the <i>"server-bind-address"</i> property
+   * <a name="server-bind-address"/a><p>
+   * <U>Description</U>: The IP address that this distributed system's
+   * server sockets in a client-server topology will listen on.
+   * If set to an empty string then all of the local machine's
+   * addresses will be listened on.
+   * <p>
+   * <U>Default</U>: ""
+   */
+  String SERVER_BIND_ADDRESS = "server-bind-address";
+  /**
+   * The static String definition of the <i>"server-ssl-ciphers"</i> property
+   * <a name="server-ssl-ciphers"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String SERVER_SSL_CIPHERS = "server-ssl-ciphers";
+  /**
+   * The static String definition of the <i>"server-ssl-enabled"</i> property
+   * <a name="server-ssl-enabled"/a></p>
+   * <U>Description</U>: Specifies if server is started with separate ssl configuration.
+   * If not specified global property ssl-enabled (and its other related properties) are used
+   * to create server socket
+   * </p>
+   * <U>Default</U>: <code>false</code></p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String SERVER_SSL_ENABLED = "server-ssl-enabled";
+  /**
+   * The static String definition of the <i>"server-ssl-keystore"</i> property
+   * <a name="server-ssl-keystore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing
+   * certificate and private key.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String SERVER_SSL_KEYSTORE = "server-ssl-keystore";
+  /**
+   * The static String definition of the <i>"server-ssl-keystore-password"</i> property
+   * <a name="server-ssl-keystore-password"/a></p>
+   * <U>Description</U>: Password to access the private key from the keystore
+   * file specified by javax.net.ssl.keyStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password";
+  /**
+   * The static String definition of the <i>"server-ssl-keystore-type"</i> property
+   * <a name="server-ssl-keystore-type"/a></p>
+   * <U>Description</U>: For Java keystore file format, this property has the
+   * value jks (or JKS).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type";
+  /**
+   * The static String definition of the <i>"server-ssl-protocols"</i> property
+   * <a name="server-ssl-protocols"/a></p>
+   * <U>Description</U>: A space seperated list of the SSL protocols to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String SERVER_SSL_PROTOCOLS = "server-ssl-protocols";
+  /**
+   * The static String definition of the <i>"server-ssl-require-authentication"</i> property
+   * <a name="server-ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the client
+   * side of the connection to be authenticated.
+   * </p>
+   * <U>Default</U>: <code>any</code></p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication";
+  /**
+   * The static String definition of the <i>"server-ssl-truststore"</i> property
+   * <a name="server-ssl-truststore"/a></p>
+   * <U>Description</U>: Location of the Java keystore file containing the
+   * collection of CA certificates trusted by server (trust store).
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore";
+  /**
+   * The static String definition of the <i>"server-ssl-truststore-password"</i> property
+   * <a name="server-ssl-truststore-password"/a></p>
+   * <U>Description</U>: Password to unlock the keystore file (store password)
+   * specified by javax.net.ssl.trustStore.
+   * </p>
+   * <U>Default</U>: ""</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password";
+  /**
+   * The static String definition of the <i>"socket-buffer-size"</i> property
+   * <a name="socket-buffer-size"/a></p>
+   * <U>Description</U>: The size of each socket buffer, in bytes.
+   * Smaller buffers conserve memory. Larger buffers can improve performance;
+   * in particular if large messages are being sent.
+   * <U>Default</U>: "32768"</p>
+   * <U>Allowed values</U>: 128..16777215</p>
+   * <U>Since</U>: GemFire 4.1
+   */
+  String SOCKET_BUFFER_SIZE = "socket-buffer-size";
+  /**
+   * The static String definition of the <i>"socket-lease-time"</i> property
+   * <a name="socket-lease-time"/a></p>
+   * <U>Description</U>: The number of milliseconds a thread
+   * can keep exclusive access to a socket that it is not actively using.
+   * Once a thread loses its lease to a socket it will need to re-acquire
+   * a socket the next time it sends a message.
+   * A value of zero causes socket leases to never expire.
+   * This property is ignored if "conserve-sockets" is true.
+   * <U>Default</U>: "15000"</p>
+   * <U>Allowed values</U>: 0..600000</p>
+   * <U>Since</U>: GemFire 4.1
+   */
+  String SOCKET_LEASE_TIME = "socket-lease-time";
+  /**
+   * The static String definition of the <i>"start-dev-rest-api"</i> property
+   * <a name="start-dev-rest-api"/a></p>
+   * <U>Description</U>: If true then developer(API) REST service will be
+   * started when cache is created. REST service can be configured using
+   * <code>http-service-port</code> and <code>http-service-bind-address</code>
+   * properties.</p>
+   * <U>Default</U>: "false"</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String START_DEV_REST_API = "start-dev-rest-api";
+  /**
+   * The static String definition of the <i>"start-locator"</i> property
+   * <a name="start-locator"/a></p>
+   * <U>Description</U>: A host name or bind-address and port
+   * ("host[port],peer=<true|false>,server=<true|false>")
+   * that are used to start a locator in the same process as the DistributedSystem.
+   * The locator is started when the DistributedSystem connects,
+   * and is stopped when the DistributedSystem disconnects.  To start a
+   * locator that is not tied to the DistributedSystem's lifecycle, see
+   * the {@link Locator} class in this same package.<p>
+   * <p>
+   * The peer and server parameters are optional. They specify whether
+   * the locator can be used for peers to discover each other, or for clients
+   * to discover peers. By default both are true.
+   * </p>
+   * <U>Default</U>: "" (doesn't start a locator)
+   */
+  String START_LOCATOR = "start-locator";
+  /**
+   * The static String definition of the <i>"statistic-archive-file"</i> property
+   * <a name="statistic-archive-file"/a></p>
+   * <U>Description</U>: The file that statistic samples are
+   * written to.  An empty string (default) disables statistic
+   * archival.
+   * </p>
+   * <U>Default</U>: ""
+   */
+  String STATISTIC_ARCHIVE_FILE = "statistic-archive-file";
+  /**
+   * The static String definition of the <i>"statistic-sample-rate"</i> property
+   * <a name="statistic-sample-rate"/a></p>
+   * <U>Description</U>: The rate, in milliseconds, at which samples
+   * of the statistics will be taken.
+   * If set to a value less than 1000 the rate will be set to 1000 because
+   * the VSD tool does not support sub-second sampling.
+   * </p>
+   * <U>Default</U>: "1000"</p>
+   * <U>Allowed values</U>: 100..60000
+   */
+  String STATISTIC_SAMPLE_RATE = "statistic-sample-rate";
+  /**
+   * The static String definition of the <i>"statistic-sampling-enabled"</i> property
+   * <a name="statistic-sampling-enabled"/a></p>
+   * <U>Description</U>: "true" causes the statistics to be
+   * sampled periodically and operating system statistics to be
+   * fetched each time a sample is taken.  "false" disables sampling
+   * which also disables operating system statistic collection.  Non
+   * OS statistics will still be recorded in memory and can be viewed
+   * by administration tools.  However, charts will show no activity
+   * and no statistics will be archived while sampling is
+   * disabled.
+   * Starting in 7.0 the default value has been changed to true.
+   * If statistic sampling is disabled it will also cause various
+   * metrics seen in gfsh and pulse to always be zero.
+   * </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true|false
+   */
+  String STATISTIC_SAMPLING_ENABLED = "statistic-sampling-enabled";
+  /**
+   * The static String definition of the <i>"tcp-port"</i> property
+   * <a name="tcp-port"/a><p>
+   * <U>Description</U>: A 16-bit integer that determines the tcp/ip port number to listen on
+   * for cache communications.  If zero, the operating system will select
+   * an available port to listen on.  Each process on a machine must have
+   * its own tcp-port.  Note that some operating systems restrict the range
+   * of ports usable by non-privileged users, and using restricted port
+   * numbers can cause runtime errors in GemFire startup.
+   * <p>
+   * <U>Default</U>: "0"<p>
+   * <U>Allowed values</U>: 0..65535<p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String TCP_PORT = "tcp-port";
+  /**
+   * The static String definition of the <i>"udp-fragment-size"</i> property
+   * <a name="udp-fragment-size"/a><p>
+   * <U>Description</U>: When messages are sent over datagram sockets,
+   * GemFire breaks large messages down into fragments for transmission.
+   * This property sets the maximum fragment size for transmission.
+   * <U>Default</U>: "60000"<p>
+   * <U>Allowed values</U>: 1000..60000<p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String UDP_FRAGMENT_SIZE = "udp-fragment-size";
+  /**
+   * The static String definition of the <i>"udp-recv-buffer-size"</i> property
+   * <a name="udp-recv-buffer-size"/a><p>
+   * <U>Description</U>: Sets the size of the socket buffer used for
+   * incoming udp point-to-point transmissions.  Note: if multicast is not
+   * enabled and disable-tcp is not enabled, a reduced default size of
+   * 65535 is used.
+   * <U>Default</U>: "1048576 if multicast is enabled or disable-tcp is true, 131071 if not"<p>
+   * <U>Allowed values</U>: 2048..Operating System maximum<p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String UDP_RECV_BUFFER_SIZE = "udp-recv-buffer-size";
+  /**
+   * The static String definition of the <i>"udp-send-buffer-size"</i> property
+   * <a name="udp-send-buffer-size"/a><p>
+   * <U>Description</U>: Sets the size of the socket buffer used for
+   * outgoing udp point-to-point transmissions.
+   * <U>Default</U>: "65535"<p>
+   * <U>Allowed values</U>: 2048..Operating System maximum<p>
+   * <U>Since</U>: GemFire 5.0
+   */
+  String UDP_SEND_BUFFER_SIZE = "udp-send-buffer-size";
+  /**
+   * The static String definition of the <i>"use-cluster-configuration"</i> property
+   * <a name="use-cluster-configuration"/a></p>
+   * <U>Description</U>: This property is only applicable for data members (non client and non locator)
+   * "true" causes a member to request and uses the configuration from cluster configuration services running on dedicated locators.
+   * "false" causes a member to not request the configuration from the configuration services running on the locator(s).
+   * </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Allowed values</U>: true or false</p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String USE_CLUSTER_CONFIGURATION = "use-cluster-configuration";
+  /**
+   * The static String definition of the <i>"user-command-packages"</i> property
+   * <a name="user-command-packages"/a></p>
+   * <U>Description</U>: A comma separated list of Java packages that
+   * contain classes implementing the <code>CommandMarker</code> interface.
+   * Matching classes will be loaded when the VM starts and will be available
+   * in the GFSH command-line utility.
+   * </p>
+   * <U>Default</U>: <code>""</code></p>
+   * <U>Since</U>: GemFire 8.0
+   */
+  String USER_COMMAND_PACKAGES = "user-command-packages";
+  /**
+   * The static String definition of the <i>"off-heap-memory-size"</i> property
+   * <a name="off-heap-memory-size"/a></p>
+   * <U>Description</U>: The total size of off-heap memory specified as
+   * off-heap-memory-size=<n>[g|m]. <n> is the size. [g|m] indicates
+   * whether the size should be interpreted as gigabytes or megabytes.
+   * By default no off-heap memory is allocated.
+   * A non-zero value will cause that much memory to be allocated from the operating
+   * system and reserved for off-heap use.
+   * </p>
+   * <U>Default</U>: <code>""</code></p>
+   * <U>Since</U>: Geode 1.0
+   */
+  String OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size";
+  /**
+   * The static String definition of the <i>"redis-port"</i> property
+   * <a name="redis-port"/a></p>
+   * <U>Description</U>: Specifies the port used by {@link com.gemstone.gemfire.redis.GemFireRedisServer}
+   * which enables redis clients to connect and store data in GemFire distributed system.
+   * see {@link com.gemstone.gemfire.redis.GemFireRedisServer} for other configuration options.</p>
+   * <U>Default</U>: "0" disables GemFireMemcachedServer</p>
+   * <U>Allowed values</U>: 0..65535
+   */
+  String REDIS_PORT = "redis-port";
+  /**
+   * The static String definition of the <i>"redis-bind-address"</i> property
+   * <a name="redis-bind-address"/a></p>
+   * <U>Description</U>: Specifies the bind address used by {@link com.gemstone.gemfire.redis.GemFireRedisServer}</p>
+   * <U>Default</U>: ""
+   */
+  String REDIS_BIND_ADDRESS = "redis-bind-address";
+  /**
+   * The static String definition of the <i>"redis-password"</i> property
+   * <a name="redis-password"/a></p>
+   * <U>Description</U>: Specifies the password to authenticate a client of {@link com.gemstone.gemfire.redis.GemFireRedisServer}</p>
+   * <U>Default</U>: ""
+   */
+  String REDIS_PASSWORD = "redis-password";
+  /**
+   * The static String definition of the <i>"lock-memory"</i> property
+   * <a name="lock-memory"/a></p>
+   * <U>Description</U>: Include this option to lock GemFire heap and off-heap memory pages into RAM.
+   * This prevents the operating system from swapping the pages out to disk, which can cause sever
+   * performance degradation. When you use this command, also configure the operating system limits for
+   * locked memory.
+   * </p>
+   * <U>Default</U>: <code>"false"</code></p>
+   * <U>Since</U>: Geode 1.0
+   */
+  String LOCK_MEMORY = "lock-memory";
+  /**
+   * The static String definition of the <i>"shiro-init"</i> property
+   */
+  String SECURITY_SHIRO_INIT = SECURITY_PREFIX + "shiro-init";
+  /**
+   * The static String definition of the <i>"distributed-transactions"</i> property
+   */
+  String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
+  /**
+   * The static String definition of the <i>"ssl-enabled"</i> property
+   * <a name="ssl-enabled"/a></p>
+   * <U>Description</U>: If true, all gemfire socket communication is
+   * configured to use SSL through JSSE.
+   * </p>
+   * <U>Default</U>: "false"</p>
+   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-enabled"><code>cluster-ssl-enabled</code></a> instead.
+   * @deprecated as of Gemfire 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
+   */
+  String SSL_ENABLED = "ssl-enabled";
+  /**
+   * The static String definition of the <i>"ssl-protocols"</i> property
+   * <a name="ssl-protocols"/a></p>
+   * <U>Description</U>: A space separated list of the SSL protocols to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: "any"</p>
+   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-protocols"><code>cluster-ssl-protocols</code></a> instead.
+   * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
+   */
+  String SSL_PROTOCOLS = "ssl-protocols";
+  /**
+   * The static String definition of the <i>"ssl-ciphers"</i> property
+   * <a name="ssl-ciphers"/a></p>
+   * <U>Description</U>: A space separated list of the SSL cipher suites to enable.
+   * Those listed must be supported by the available providers.
+   * </p>
+   * <U>Default</U>: "any"</p>
+   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-ciphers"><code>cluster-ssl-ciphers</code></a> instead.
+   * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
+   */
+  String SSL_CIPHERS = "ssl-ciphers";
+  /**
+   * The static String definition of the <i>"ssl-require-authentication"</i> property
+   * <a name="ssl-require-authentication"/a></p>
+   * <U>Description</U>: If false, allow ciphers that do not require the client
+   * side of the connection to be authenticated.
+   * </p>
+   * <U>Default</U>: "true"</p>
+   * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-require-authentication"><code>cluster-ssl-require-authentication</code></a> instead.
+   * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
+   */
+  String SSL_REQUIRE_AUTHENTICATION = "ssl-require-authentication";
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
index 12e1837..d14d5a9 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
@@ -32,8 +32,6 @@ import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.tcp.ConnectionTable;
 import com.gemstone.gemfire.internal.util.IOUtils;
-import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
-import com.gemstone.gemfire.redis.GemFireRedisServer;
 import com.gemstone.gemfire.security.GemFireSecurityException;
 
 import java.io.File;
@@ -43,7 +41,7 @@ import java.net.URL;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * A "connection" to a GemFire distributed system.  A


[14/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 9c5213f..a26de3f 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
@@ -17,6 +17,7 @@
 
 package com.gemstone.gemfire.distributed.internal;
 
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.internal.Config;
 import com.gemstone.gemfire.internal.ConfigSource;
@@ -31,7 +32,7 @@ import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Provides accessor (and in some cases mutator) methods for the
@@ -41,7 +42,7 @@ import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties
  * <p>
  * <p>
  * <p>
- * Descriptions of these properties can be found {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties}.
+ * Descriptions of these properties can be found {@link ConfigurationProperties}.
  *
  * @see com.gemstone.gemfire.internal.Config
  * @since GemFire 2.1
@@ -51,7 +52,7 @@ public interface DistributionConfig extends Config, LogConfig {
   ////////////////////  Instance Methods  ////////////////////
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#NAME} property
+   * Returns the value of the {@link ConfigurationProperties#NAME} property
    * Gets the member's name.
    * A name is optional and by default empty.
    * If set it must be unique in the ds.
@@ -88,196 +89,196 @@ public interface DistributionConfig extends Config, LogConfig {
   String DEFAULT_NAME = "";
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT}</a>
+   * Returns the value of the {@link ConfigurationProperties#MCAST_PORT}</a>
    * property
    */
   @ConfigAttributeGetter(name = MCAST_PORT_NAME)
   int getMcastPort();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT}
+   * Sets the value of the {@link ConfigurationProperties#MCAST_PORT}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_PORT_NAME)
   void setMcastPort(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT} property
+   * The default value of the {@link ConfigurationProperties#MCAST_PORT} property
    */
   int DEFAULT_MCAST_PORT = 0;
 
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT}.
+   * The minimum {@link ConfigurationProperties#MCAST_PORT}.
    * <p> Actual value of this constant is <code>0</code>.
    */
   int MIN_MCAST_PORT = 0;
 
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT}.
+   * The maximum {@link ConfigurationProperties#MCAST_PORT}.
    * <p> Actual value of this constant is <code>65535</code>.
    */
   int MAX_MCAST_PORT = 65535;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_PORT} property
+   * The name of the {@link ConfigurationProperties#MCAST_PORT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MCAST_PORT, max = MAX_MCAST_PORT)
   String MCAST_PORT_NAME = MCAST_PORT;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT}
+   * Returns the value of the {@link ConfigurationProperties#TCP_PORT}
    * property
    */
   @ConfigAttributeGetter(name = TCP_PORT)
   int getTcpPort();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT}
+   * Sets the value of the {@link ConfigurationProperties#TCP_PORT}
    * property
    */
   @ConfigAttributeSetter(name = TCP_PORT)
   void setTcpPort(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT} property
+   * The default value of the {@link ConfigurationProperties#TCP_PORT} property
    */
   int DEFAULT_TCP_PORT = 0;
 
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT}.
+   * The minimum {@link ConfigurationProperties#TCP_PORT}.
    * <p> Actual value of this constant is <code>0</code>.
    */
   int MIN_TCP_PORT = 0;
 
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT}.
+   * The maximum {@link ConfigurationProperties#TCP_PORT}.
    * <p> Actual value of this constant is <code>65535</code>.
    */
   int MAX_TCP_PORT = 65535;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#TCP_PORT} property
+   * The name of the {@link ConfigurationProperties#TCP_PORT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_TCP_PORT, max = MAX_TCP_PORT)
   String TCP_PORT_NAME = TCP_PORT;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_ADDRESS}
+   * Returns the value of the {@link ConfigurationProperties#MCAST_ADDRESS}
    * property
    */
   @ConfigAttributeGetter(name = MCAST_ADDRESS)
   InetAddress getMcastAddress();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_ADDRESS}
+   * Sets the value of the {@link ConfigurationProperties#MCAST_ADDRESS}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_ADDRESS)
   void setMcastAddress(InetAddress value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_ADDRESS} property
+   * The name of the {@link ConfigurationProperties#MCAST_ADDRESS} property
    */
   @ConfigAttribute(type = InetAddress.class)
   String MCAST_ADDRESS_NAME = MCAST_ADDRESS;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_ADDRESS} property.
+   * The default value of the {@link ConfigurationProperties#MCAST_ADDRESS} property.
    * Current value is <code>239.192.81.1</code>
    */
   InetAddress DEFAULT_MCAST_ADDRESS = AbstractDistributionConfig._getDefaultMcastAddress();
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL}
+   * Returns the value of the {@link ConfigurationProperties#MCAST_TTL}
    * property
    */
   @ConfigAttributeGetter(name = MCAST_TTL)
   int getMcastTtl();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL}
+   * Sets the value of the {@link ConfigurationProperties#MCAST_TTL}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_TTL)
   void setMcastTtl(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL} property
+   * The default value of the {@link ConfigurationProperties#MCAST_TTL} property
    */
   int DEFAULT_MCAST_TTL = 32;
 
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL}.
+   * The minimum {@link ConfigurationProperties#MCAST_TTL}.
    * <p> Actual value of this constant is <code>0</code>.
    */
   int MIN_MCAST_TTL = 0;
 
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL}.
+   * The maximum {@link ConfigurationProperties#MCAST_TTL}.
    * <p> Actual value of this constant is <code>255</code>.
    */
   int MAX_MCAST_TTL = 255;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_TTL} property
+   * The name of the {@link ConfigurationProperties#MCAST_TTL} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MCAST_TTL, max = MAX_MCAST_TTL)
   String MCAST_TTL_NAME = MCAST_TTL;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#BIND_ADDRESS}
+   * Returns the value of the {@link ConfigurationProperties#BIND_ADDRESS}
    * property
    */
   @ConfigAttributeGetter(name = BIND_ADDRESS)
   String getBindAddress();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#BIND_ADDRESS}
+   * Sets the value of the {@link ConfigurationProperties#BIND_ADDRESS}
    * property
    */
   @ConfigAttributeSetter(name = BIND_ADDRESS)
   void setBindAddress(String value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#BIND_ADDRESS} property
+   * The name of the {@link ConfigurationProperties#BIND_ADDRESS} property
    */
   @ConfigAttribute(type = String.class)
   String BIND_ADDRESS_NAME = BIND_ADDRESS;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#BIND_ADDRESS} property.
+   * The default value of the {@link ConfigurationProperties#BIND_ADDRESS} property.
    * Current value is an empty string <code>""</code>
    */
   String DEFAULT_BIND_ADDRESS = "";
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SERVER_BIND_ADDRESS}
+   * Returns the value of the {@link ConfigurationProperties#SERVER_BIND_ADDRESS}
    * property
    */
   @ConfigAttributeGetter(name = SERVER_BIND_ADDRESS)
   String getServerBindAddress();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SERVER_BIND_ADDRESS}
+   * Sets the value of the {@link ConfigurationProperties#SERVER_BIND_ADDRESS}
    * property
    */
   @ConfigAttributeSetter(name = SERVER_BIND_ADDRESS)
   void setServerBindAddress(String value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SERVER_BIND_ADDRESS} property
+   * The name of the {@link ConfigurationProperties#SERVER_BIND_ADDRESS} property
    */
   @ConfigAttribute(type = String.class)
   String SERVER_BIND_ADDRESS_NAME = SERVER_BIND_ADDRESS;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SERVER_BIND_ADDRESS} property.
+   * The default value of the {@link ConfigurationProperties#SERVER_BIND_ADDRESS} property.
    * Current value is an empty string <code>""</code>
    */
   String DEFAULT_SERVER_BIND_ADDRESS = "";
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOCATORS} property
+   * Returns the value of the {@link ConfigurationProperties#LOCATORS} property
    */
   @ConfigAttributeGetter(name = LOCATORS)
   String getLocators();
@@ -299,13 +300,13 @@ public interface DistributionConfig extends Config, LogConfig {
   void setLocators(String value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOCATORS} property
+   * The name of the {@link ConfigurationProperties#LOCATORS} property
    */
   @ConfigAttribute(type = String.class)
   String LOCATORS_NAME = LOCATORS;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOCATORS} property
+   * The default value of the {@link ConfigurationProperties#LOCATORS} property
    */
   String DEFAULT_LOCATORS = "";
 
@@ -325,13 +326,13 @@ public interface DistributionConfig extends Config, LogConfig {
   void setLocatorWaitTime(int seconds);
 
   /**
-   * returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#START_LOCATOR} property
+   * returns the value of the {@link ConfigurationProperties#START_LOCATOR} property
    */
   @ConfigAttributeGetter(name = START_LOCATOR)
   String getStartLocator();
 
   /**
-   * Sets the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#START_LOCATOR} property.
+   * Sets the {@link ConfigurationProperties#START_LOCATOR} property.
    * This is a string in the form
    * bindAddress[port] and, if set, tells the distributed system to start
    * a locator prior to connecting
@@ -342,17 +343,17 @@ public interface DistributionConfig extends Config, LogConfig {
   void setStartLocator(String value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#START_LOCATOR} property
+   * The name of the {@link ConfigurationProperties#START_LOCATOR} property
    */
   @ConfigAttribute(type = String.class)
   String START_LOCATOR_NAME = START_LOCATOR;
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#START_LOCATOR} property
+   * The default value of the {@link ConfigurationProperties#START_LOCATOR} property
    */
   String DEFAULT_START_LOCATOR = "";
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DEPLOY_WORKING_DIR} property
+   * Returns the value of the {@link ConfigurationProperties#DEPLOY_WORKING_DIR} property
    */
   @ConfigAttributeGetter(name = DEPLOY_WORKING_DIR)
   File getDeployWorkingDir();
@@ -369,7 +370,7 @@ public interface DistributionConfig extends Config, LogConfig {
   void setDeployWorkingDir(File value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DEPLOY_WORKING_DIR} property.
+   * The name of the {@link ConfigurationProperties#DEPLOY_WORKING_DIR} property.
    */
   @ConfigAttribute(type = File.class)
   String DEPLOY_WORKING_DIR_NAME = DEPLOY_WORKING_DIR;
@@ -381,7 +382,7 @@ public interface DistributionConfig extends Config, LogConfig {
   File DEFAULT_DEPLOY_WORKING_DIR = new File(".");
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USER_COMMAND_PACKAGES} property
+   * Returns the value of the {@link ConfigurationProperties#USER_COMMAND_PACKAGES} property
    */
   @ConfigAttributeGetter(name = USER_COMMAND_PACKAGES)
   String getUserCommandPackages();
@@ -398,18 +399,18 @@ public interface DistributionConfig extends Config, LogConfig {
   void setUserCommandPackages(String value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USER_COMMAND_PACKAGES} property.
+   * The name of the {@link ConfigurationProperties#USER_COMMAND_PACKAGES} property.
    */
   @ConfigAttribute(type = String.class)
   String USER_COMMAND_PACKAGES_NAME = USER_COMMAND_PACKAGES;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USER_COMMAND_PACKAGES} property
+   * The default value of the {@link ConfigurationProperties#USER_COMMAND_PACKAGES} property
    */
   String DEFAULT_USER_COMMAND_PACKAGES = "";
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE} property
+   * Returns the value of the {@link ConfigurationProperties#LOG_FILE} property
    *
    * @return <code>null</code> if logging information goes to standard
    * out
@@ -432,20 +433,20 @@ public interface DistributionConfig extends Config, LogConfig {
   void setLogFile(File value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE} property
+   * The name of the {@link ConfigurationProperties#LOG_FILE} property
    */
   @ConfigAttribute(type = File.class)
   String LOG_FILE_NAME = LOG_FILE;
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE}.
+   * The default {@link ConfigurationProperties#LOG_FILE}.
    * <p> Actual value of this constant is <code>""</code> which directs
    * log message to standard output.
    */
   File DEFAULT_LOG_FILE = new File("");
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL} property
+   * Returns the value of the {@link ConfigurationProperties#LOG_LEVEL} property
    *
    * @see com.gemstone.gemfire.internal.logging.LogWriterImpl
    */
@@ -453,7 +454,7 @@ public interface DistributionConfig extends Config, LogConfig {
   int getLogLevel();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL} property
+   * Sets the value of the {@link ConfigurationProperties#LOG_LEVEL} property
    *
    * @see com.gemstone.gemfire.internal.logging.LogWriterImpl
    */
@@ -461,90 +462,90 @@ public interface DistributionConfig extends Config, LogConfig {
   void setLogLevel(int value);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL}.
+   * The default {@link ConfigurationProperties#LOG_LEVEL}.
    * <p> Actual value of this constant is {@link InternalLogWriter#CONFIG_LEVEL}.
    */
   int DEFAULT_LOG_LEVEL = InternalLogWriter.CONFIG_LEVEL;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL}.
+   * The minimum {@link ConfigurationProperties#LOG_LEVEL}.
    * <p> Actual value of this constant is {@link InternalLogWriter#ALL_LEVEL}.
    */
   int MIN_LOG_LEVEL = InternalLogWriter.ALL_LEVEL;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL}.
+   * The maximum {@link ConfigurationProperties#LOG_LEVEL}.
    * <p> Actual value of this constant is {@link InternalLogWriter#NONE_LEVEL}.
    */
   int MAX_LOG_LEVEL = InternalLogWriter.NONE_LEVEL;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_LEVEL} property
+   * The name of the {@link ConfigurationProperties#LOG_LEVEL} property
    */
   // type is String because the config file contains "config", "debug", "fine" etc, not a code, but the setter/getter accepts int
   @ConfigAttribute(type = String.class)
   String LOG_LEVEL_NAME = LOG_LEVEL;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLING_ENABLED}
+   * Returns the value of the {@link ConfigurationProperties#STATISTIC_SAMPLING_ENABLED}
    * property
    */
   @ConfigAttributeGetter(name = STATISTIC_SAMPLING_ENABLED)
   boolean getStatisticSamplingEnabled();
 
   /**
-   * Sets {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLING_ENABLED}
+   * Sets {@link ConfigurationProperties#STATISTIC_SAMPLING_ENABLED}
    */
   @ConfigAttributeSetter(name = STATISTIC_SAMPLING_ENABLED)
   void setStatisticSamplingEnabled(boolean newValue);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLING_ENABLED} property
+   * The name of the {@link ConfigurationProperties#STATISTIC_SAMPLING_ENABLED} property
    */
   @ConfigAttribute(type = Boolean.class)
   String STATISTIC_SAMPLING_ENABLED_NAME = STATISTIC_SAMPLING_ENABLED;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLING_ENABLED} property
+   * The default value of the {@link ConfigurationProperties#STATISTIC_SAMPLING_ENABLED} property
    */
   boolean DEFAULT_STATISTIC_SAMPLING_ENABLED = true;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}
+   * Returns the value of the {@link ConfigurationProperties#STATISTIC_SAMPLE_RATE}
    * property
    */
   @ConfigAttributeGetter(name = STATISTIC_SAMPLE_RATE)
   int getStatisticSampleRate();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}
+   * Sets the value of the {@link ConfigurationProperties#STATISTIC_SAMPLE_RATE}
    * property
    */
   @ConfigAttributeSetter(name = STATISTIC_SAMPLE_RATE)
   void setStatisticSampleRate(int value);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}.
+   * The default {@link ConfigurationProperties#STATISTIC_SAMPLE_RATE}.
    * <p> Actual value of this constant is <code>1000</code> milliseconds.
    */
   int DEFAULT_STATISTIC_SAMPLE_RATE = 1000;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}.
+   * The minimum {@link ConfigurationProperties#STATISTIC_SAMPLE_RATE}.
    * <p> Actual value of this constant is <code>100</code> milliseconds.
    */
   int MIN_STATISTIC_SAMPLE_RATE = 100;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE}.
+   * The maximum {@link ConfigurationProperties#STATISTIC_SAMPLE_RATE}.
    * <p> Actual value of this constant is <code>60000</code> milliseconds.
    */
   int MAX_STATISTIC_SAMPLE_RATE = 60000;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_SAMPLE_RATE} property
+   * The name of the {@link ConfigurationProperties#STATISTIC_SAMPLE_RATE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_STATISTIC_SAMPLE_RATE, max = MAX_STATISTIC_SAMPLE_RATE)
   String STATISTIC_SAMPLE_RATE_NAME = STATISTIC_SAMPLE_RATE;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_ARCHIVE_FILE} property.
+   * Returns the value of the {@link ConfigurationProperties#STATISTIC_ARCHIVE_FILE} property.
    *
    * @return <code>null</code> if no file was specified
    */
@@ -552,58 +553,58 @@ public interface DistributionConfig extends Config, LogConfig {
   File getStatisticArchiveFile();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_ARCHIVE_FILE} property.
+   * Sets the value of the {@link ConfigurationProperties#STATISTIC_ARCHIVE_FILE} property.
    */
   @ConfigAttributeSetter(name = STATISTIC_ARCHIVE_FILE)
   void setStatisticArchiveFile(File value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_ARCHIVE_FILE} property
+   * The name of the {@link ConfigurationProperties#STATISTIC_ARCHIVE_FILE} property
    */
   @ConfigAttribute(type = File.class)
   String STATISTIC_ARCHIVE_FILE_NAME = STATISTIC_ARCHIVE_FILE;
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#STATISTIC_ARCHIVE_FILE}.
+   * The default {@link ConfigurationProperties#STATISTIC_ARCHIVE_FILE}.
    * <p> Actual value of this constant is <code>""</code> which
    * causes no archive file to be created.
    */
   File DEFAULT_STATISTIC_ARCHIVE_FILE = new File(""); // fix for bug 29786
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CACHE_XML_FILE}
+   * Returns the value of the {@link ConfigurationProperties#CACHE_XML_FILE}
    * property
    */
   @ConfigAttributeGetter(name = CACHE_XML_FILE)
   File getCacheXmlFile();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CACHE_XML_FILE}
+   * Sets the value of the {@link ConfigurationProperties#CACHE_XML_FILE}
    * property
    */
   @ConfigAttributeSetter(name = CACHE_XML_FILE)
   void setCacheXmlFile(File value);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CACHE_XML_FILE} property
+   * The name of the {@link ConfigurationProperties#CACHE_XML_FILE} property
    */
   @ConfigAttribute(type = File.class)
   String CACHE_XML_FILE_NAME = CACHE_XML_FILE;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CACHE_XML_FILE} property
+   * The default value of the {@link ConfigurationProperties#CACHE_XML_FILE} property
    */
   File DEFAULT_CACHE_XML_FILE = new File("cache.xml");
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}
+   * Returns the value of the {@link ConfigurationProperties#ACK_WAIT_THRESHOLD}
    * property
    */
   @ConfigAttributeGetter(name = ACK_WAIT_THRESHOLD)
   int getAckWaitThreshold();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}
+   * Sets the value of the {@link ConfigurationProperties#ACK_WAIT_THRESHOLD}
    * property
    * Setting this value too low will cause spurious alerts.
    */
@@ -611,35 +612,35 @@ public interface DistributionConfig extends Config, LogConfig {
   void setAckWaitThreshold(int newThreshold);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}.
+   * The default {@link ConfigurationProperties#ACK_WAIT_THRESHOLD}.
    * <p> Actual value of this constant is <code>15</code> seconds.
    */
   int DEFAULT_ACK_WAIT_THRESHOLD = 15;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}.
+   * The minimum {@link ConfigurationProperties#ACK_WAIT_THRESHOLD}.
    * <p> Actual value of this constant is <code>1</code> second.
    */
   int MIN_ACK_WAIT_THRESHOLD = 1;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD}.
+   * The maximum {@link ConfigurationProperties#ACK_WAIT_THRESHOLD}.
    * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
    */
   int MAX_ACK_WAIT_THRESHOLD = Integer.MAX_VALUE;
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_WAIT_THRESHOLD} property
+   * The name of the {@link ConfigurationProperties#ACK_WAIT_THRESHOLD} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ACK_WAIT_THRESHOLD)
   String ACK_WAIT_THRESHOLD_NAME = ACK_WAIT_THRESHOLD;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}
+   * Returns the value of the {@link ConfigurationProperties#ACK_SEVERE_ALERT_THRESHOLD}
    * property
    */
   @ConfigAttributeGetter(name = ACK_SEVERE_ALERT_THRESHOLD)
   int getAckSevereAlertThreshold();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}
+   * Sets the value of the {@link ConfigurationProperties#ACK_SEVERE_ALERT_THRESHOLD}
    * property
    * Setting this value too low will cause spurious forced disconnects.
    */
@@ -647,174 +648,174 @@ public interface DistributionConfig extends Config, LogConfig {
   void setAckSevereAlertThreshold(int newThreshold);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}.
+   * The default {@link ConfigurationProperties#ACK_SEVERE_ALERT_THRESHOLD}.
    * <p> Actual value of this constant is <code>0</code> seconds, which
    * turns off shunning.
    */
   int DEFAULT_ACK_SEVERE_ALERT_THRESHOLD = 0;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}.
+   * The minimum {@link ConfigurationProperties#ACK_SEVERE_ALERT_THRESHOLD}.
    * <p> Actual value of this constant is <code>0</code> second,
    * which turns off shunning.
    */
   int MIN_ACK_SEVERE_ALERT_THRESHOLD = 0;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD}.
+   * The maximum {@link ConfigurationProperties#ACK_SEVERE_ALERT_THRESHOLD}.
    * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
    */
   int MAX_ACK_SEVERE_ALERT_THRESHOLD = Integer.MAX_VALUE;
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ACK_SEVERE_ALERT_THRESHOLD} property
+   * The name of the {@link ConfigurationProperties#ACK_SEVERE_ALERT_THRESHOLD} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ACK_SEVERE_ALERT_THRESHOLD)
   String ACK_SEVERE_ALERT_THRESHOLD_NAME = ACK_SEVERE_ALERT_THRESHOLD;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}
+   * Returns the value of the {@link ConfigurationProperties#ARCHIVE_FILE_SIZE_LIMIT}
    * property
    */
   @ConfigAttributeGetter(name = ARCHIVE_FILE_SIZE_LIMIT)
   int getArchiveFileSizeLimit();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}
+   * Sets the value of the {@link ConfigurationProperties#ARCHIVE_FILE_SIZE_LIMIT}
    * property
    */
   @ConfigAttributeSetter(name = ARCHIVE_FILE_SIZE_LIMIT)
   void setArchiveFileSizeLimit(int value);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}.
+   * The default {@link ConfigurationProperties#ARCHIVE_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int DEFAULT_ARCHIVE_FILE_SIZE_LIMIT = 0;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}.
+   * The minimum {@link ConfigurationProperties#ARCHIVE_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int MIN_ARCHIVE_FILE_SIZE_LIMIT = 0;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT}.
+   * The maximum {@link ConfigurationProperties#ARCHIVE_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
   int MAX_ARCHIVE_FILE_SIZE_LIMIT = 1000000;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_FILE_SIZE_LIMIT} property
+   * The name of the {@link ConfigurationProperties#ARCHIVE_FILE_SIZE_LIMIT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ARCHIVE_FILE_SIZE_LIMIT, max = MAX_ARCHIVE_FILE_SIZE_LIMIT)
   String ARCHIVE_FILE_SIZE_LIMIT_NAME = ARCHIVE_FILE_SIZE_LIMIT;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}
+   * Returns the value of the {@link ConfigurationProperties#ARCHIVE_DISK_SPACE_LIMIT}
    * property
    */
   @ConfigAttributeGetter(name = ARCHIVE_DISK_SPACE_LIMIT)
   int getArchiveDiskSpaceLimit();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}
+   * Sets the value of the {@link ConfigurationProperties#ARCHIVE_DISK_SPACE_LIMIT}
    * property
    */
   @ConfigAttributeSetter(name = ARCHIVE_DISK_SPACE_LIMIT)
   void setArchiveDiskSpaceLimit(int value);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}.
+   * The default {@link ConfigurationProperties#ARCHIVE_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int DEFAULT_ARCHIVE_DISK_SPACE_LIMIT = 0;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}.
+   * The minimum {@link ConfigurationProperties#ARCHIVE_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int MIN_ARCHIVE_DISK_SPACE_LIMIT = 0;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT}.
+   * The maximum {@link ConfigurationProperties#ARCHIVE_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
   int MAX_ARCHIVE_DISK_SPACE_LIMIT = 1000000;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ARCHIVE_DISK_SPACE_LIMIT} property
+   * The name of the {@link ConfigurationProperties#ARCHIVE_DISK_SPACE_LIMIT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ARCHIVE_DISK_SPACE_LIMIT, max = MAX_ARCHIVE_DISK_SPACE_LIMIT)
   String ARCHIVE_DISK_SPACE_LIMIT_NAME = ARCHIVE_DISK_SPACE_LIMIT;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}
+   * Returns the value of the {@link ConfigurationProperties#LOG_FILE_SIZE_LIMIT}
    * property
    */
   @ConfigAttributeGetter(name = LOG_FILE_SIZE_LIMIT)
   int getLogFileSizeLimit();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}
+   * Sets the value of the {@link ConfigurationProperties#LOG_FILE_SIZE_LIMIT}
    * property
    */
   @ConfigAttributeSetter(name = LOG_FILE_SIZE_LIMIT)
   void setLogFileSizeLimit(int value);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}.
+   * The default {@link ConfigurationProperties#LOG_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int DEFAULT_LOG_FILE_SIZE_LIMIT = 0;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}.
+   * The minimum {@link ConfigurationProperties#LOG_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int MIN_LOG_FILE_SIZE_LIMIT = 0;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT}.
+   * The maximum {@link ConfigurationProperties#LOG_FILE_SIZE_LIMIT}.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
   int MAX_LOG_FILE_SIZE_LIMIT = 1000000;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_FILE_SIZE_LIMIT} property
+   * The name of the {@link ConfigurationProperties#LOG_FILE_SIZE_LIMIT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_LOG_FILE_SIZE_LIMIT, max = MAX_LOG_FILE_SIZE_LIMIT)
   String LOG_FILE_SIZE_LIMIT_NAME = LOG_FILE_SIZE_LIMIT;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}
+   * Returns the value of the {@link ConfigurationProperties#LOG_DISK_SPACE_LIMIT}
    * property
    */
   @ConfigAttributeGetter(name = LOG_DISK_SPACE_LIMIT)
   int getLogDiskSpaceLimit();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}
+   * Sets the value of the {@link ConfigurationProperties#LOG_DISK_SPACE_LIMIT}
    * property
    */
   @ConfigAttributeSetter(name = LOG_DISK_SPACE_LIMIT)
   void setLogDiskSpaceLimit(int value);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}.
+   * The default {@link ConfigurationProperties#LOG_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int DEFAULT_LOG_DISK_SPACE_LIMIT = 0;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}.
+   * The minimum {@link ConfigurationProperties#LOG_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
   int MIN_LOG_DISK_SPACE_LIMIT = 0;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT}.
+   * The maximum {@link ConfigurationProperties#LOG_DISK_SPACE_LIMIT}.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
   int MAX_LOG_DISK_SPACE_LIMIT = 1000000;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOG_DISK_SPACE_LIMIT} property
+   * The name of the {@link ConfigurationProperties#LOG_DISK_SPACE_LIMIT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_LOG_DISK_SPACE_LIMIT, max = MAX_LOG_DISK_SPACE_LIMIT)
   String LOG_DISK_SPACE_LIMIT_NAME = LOG_DISK_SPACE_LIMIT;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_ENABLED}
+   * Returns the value of the {@link ConfigurationProperties#SSL_ENABLED}
    * property.
    *
    * @deprecated as of 8.0 use {@link #getClusterSSLEnabled} instead.
@@ -823,7 +824,7 @@ public interface DistributionConfig extends Config, LogConfig {
   boolean getSSLEnabled();
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_ENABLED} state.
+   * The default {@link ConfigurationProperties#SSL_ENABLED} state.
    * <p> Actual value of this constant is <code>false</code>.
    *
    * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED} instead.
@@ -831,7 +832,7 @@ public interface DistributionConfig extends Config, LogConfig {
   boolean DEFAULT_SSL_ENABLED = false;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_ENABLED} property
+   * The name of the {@link ConfigurationProperties#SSL_ENABLED} property
    *
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED_NAME} instead.
    */
@@ -839,7 +840,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String SSL_ENABLED_NAME = SSL_ENABLED;
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_ENABLED}
+   * Sets the value of the {@link ConfigurationProperties#SSL_ENABLED}
    * property.
    *
    * @deprecated as of 8.0 use {@link #setClusterSSLEnabled} instead.
@@ -848,7 +849,7 @@ public interface DistributionConfig extends Config, LogConfig {
   void setSSLEnabled(boolean enabled);
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_PROTOCOLS}
+   * Returns the value of the {@link ConfigurationProperties#SSL_PROTOCOLS}
    * property.
    *
    * @deprecated as of 8.0 use {@link #getClusterSSLProtocols} instead.
@@ -857,7 +858,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String getSSLProtocols();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_PROTOCOLS}
+   * Sets the value of the {@link ConfigurationProperties#SSL_PROTOCOLS}
    * property.
    *
    * @deprecated as of 8.0 use {@link #setClusterSSLProtocols} instead.
@@ -866,14 +867,14 @@ public interface DistributionConfig extends Config, LogConfig {
   void setSSLProtocols(String protocols);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_PROTOCOLS} value.
+   * The default {@link ConfigurationProperties#SSL_PROTOCOLS} value.
    * <p> Actual value of this constant is <code>any</code>.
    *
    * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS} instead.
    */
   String DEFAULT_SSL_PROTOCOLS = "any";
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_PROTOCOLS} property
+   * The name of the {@link ConfigurationProperties#SSL_PROTOCOLS} property
    *
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS_NAME} instead.
    */
@@ -881,7 +882,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_CIPHERS}
+   * Returns the value of the {@link ConfigurationProperties#SSL_CIPHERS}
    * property.
    *
    * @deprecated as of 8.0 use {@link #getClusterSSLCiphers} instead.
@@ -890,7 +891,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String getSSLCiphers();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_CIPHERS}
+   * Sets the value of the {@link ConfigurationProperties#SSL_CIPHERS}
    * property.
    *
    * @deprecated as of 8.0 use {@link #setClusterSSLCiphers} instead.
@@ -899,14 +900,14 @@ public interface DistributionConfig extends Config, LogConfig {
   void setSSLCiphers(String ciphers);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_CIPHERS} value.
+   * The default {@link ConfigurationProperties#SSL_CIPHERS} value.
    * <p> Actual value of this constant is <code>any</code>.
    *
    * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS} instead.
    */
   String DEFAULT_SSL_CIPHERS = "any";
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_CIPHERS} property
+   * The name of the {@link ConfigurationProperties#SSL_CIPHERS} property
    *
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS_NAME} instead.
    */
@@ -914,7 +915,7 @@ public interface DistributionConfig extends Config, LogConfig {
   String SSL_CIPHERS_NAME = SSL_CIPHERS;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_REQUIRE_AUTHENTICATION}
+   * Returns the value of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION}
    * property.
    *
    * @deprecated as of 8.0 use {@link #getClusterSSLRequireAuthentication} instead.
@@ -923,7 +924,7 @@ public interface DistributionConfig extends Config, LogConfig {
   boolean getSSLRequireAuthentication();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_REQUIRE_AUTHENTICATION}
+   * Sets the value of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION}
    * property.
    *
    * @deprecated as of 8.0 use {@link #setClusterSSLRequireAuthentication} instead.
@@ -932,14 +933,14 @@ public interface DistributionConfig extends Config, LogConfig {
   void setSSLRequireAuthentication(boolean enabled);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_REQUIRE_AUTHENTICATION} value.
+   * The default {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION} value.
    * <p> Actual value of this constant is <code>true</code>.
    *
    * @deprecated as of 8.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
    */
   boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION = true;
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SSL_REQUIRE_AUTHENTICATION} property
+   * The name of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION} property
    *
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME} instead.
    */
@@ -947,231 +948,231 @@ public interface DistributionConfig extends Config, LogConfig {
   String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_ENABLED}
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ENABLED}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_ENABLED)
   boolean getClusterSSLEnabled();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_ENABLED}
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_ENABLED}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_ENABLED)
   void setClusterSSLEnabled(boolean enabled);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_ENABLED} state.
+   * The default {@link ConfigurationProperties#CLUSTER_SSL_ENABLED} state.
    * <p> Actual value of this constant is <code>false</code>.
    */
   boolean DEFAULT_CLUSTER_SSL_ENABLED = false;
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_ENABLED} property
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_ENABLED} property
    */
   @ConfigAttribute(type = Boolean.class)
   String CLUSTER_SSL_ENABLED_NAME = CLUSTER_SSL_ENABLED;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_PROTOCOLS}
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_PROTOCOLS)
   String getClusterSSLProtocols();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_PROTOCOLS}
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_PROTOCOLS)
   void setClusterSSLProtocols(String protocols);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_PROTOCOLS} value.
+   * The default {@link ConfigurationProperties#CLUSTER_SSL_PROTOCOLS} value.
    * <p> Actual value of this constant is <code>any</code>.
    */
   String DEFAULT_CLUSTER_SSL_PROTOCOLS = "any";
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_PROTOCOLS} property
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_PROTOCOLS} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_PROTOCOLS_NAME = CLUSTER_SSL_PROTOCOLS;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_CIPHERS}
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_CIPHERS}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_CIPHERS)
   String getClusterSSLCiphers();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_CIPHERS}
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_CIPHERS}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_CIPHERS)
   void setClusterSSLCiphers(String ciphers);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_CIPHERS} value.
+   * The default {@link ConfigurationProperties#CLUSTER_SSL_CIPHERS} value.
    * <p> Actual value of this constant is <code>any</code>.
    */
   String DEFAULT_CLUSTER_SSL_CIPHERS = "any";
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_CIPHERS} property
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_CIPHERS} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_CIPHERS_NAME = CLUSTER_SSL_CIPHERS;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_REQUIRE_AUTHENTICATION)
   boolean getClusterSSLRequireAuthentication();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_REQUIRE_AUTHENTICATION)
   void setClusterSSLRequireAuthentication(boolean enabled);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION} value.
+   * The default {@link ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION} value.
    * <p> Actual value of this constant is <code>true</code>.
    */
   boolean DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION = true;
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION} property
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION} property
    */
   @ConfigAttribute(type = Boolean.class)
   String CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME = CLUSTER_SSL_REQUIRE_AUTHENTICATION;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE}
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE)
   String getClusterSSLKeyStore();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE}
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE)
   void setClusterSSLKeyStore(String keyStore);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE} value.
+   * The default {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_KEYSTORE = "";
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE} property
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_KEYSTORE_NAME = CLUSTER_SSL_KEYSTORE;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_TYPE}
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE_TYPE)
   String getClusterSSLKeyStoreType();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_TYPE}
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE_TYPE)
   void setClusterSSLKeyStoreType(String keyStoreType);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_TYPE} value.
+   * The default {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE = "";
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_TYPE} property
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_KEYSTORE_TYPE_NAME = CLUSTER_SSL_KEYSTORE_TYPE;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE_PASSWORD)
   String getClusterSSLKeyStorePassword();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE_PASSWORD)
   void setClusterSSLKeyStorePassword(String keyStorePassword);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_PASSWORD} value.
+   * The default {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD = "";
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_KEYSTORE_PASSWORD} property
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_KEYSTORE_PASSWORD_NAME = CLUSTER_SSL_KEYSTORE_PASSWORD;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE}
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_TRUSTSTORE)
   String getClusterSSLTrustStore();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE}
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_TRUSTSTORE)
   void setClusterSSLTrustStore(String trustStore);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE} value.
+   * The default {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_TRUSTSTORE = "";
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE} property
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_TRUSTSTORE_NAME = CLUSTER_SSL_TRUSTSTORE;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    * property.
    */
   @ConfigAttributeGetter(name = CLUSTER_SSL_TRUSTSTORE_PASSWORD)
   String getClusterSSLTrustStorePassword();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    * property.
    */
   @ConfigAttributeSetter(name = CLUSTER_SSL_TRUSTSTORE_PASSWORD)
   void setClusterSSLTrustStorePassword(String trusStorePassword);
 
   /**
-   * The default {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD} value.
+   * The default {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
    */
   String DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD = "";
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD} property
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD} property
    */
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME = CLUSTER_SSL_TRUSTSTORE_PASSWORD;
@@ -1244,65 +1245,65 @@ public interface DistributionConfig extends Config, LogConfig {
   String SECURITY_LOG_OUTPUTSTREAM_NAME = "security-log-output-stream";
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME}
+   * Returns the value of the {@link ConfigurationProperties#SOCKET_LEASE_TIME}
    * property
    */
   @ConfigAttributeGetter(name = SOCKET_LEASE_TIME)
   int getSocketLeaseTime();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME}
+   * Sets the value of the {@link ConfigurationProperties#SOCKET_LEASE_TIME}
    * property
    */
   @ConfigAttributeSetter(name = SOCKET_LEASE_TIME)
   void setSocketLeaseTime(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME} property
+   * The default value of the {@link ConfigurationProperties#SOCKET_LEASE_TIME} property
    */
   int DEFAULT_SOCKET_LEASE_TIME = 60000;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME}.
+   * The minimum {@link ConfigurationProperties#SOCKET_LEASE_TIME}.
    * <p> Actual value of this constant is <code>0</code>.
    */
   int MIN_SOCKET_LEASE_TIME = 0;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME}.
+   * The maximum {@link ConfigurationProperties#SOCKET_LEASE_TIME}.
    * <p> Actual value of this constant is <code>600000</code>.
    */
   int MAX_SOCKET_LEASE_TIME = 600000;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_LEASE_TIME} property
+   * The name of the {@link ConfigurationProperties#SOCKET_LEASE_TIME} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_SOCKET_LEASE_TIME, max = MAX_SOCKET_LEASE_TIME)
   String SOCKET_LEASE_TIME_NAME = SOCKET_LEASE_TIME;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE}
+   * Returns the value of the {@link ConfigurationProperties#SOCKET_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = SOCKET_BUFFER_SIZE)
   int getSocketBufferSize();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE}
+   * Sets the value of the {@link ConfigurationProperties#SOCKET_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = SOCKET_BUFFER_SIZE)
   void setSocketBufferSize(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE} property
+   * The default value of the {@link ConfigurationProperties#SOCKET_BUFFER_SIZE} property
    */
   int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE}.
+   * The minimum {@link ConfigurationProperties#SOCKET_BUFFER_SIZE}.
    * <p> Actual value of this constant is <code>1024</code>.
    */
   int MIN_SOCKET_BUFFER_SIZE = 1024;
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE}.
+   * The maximum {@link ConfigurationProperties#SOCKET_BUFFER_SIZE}.
    * <p> Actual value of this constant is <code>20000000</code>.
    */
   int MAX_SOCKET_BUFFER_SIZE = Connection.MAX_MSG_SIZE;
@@ -1311,14 +1312,14 @@ public interface DistributionConfig extends Config, LogConfig {
   int VALIDATE_CEILING = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "validateMessageSizeCeiling", 8 * 1024 * 1024).intValue();
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#SOCKET_BUFFER_SIZE} property
+   * The name of the {@link ConfigurationProperties#SOCKET_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_SOCKET_BUFFER_SIZE, max = MAX_SOCKET_BUFFER_SIZE)
   String SOCKET_BUFFER_SIZE_NAME = SOCKET_BUFFER_SIZE;
 
   /**
    * Get the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE}
+   * {@link ConfigurationProperties#MCAST_SEND_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = MCAST_SEND_BUFFER_SIZE)
@@ -1326,32 +1327,32 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE}
+   * {@link ConfigurationProperties#MCAST_SEND_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_SEND_BUFFER_SIZE)
   void setMcastSendBufferSize(int value);
 
   /**
-   * The default value for  {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE} property
+   * The default value for  {@link ConfigurationProperties#MCAST_SEND_BUFFER_SIZE} property
    */
   int DEFAULT_MCAST_SEND_BUFFER_SIZE = 65535;
 
   /**
-   * The minimum size of the  {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE}, in bytes.
+   * The minimum size of the  {@link ConfigurationProperties#MCAST_SEND_BUFFER_SIZE}, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
   int MIN_MCAST_SEND_BUFFER_SIZE = 2048;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_SEND_BUFFER_SIZE} property
+   * The name of the {@link ConfigurationProperties#MCAST_SEND_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MCAST_SEND_BUFFER_SIZE)
   String MCAST_SEND_BUFFER_SIZE_NAME = MCAST_SEND_BUFFER_SIZE;
 
   /**
    * Get the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE}
+   * {@link ConfigurationProperties#MCAST_RECV_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = MCAST_RECV_BUFFER_SIZE)
@@ -1359,32 +1360,32 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE}
+   * {@link ConfigurationProperties#MCAST_RECV_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_RECV_BUFFER_SIZE)
   void setMcastRecvBufferSize(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE} property
+   * The default value of the {@link ConfigurationProperties#MCAST_RECV_BUFFER_SIZE} property
    */
   int DEFAULT_MCAST_RECV_BUFFER_SIZE = 1048576;
 
   /**
-   * The minimum size of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE}, in bytes.
+   * The minimum size of the {@link ConfigurationProperties#MCAST_RECV_BUFFER_SIZE}, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
   int MIN_MCAST_RECV_BUFFER_SIZE = 2048;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_RECV_BUFFER_SIZE} property
+   * The name of the {@link ConfigurationProperties#MCAST_RECV_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MCAST_RECV_BUFFER_SIZE)
   String MCAST_RECV_BUFFER_SIZE_NAME = MCAST_RECV_BUFFER_SIZE;
 
   /**
    * Get the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL}
+   * {@link ConfigurationProperties#MCAST_FLOW_CONTROL}
    * property.
    */
   @ConfigAttributeGetter(name = MCAST_FLOW_CONTROL)
@@ -1392,57 +1393,57 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL}
+   * {@link ConfigurationProperties#MCAST_FLOW_CONTROL}
    * property
    */
   @ConfigAttributeSetter(name = MCAST_FLOW_CONTROL)
   void setMcastFlowControl(FlowControlParams values);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} property
+   * The name of the {@link ConfigurationProperties#MCAST_FLOW_CONTROL} property
    */
   @ConfigAttribute(type = FlowControlParams.class)
   String MCAST_FLOW_CONTROL_NAME = MCAST_FLOW_CONTROL;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} property
+   * The default value of the {@link ConfigurationProperties#MCAST_FLOW_CONTROL} property
    */
   FlowControlParams DEFAULT_MCAST_FLOW_CONTROL
       = new FlowControlParams(1048576, (float) 0.25, 5000);
 
   /**
-   * The minimum byteAllowance for the{@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
+   * The minimum byteAllowance for the{@link ConfigurationProperties#MCAST_FLOW_CONTROL} setting of
    * <code>100000</code>.
    */
   int MIN_FC_BYTE_ALLOWANCE = 10000;
 
   /**
-   * The minimum rechargeThreshold for the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
+   * The minimum rechargeThreshold for the {@link ConfigurationProperties#MCAST_FLOW_CONTROL} setting of
    * <code>0.1</code>
    */
   float MIN_FC_RECHARGE_THRESHOLD = (float) 0.1;
 
   /**
-   * The maximum rechargeThreshold for the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
+   * The maximum rechargeThreshold for the {@link ConfigurationProperties#MCAST_FLOW_CONTROL} setting of
    * <code>0.5</code>
    */
   float MAX_FC_RECHARGE_THRESHOLD = (float) 0.5;
 
   /**
-   * The minimum rechargeBlockMs for the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
+   * The minimum rechargeBlockMs for the {@link ConfigurationProperties#MCAST_FLOW_CONTROL} setting of
    * <code>500</code>
    */
   int MIN_FC_RECHARGE_BLOCK_MS = 500;
 
   /**
-   * The maximum rechargeBlockMs for the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MCAST_FLOW_CONTROL} setting of
+   * The maximum rechargeBlockMs for the {@link ConfigurationProperties#MCAST_FLOW_CONTROL} setting of
    * <code>60000</code>
    */
   int MAX_FC_RECHARGE_BLOCK_MS = 60000;
 
   /**
    * Get the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE}
+   * {@link ConfigurationProperties#UDP_FRAGMENT_SIZE}
    * property.
    */
   @ConfigAttributeGetter(name = UDP_FRAGMENT_SIZE)
@@ -1450,36 +1451,36 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE}
+   * {@link ConfigurationProperties#UDP_FRAGMENT_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = UDP_FRAGMENT_SIZE)
   void setUdpFragmentSize(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE} property
+   * The default value of the {@link ConfigurationProperties#UDP_FRAGMENT_SIZE} property
    */
   int DEFAULT_UDP_FRAGMENT_SIZE = 60000;
 
   /**
-   * The minimum allowed {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE} setting of 1000
+   * The minimum allowed {@link ConfigurationProperties#UDP_FRAGMENT_SIZE} setting of 1000
    */
   int MIN_UDP_FRAGMENT_SIZE = 1000;
 
   /**
-   * The maximum allowed {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE} setting of 60000
+   * The maximum allowed {@link ConfigurationProperties#UDP_FRAGMENT_SIZE} setting of 60000
    */
   int MAX_UDP_FRAGMENT_SIZE = 60000;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_FRAGMENT_SIZE} property
+   * The name of the {@link ConfigurationProperties#UDP_FRAGMENT_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_UDP_FRAGMENT_SIZE, max = MAX_UDP_FRAGMENT_SIZE)
   String UDP_FRAGMENT_SIZE_NAME = UDP_FRAGMENT_SIZE;
 
   /**
    * Get the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE}
+   * {@link ConfigurationProperties#UDP_SEND_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = UDP_SEND_BUFFER_SIZE)
@@ -1487,32 +1488,32 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE}
+   * {@link ConfigurationProperties#UDP_SEND_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = UDP_SEND_BUFFER_SIZE)
   void setUdpSendBufferSize(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE} property
+   * The default value of the {@link ConfigurationProperties#UDP_SEND_BUFFER_SIZE} property
    */
   int DEFAULT_UDP_SEND_BUFFER_SIZE = 65535;
 
   /**
-   * The minimum size of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE}, in bytes.
+   * The minimum size of the {@link ConfigurationProperties#UDP_SEND_BUFFER_SIZE}, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
   int MIN_UDP_SEND_BUFFER_SIZE = 2048;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_SEND_BUFFER_SIZE} property
+   * The name of the {@link ConfigurationProperties#UDP_SEND_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_UDP_SEND_BUFFER_SIZE)
   String UDP_SEND_BUFFER_SIZE_NAME = UDP_SEND_BUFFER_SIZE;
 
   /**
    * Get the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE}
+   * {@link ConfigurationProperties#UDP_RECV_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeGetter(name = UDP_RECV_BUFFER_SIZE)
@@ -1520,58 +1521,58 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE}
+   * {@link ConfigurationProperties#UDP_RECV_BUFFER_SIZE}
    * property
    */
   @ConfigAttributeSetter(name = UDP_RECV_BUFFER_SIZE)
   void setUdpRecvBufferSize(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE} property
+   * The default value of the {@link ConfigurationProperties#UDP_RECV_BUFFER_SIZE} property
    */
   int DEFAULT_UDP_RECV_BUFFER_SIZE = 1048576;
 
   /**
-   * The default size of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE}
+   * The default size of the {@link ConfigurationProperties#UDP_RECV_BUFFER_SIZE}
    * if tcp/ip sockets are
    * enabled and multicast is disabled
    */
   int DEFAULT_UDP_RECV_BUFFER_SIZE_REDUCED = 65535;
 
   /**
-   * The minimum size of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE}, in bytes.
+   * The minimum size of the {@link ConfigurationProperties#UDP_RECV_BUFFER_SIZE}, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
   int MIN_UDP_RECV_BUFFER_SIZE = 2048;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#UDP_RECV_BUFFER_SIZE} property
+   * The name of the {@link ConfigurationProperties#UDP_RECV_BUFFER_SIZE} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_UDP_RECV_BUFFER_SIZE)
   String UDP_RECV_BUFFER_SIZE_NAME = UDP_RECV_BUFFER_SIZE;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DISABLE_TCP}
+   * Returns the value of the {@link ConfigurationProperties#DISABLE_TCP}
    * property
    */
   @ConfigAttributeGetter(name = DISABLE_TCP)
   boolean getDisableTcp();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DISABLE_TCP}
+   * Sets the value of the {@link ConfigurationProperties#DISABLE_TCP}
    * property.
    */
   @ConfigAttributeSetter(name = DISABLE_TCP)
   void setDisableTcp(boolean newValue);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DISABLE_TCP} property
+   * The name of the {@link ConfigurationProperties#DISABLE_TCP} property
    */
   @ConfigAttribute(type = Boolean.class)
   String DISABLE_TCP_NAME = DISABLE_TCP;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#DISABLE_TCP} property
+   * The default value of the {@link ConfigurationProperties#DISABLE_TCP} property
    */
   boolean DEFAULT_DISABLE_TCP = false;
 
@@ -1582,70 +1583,70 @@ public interface DistributionConfig extends Config, LogConfig {
   void setEnableTimeStatistics(boolean newValue);
 
   /**
-   * Returns the value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_TIME_STATISTICS}
+   * Returns the value of {@link ConfigurationProperties#ENABLE_TIME_STATISTICS}
    * property
    */
   @ConfigAttributeGetter(name = ENABLE_TIME_STATISTICS)
   boolean getEnableTimeStatistics();
 
   /**
-   * the name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_TIME_STATISTICS} property
+   * the name of the {@link ConfigurationProperties#ENABLE_TIME_STATISTICS} property
    */
   @ConfigAttribute(type = Boolean.class)
   String ENABLE_TIME_STATISTICS_NAME = ENABLE_TIME_STATISTICS;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_TIME_STATISTICS} property
+   * The default value of the {@link ConfigurationProperties#ENABLE_TIME_STATISTICS} property
    */
   boolean DEFAULT_ENABLE_TIME_STATISTICS = false;
 
   /**
    * Sets the value for
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USE_CLUSTER_CONFIGURATION}
+   * {@link ConfigurationProperties#USE_CLUSTER_CONFIGURATION}
    */
   @ConfigAttributeSetter(name = USE_CLUSTER_CONFIGURATION)
   void setUseSharedConfiguration(boolean newValue);
 
   /**
-   * Returns the value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USE_CLUSTER_CONFIGURATION}
+   * Returns the value of {@link ConfigurationProperties#USE_CLUSTER_CONFIGURATION}
    * property
    */
   @ConfigAttributeGetter(name = USE_CLUSTER_CONFIGURATION)
   boolean getUseSharedConfiguration();
 
   /**
-   * the name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USE_CLUSTER_CONFIGURATION} property
+   * the name of the {@link ConfigurationProperties#USE_CLUSTER_CONFIGURATION} property
    */
   @ConfigAttribute(type = Boolean.class)
   String USE_CLUSTER_CONFIGURATION_NAME = USE_CLUSTER_CONFIGURATION;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#USE_CLUSTER_CONFIGURATION} property
+   * The default value of the {@link ConfigurationProperties#USE_CLUSTER_CONFIGURATION} property
    */
   boolean DEFAULT_USE_CLUSTER_CONFIGURATION = true;
 
   /**
    * Sets the value for
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_CLUSTER_CONFIGURATION}
+   * {@link ConfigurationProperties#ENABLE_CLUSTER_CONFIGURATION}
    */
   @ConfigAttributeSetter(name = ENABLE_CLUSTER_CONFIGURATION)
   void setEnableClusterConfiguration(boolean newValue);
 
   /**
-   * Returns the value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_CLUSTER_CONFIGURATION}
+   * Returns the value of {@link ConfigurationProperties#ENABLE_CLUSTER_CONFIGURATION}
    * property
    */
   @ConfigAttributeGetter(name = ENABLE_CLUSTER_CONFIGURATION)
   boolean getEnableClusterConfiguration();
 
   /**
-   * the name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_CLUSTER_CONFIGURATION} property
+   * the name of the {@link ConfigurationProperties#ENABLE_CLUSTER_CONFIGURATION} property
    */
   @ConfigAttribute(type = Boolean.class)
   String ENABLE_CLUSTER_CONFIGURATION_NAME = ENABLE_CLUSTER_CONFIGURATION;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_CLUSTER_CONFIGURATION} property
+   * The default value of the {@link ConfigurationProperties#ENABLE_CLUSTER_CONFIGURATION} property
    */
   boolean DEFAULT_ENABLE_CLUSTER_CONFIGURATION = true;
 
@@ -1655,7 +1656,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOAD_CLUSTER_CONFIGURATION_FROM_DIR}
+   * {@link ConfigurationProperties#LOAD_CLUSTER_CONFIGURATION_FROM_DIR}
    * property
    */
   @ConfigAttributeGetter(name = LOAD_CLUSTER_CONFIGURATION_FROM_DIR)
@@ -1663,7 +1664,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Sets the value of
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#LOAD_CLUSTER_CONFIGURATION_FROM_DIR}
+   * {@link ConfigurationProperties#LOAD_CLUSTER_CONFIGURATION_FROM_DIR}
    * property
    */
   @ConfigAttributeSetter(name = LOAD_CLUSTER_CONFIGURATION_FROM_DIR)
@@ -1687,13 +1688,13 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_NETWORK_PARTITION_DETECTION} property
+   * {@link ConfigurationProperties#ENABLE_NETWORK_PARTITION_DETECTION} property
    */
   @ConfigAttributeGetter(name = ENABLE_NETWORK_PARTITION_DETECTION)
   boolean getEnableNetworkPartitionDetection();
 
   /**
-   * the name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ENABLE_NETWORK_PARTITION_DETECTION} property
+   * the name of the {@link ConfigurationProperties#ENABLE_NETWORK_PARTITION_DETECTION} property
    */
   @ConfigAttribute(type = Boolean.class)
   String ENABLE_NETWORK_PARTITION_DETECTION_NAME = ENABLE_NETWORK_PARTITION_DETECTION;
@@ -1701,7 +1702,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Get the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT}
+   * {@link ConfigurationProperties#MEMBER_TIMEOUT}
    * property
    */
   @ConfigAttributeGetter(name = MEMBER_TIMEOUT)
@@ -1709,28 +1710,28 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of the
-   * {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT}
+   * {@link ConfigurationProperties#MEMBER_TIMEOUT}
    * property
    */
   @ConfigAttributeSetter(name = MEMBER_TIMEOUT)
   void setMemberTimeout(int value);
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT} property
+   * The default value of the {@link ConfigurationProperties#MEMBER_TIMEOUT} property
    */
   int DEFAULT_MEMBER_TIMEOUT = 5000;
 
   /**
-   * The minimum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT} setting of 1000 milliseconds
+   * The minimum {@link ConfigurationProperties#MEMBER_TIMEOUT} setting of 1000 milliseconds
    */
   int MIN_MEMBER_TIMEOUT = 10;
 
   /**
-   * The maximum {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT} setting of 600000 millieseconds
+   * The maximum {@link ConfigurationProperties#MEMBER_TIMEOUT} setting of 600000 millieseconds
    */
   int MAX_MEMBER_TIMEOUT = 600000;
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MEMBER_TIMEOUT} property
+   * The name of the {@link ConfigurationProperties#MEMBER_TIMEOUT} property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MEMBER_TIMEOUT, max = MAX_MEMBER_TIMEOUT)
   String MEMBER_TIMEOUT_NAME = MEMBER_TIMEOUT;
@@ -1747,97 +1748,97 @@ public interface DistributionConfig extends Config, LogConfig {
   void setMembershipPortRange(int[] range);
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CONSERVE_SOCKETS}
+   * Returns the value of the {@link ConfigurationProperties#CONSERVE_SOCKETS}
    * property
    */
   @ConfigAttributeGetter(name = CONSERVE_SOCKETS)
   boolean getConserveSockets();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CONSERVE_SOCKETS}
+   * Sets the value of the {@link ConfigurationProperties#CONSERVE_SOCKETS}
    * property.
    */
   @ConfigAttributeSetter(name = CONSERVE_SOCKETS)
   void setConserveSockets(boolean newValue);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CONSERVE_SOCKETS} property
+   * The name of the {@link ConfigurationProperties#CONSERVE_SOCKETS} property
    */
   @ConfigAttribute(type = Boolean.class)
   String CONSERVE_SOCKETS_NAME = CONSERVE_SOCKETS;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#CONSERVE_SOCKETS} property
+   * The default value of the {@link ConfigurationProperties#CONSERVE_SOCKETS} property
    */
   boolean DEFAULT_CONSERVE_SOCKETS = true;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ROLES}
+   * Returns the value of the {@link ConfigurationProperties#ROLES}
    * property
    */
   @ConfigAttributeGetter(name = ROLES)
   String getRoles();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ROLES}
+   * Sets the value of the {@link ConfigurationProperties#ROLES}
    * property.
    */
   @ConfigAttributeSetter(name = ROLES)
   void setRoles(String roles);
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ROLES} property
+   * The name of the {@link ConfigurationProperties#ROLES} property
    */
   @ConfigAttribute(type = String.class)
   String ROLES_NAME = ROLES;
 
   /**
-   * The default value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ROLES} property
+   * The default value of the {@link ConfigurationProperties#ROLES} property
    */
   String DEFAULT_ROLES = "";
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_WAIT_TIME_RECONNECT} property
+   * The name of the {@link ConfigurationProperties#MAX_WAIT_TIME_RECONNECT} property
    */
   @ConfigAttribute(type = Integer.class)
   String MAX_WAIT_TIME_FOR_RECONNECT_NAME = MAX_WAIT_TIME_RECONNECT;
 
   /**
-   * Default value for {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_WAIT_TIME_RECONNECT}, 60,000 milliseconds.
+   * Default value for {@link ConfigurationProperties#MAX_WAIT_TIME_RECONNECT}, 60,000 milliseconds.
    */
   int DEFAULT_MAX_WAIT_TIME_FOR_RECONNECT = 60000;
 
   /**
-   * Sets the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_WAIT_TIME_RECONNECT}, in milliseconds, for reconnect.
+   * Sets the {@link ConfigurationProperties#MAX_WAIT_TIME_RECONNECT}, in milliseconds, for reconnect.
    */
   @ConfigAttributeSetter(name = MAX_WAIT_TIME_RECONNECT)
   void setMaxWaitTimeForReconnect(int timeOut);
 
   /**
-   * Returns the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_WAIT_TIME_RECONNECT}, in milliseconds, for reconnect.
+   * Returns the {@link ConfigurationProperties#MAX_WAIT_TIME_RECONNECT}, in milliseconds, for reconnect.
    */
   @ConfigAttributeGetter(name = MAX_WAIT_TIME_RECONNECT)
   int getMaxWaitTimeForReconnect();
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_NUM_RECONNECT_TRIES} property.
+   * The name of the {@link ConfigurationProperties#MAX_NUM_RECONNECT_TRIES} property.
    */
   @ConfigAttribute(type = Integer.class)
   String MAX_NUM_RECONNECT_TRIES_NAME = MAX_NUM_RECONNECT_TRIES;
 
   /**
-   * Default value for {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_NUM_RECONNECT_TRIES}.
+   * Default value for {@link ConfigurationProperties#MAX_NUM_RECONNECT_TRIES}.
    */
   int DEFAULT_MAX_NUM_RECONNECT_TRIES = 3;
 
   /**
-   * Sets the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_NUM_RECONNECT_TRIES}.
+   * Sets the {@link ConfigurationProperties#MAX_NUM_RECONNECT_TRIES}.
    */
   @ConfigAttributeSetter(name = MAX_NUM_RECONNECT_TRIES)
   void setMaxNumReconnectTries(int tries);
 
   /**
-   * Returns the value for {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#MAX_NUM_RECONNECT_TRIES}.
+   * Returns the value for {@link ConfigurationProperties#MAX_NUM_RECONNECT_TRIES}.
    */
   @ConfigAttributeGetter(name = MAX_NUM_RECONNECT_TRIES)
   int getMaxNumReconnectTries();
@@ -1845,93 +1846,93 @@ public interface DistributionConfig extends Config, LogConfig {
   // ------------------- Asynchronous Messaging Properties -------------------
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT} property.
+   * Returns the value of the {@link ConfigurationProperties#ASYNC_DISTRIBUTION_TIMEOUT} property.
    */
   @ConfigAttributeGetter(name = ASYNC_DISTRIBUTION_TIMEOUT)
   int getAsyncDistributionTimeout();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  property.
+   * Sets the value of the {@link ConfigurationProperties#ASYNC_DISTRIBUTION_TIMEOUT}  property.
    */
   @ConfigAttributeSetter(name = ASYNC_DISTRIBUTION_TIMEOUT)
   void setAsyncDistributionTimeout(int newValue);
 
   /**
-   * The default value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  is <code>0</code>.
+   * The default value of {@link ConfigurationProperties#ASYNC_DISTRIBUTION_TIMEOUT}  is <code>0</code>.
    */
   int DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT = 0;
   /**
-   * The minimum value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  is <code>0</code>.
+   * The minimum value of {@link ConfigurationProperties#ASYNC_DISTRIBUTION_TIMEOUT}  is <code>0</code>.
    */
   int MIN_ASYNC_DISTRIBUTION_TIMEOUT = 0;
   /**
-   * The maximum value of {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  is <code>60000</code>.
+   * The maximum value of {@link ConfigurationProperties#ASYNC_DISTRIBUTION_TIMEOUT}  is <code>60000</code>.
    */
   int MAX_ASYNC_DISTRIBUTION_TIMEOUT = 60000;
 
   /**
-   * The name of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_DISTRIBUTION_TIMEOUT}  property
+   * The name of the {@link ConfigurationProperties#ASYNC_DISTRIBUTION_TIMEOUT}  property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_ASYNC_DISTRIBUTION_TIMEOUT, max = MAX_ASYNC_DISTRIBUTION_TIMEOUT)
   String ASYNC_DISTRIBUTION_TIMEOUT_NAME = ASYNC_DISTRIBUTION_TIMEOUT;
 
   /**
-   * Returns the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_QUEUE_TIMEOUT}  property.
+   * Returns the value of the {@link ConfigurationProperties#ASYNC_QUEUE_TIMEOUT}  property.
    */
   @ConfigAttributeGetter(name = ASYNC_QUEUE_TIMEOUT)
   int getAsyncQueueTimeout();
 
   /**
-   * Sets the value of the {@link com.gemstone.gemfire.distributed.DistributedSystemConfigProperties#ASYNC_QUEUE_TIMEOUT} property.
+   * Sets the value of the {@link ConfigurationProperties#ASYNC_QUEUE_TIMEOUT} property.
    */
   @ConfigAttributeSetter(name = ASYNC_QUEUE_TIMEOUT)
   void setAsyncQueueTimeout(int newValue);
 
   /**
-   * The default value of {@link com.gemstone.gemfire.distri

<TRUNCATED>


[03/17] incubator-geode git commit: GEODE-1377: Refactoring as per review comments

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/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 f529196..015f340 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
@@ -32,6 +32,8 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;
 
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
 /**
  * Provides an implementation of <code>DistributionConfig</code> that
  * knows how to read the configuration file.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/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 fee905c..8707a39 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
@@ -18,7 +18,6 @@
 package com.gemstone.gemfire.distributed.internal;
 
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.internal.Config;
 import com.gemstone.gemfire.internal.ConfigSource;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
@@ -32,6 +31,8 @@ import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.util.*;
 
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
 /**
  * Provides accessor (and in some cases mutator) methods for the
  * various GemFire distribution configuration properties.  The
@@ -48,7 +49,7 @@ import java.util.*;
  *
  * @since GemFire 2.1
  */
-public interface DistributionConfig extends Config, LogConfig, DistributedSystemConfigProperties {
+public interface DistributionConfig extends Config, LogConfig {
 
   ////////////////////  Instance Methods  ////////////////////
 
@@ -872,7 +873,7 @@ public interface DistributionConfig extends Config, LogConfig, DistributedSystem
   /**
    * The name of the "SSLEnabled" property
    *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
+   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED_NAME} instead.
    */
   @ConfigAttribute(type = Boolean.class)
   String SSL_ENABLED_NAME = SSL_ENABLED;
@@ -917,7 +918,7 @@ public interface DistributionConfig extends Config, LogConfig, DistributedSystem
   /**
    * The name of the "SSLProtocols" property
    *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
+   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS_NAME} instead.
    */
   @ConfigAttribute(type = String.class)
   String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
@@ -952,7 +953,7 @@ public interface DistributionConfig extends Config, LogConfig, DistributedSystem
   /**
    * The name of the "SSLCiphers" property
    *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
+   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS_NAME} instead.
    */
   @ConfigAttribute(type = String.class)
   String SSL_CIPHERS_NAME = SSL_CIPHERS;
@@ -987,7 +988,7 @@ public interface DistributionConfig extends Config, LogConfig, DistributedSystem
   /**
    * The name of the "SSLRequireAuthentication" property
    *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
+   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME} instead.
    */
   @ConfigAttribute(type = Boolean.class)
   String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
@@ -2434,9 +2435,6 @@ public interface DistributionConfig extends Config, LogConfig, DistributedSystem
    */
   void setSecurity(String attName, String attValue);
 
-  /**
-   * For the "security-" prefixed properties
-   */
   String SECURITY_PREFIX_NAME = SECURITY_PREFIX;
 
   /**
@@ -3056,7 +3054,7 @@ public interface DistributionConfig extends Config, LogConfig, DistributedSystem
   /**
    * The name of the "jmx-manager-http-port" property.
    *
-   * @deprecated as of 8.0 use {@link #HTTP_SERVICE_PORT} instead.
+   * @deprecated as of 8.0 use {{@link #HTTP_SERVICE_PORT_NAME} instead.
    */
   @ConfigAttribute(type = Integer.class, min = 0, max = 65535)
   String JMX_MANAGER_HTTP_PORT_NAME = JMX_MANAGER_HTTP_PORT;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/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 3288e98..f037e95 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
@@ -34,6 +34,8 @@ import java.net.URL;
 import java.net.UnknownHostException;
 import java.util.*;
 
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
 /**
  * Provides an implementation of <code>DistributionConfig</code> that
  * knows how to read the configuration file.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
index 2c674f8..89cab6a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/RuntimeDistributionConfigImpl.java
@@ -25,6 +25,8 @@ import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
 /**
  * Provides an implementation of <code>DistributionConfig</code> that
  * is used at runtime by a {@link InternalDistributedSystem}. It allows

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/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 5d455ec..b3b46cc 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
@@ -161,7 +161,7 @@ public abstract class AbstractConfig implements Config {
         }
       }
       // hide the shiro-init configuration for now. Remove after we can allow customer to specify shiro.ini file
-      if(attName.equals(DistributionConfig.SECURITY_SHIRO_INIT)){
+      if(attName.equals(SECURITY_SHIRO_INIT)){
         continue;
       }
       pw.print(attName);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java
index 5100fc4..16e6654 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogConfig.java
@@ -54,7 +54,7 @@ public interface LogConfig {
    * A name is optional and by default empty.
    * If set it must be unique in the ds.
    * When set its used by tools to help identify the member.
-   * <p> The default value is: {@link DistributionConfig#DEFAULT_NAME}.
+   * <p> The default value is: {@link com.gemstone.gemfire.distributed.internal.DistributionConfig#DEFAULT_NAME}.
    * @return the system's name.
    */
   String getName();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
index 838bfc6..961f68a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
@@ -233,7 +233,7 @@ public class GeodeSecurityUtil {
     if(securityProps==null)
       return;
 
-    String shiroConfig = securityProps.getProperty(DistributionConfig.SECURITY_SHIRO_INIT);
+    String shiroConfig = securityProps.getProperty(SECURITY_SHIRO_INIT);
     String customAuthenticator =securityProps.getProperty(SECURITY_CLIENT_AUTHENTICATOR);
     if (!com.gemstone.gemfire.internal.lang.StringUtils.isBlank(shiroConfig)) {
       IniSecurityManagerFactory factory = new IniSecurityManagerFactory("classpath:"+shiroConfig);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
index 3d88acd..9389916 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
@@ -158,38 +158,38 @@ public class GMSAuthenticatorJUnitTest {
 
   @Test
   public void testAuthenticatorWithEmptyAuth() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, "");
+    props.setProperty(SECURITY_PEER_AUTHENTICATOR, "");
     String result = authenticator.authenticate(member, props, props, member);
     assertNull(result);
   }
 
   @Test
   public void testAuthenticatorWithNotExistAuth() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "NotExistAuth.create");
+    props.setProperty(SECURITY_PEER_AUTHENTICATOR, prefix + "NotExistAuth.create");
     verifyNegativeAuthenticate(props, props, "Authentication failed. See coordinator");
   }
 
   @Test
   public void testAuthenticatorWithNullAuth() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator1.create");
+    props.setProperty(SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator1.create");
     verifyNegativeAuthenticate(props, props, "Authentication failed. See coordinator");
   }
 
   @Test
   public void testAuthenticatorWithNullCredential() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator1.create");
+    props.setProperty(SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator1.create");
     verifyNegativeAuthenticate(null, props, "Failed to find credentials from");
   }
 
   @Test
   public void testAuthenticatorWithAuthInitFailure() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator2.create");
+    props.setProperty(SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator2.create");
     verifyNegativeAuthenticate(props, props, "Authentication failed. See coordinator");
   }
 
   @Test
   public void testAuthenticatorWithAuthFailure() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator3.create");
+    props.setProperty(SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator3.create");
     verifyNegativeAuthenticate(props, props, "Authentication failed. See coordinator");
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad7fd7e1/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index 98f5721..9107250 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -52,7 +52,6 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.cache30.ClientServerTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
@@ -68,6 +67,8 @@ import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
 /**
  * Tests for QueryMonitoring service.
  *
@@ -76,14 +77,13 @@ import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 @Category(DistributedTest.class)
 public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
-  private static int bridgeServerPort;
-
   private final String exampleRegionName = "exampleRegion";
   private final String exampleRegionName2 = "exampleRegion2";
   private final String poolName = "serverConnectionPool";
-
+  
+  
   /* Some of the queries are commented out as they were taking less time */
-  String[]  queryStr = {
+  String[] queryStr = {
       "SELECT ID FROM /root/exampleRegion p WHERE  p.ID > 100",
       "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pk != '1000'",
       "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pkid != '1'",
@@ -98,15 +98,15 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
       "SELECT DISTINCT ID FROM /root/exampleRegion p WHERE  p.status = 'active'",
       "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
       "SELECT DISTINCT proj1:p, proj2:itrX FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
-      + " WHERE  pos.secId = 'YHOO') as itrX",
+          + " WHERE  pos.secId = 'YHOO') as itrX",
       "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
-      + " WHERE  pos.secId = 'YHOO') as itrX",
+          + " WHERE  pos.secId = 'YHOO') as itrX",
       "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT p.ID FROM /root/exampleRegion x"
-      + " WHERE  x.ID = p.ID) as itrX",
+          + " WHERE  x.ID = p.ID) as itrX",
       "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
-      + " WHERE  x.ID = p.ID) as itrX",
+          + " WHERE  x.ID = p.ID) as itrX",
       "SELECT DISTINCT x.ID FROM /root/exampleRegion x, x.positions.values v WHERE  "
-      + "v.secId = element(SELECT DISTINCT vals.secId FROM /root/exampleRegion p, p.positions.values vals WHERE  vals.secId = 'YHOO')",
+          + "v.secId = element(SELECT DISTINCT vals.secId FROM /root/exampleRegion p, p.positions.values vals WHERE  vals.secId = 'YHOO')",
       "SELECT DISTINCT * FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.status = 'active'",
       "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID",
       "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p2.status = 'active'",
@@ -114,32 +114,32 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
       "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000",
       "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = p2.status",
       "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = 'active'",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId ='IBM')", 
+      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId ='IBM')",
       "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId !='IBM')",
-      "SELECT DISTINCT structset.sos, structset.key " 
-      + "FROM /root/exampleRegion p, p.positions.values outerPos, " 
-      + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
-      + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
-      + "where outerPos.secId != 'IBM' AND "
-      + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
-      + "where structset.sos > 2000",
+      "SELECT DISTINCT structset.sos, structset.key "
+          + "FROM /root/exampleRegion p, p.positions.values outerPos, "
+          + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
+          + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
+          + "where outerPos.secId != 'IBM' AND "
+          + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
+          + "where structset.sos > 2000",
       "SELECT DISTINCT * "
-      + "FROM /root/exampleRegion p, p.positions.values outerPos, "
-      + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
-      + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
-      + "where outerPos.secId != 'IBM' AND " 
-      + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
-      + "where structset.sos > 2000",
+          + "FROM /root/exampleRegion p, p.positions.values outerPos, "
+          + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
+          + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
+          + "where outerPos.secId != 'IBM' AND "
+          + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
+          + "where structset.sos > 2000",
       "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values position "
-      + "WHERE (true = null OR position.secId = 'SUN') AND true", 
+          + "WHERE (true = null OR position.secId = 'SUN') AND true",
   };
 
-  String[]  prQueryStr = {
+  String[] prQueryStr = {
       "SELECT ID FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active'",
       "SELECT * FROM /root/exampleRegion WHERE  ID > 100 and status = 'active'",
       "SELECT DISTINCT * FROM /root/exampleRegion p WHERE   p.ID > 100 and p.status = 'active' and p.ID < 100000",
       "SELECT DISTINCT p.ID FROM /root/exampleRegion p WHERE p.ID > 100 and p.ID < 100000 and p.status = 'active'",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (pos.secId != 'IBM')", 
+      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (pos.secId != 'IBM')",
   };
   
   private int numServers;
@@ -161,27 +161,20 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     // avoid IllegalStateException from HandShake by connecting all vms tor
     // system before creating connection pools
     getSystem();
-
-    SerializableRunnable r = new SerializableRunnable("getSystem") {
-      public void run() {
+    
+    for (int i = 0; i < numServers; i++) {
+      host.getVM(i).invoke("getSystem", () -> {
         getSystem();
-      }
-    };
-
-    for (int i=0; i<numServers; i++) {
-      host.getVM(i).invoke(r);
+        return 0;
+      });
     }
-
-    r = new SerializableRunnable("getClientSystem") {
-      public void run() {
+    
+    for (int i = numServers; i < 4; i++) {
+      host.getVM(i).invoke("getClientSystem", () -> {
         Properties props = DistributedTestUtils.getAllDistributedSystemProperties(new Properties());
-        props.put(DistributionConfigImpl.LOCATORS, "");
+        props.put(LOCATORS, "");
         getSystem(props);
-      }
-    };
-
-    for (int i=numServers; i<4; i++) {
-      host.getVM(i).invoke(r);
+      });
     }
   }
 
@@ -189,100 +182,78 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     createRegion(vm, false, null);
   }
 
-  public void createRegion(VM vm, final boolean eviction, final String dirName){
-    vm.invoke(new CacheSerializableRunnable("Create Regions") {
-      public void run2() throws CacheException {
-        AttributesFactory factory = new AttributesFactory();
-        factory.setScope(Scope.LOCAL);
-        factory.setDataPolicy(DataPolicy.REPLICATE);
-        // setting the eviction attributes.
-        if (eviction) {
-          File []f = new File[1];            
-          f[0] = new File(dirName);
-          f[0].mkdir();
-          DiskStoreFactory dsf = GemFireCacheImpl.getInstance().createDiskStoreFactory();
-          DiskStore ds1 = dsf.setDiskDirs(f).create("ds1");
-          factory.setDiskStoreName("ds1");
-          EvictionAttributes evictAttrs = EvictionAttributes
-            .createLRUEntryAttributes(100, EvictionAction.OVERFLOW_TO_DISK);
-          factory.setEvictionAttributes(evictAttrs);
-        }
-        // Create region
-        createRegion(exampleRegionName, factory.create());
-        createRegion(exampleRegionName2, factory.create());
-      }
-    });
+  private void createRegion(final boolean eviction, final String dirName) {
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.LOCAL);
+    factory.setDataPolicy(DataPolicy.REPLICATE);
+    // setting the eviction attributes.
+    if (eviction) {
+      File[] f = new File[1];
+      f[0] = new File(dirName);
+      f[0].mkdir();
+      DiskStoreFactory dsf = GemFireCacheImpl.getInstance().createDiskStoreFactory();
+      DiskStore ds1 = dsf.setDiskDirs(f).create("ds1");
+      factory.setDiskStoreName("ds1");
+      EvictionAttributes evictAttrs = EvictionAttributes
+          .createLRUEntryAttributes(100, EvictionAction.OVERFLOW_TO_DISK);
+      factory.setEvictionAttributes(evictAttrs);
+    }
+    // Create region
+    createRegion(exampleRegionName, factory.create());
+    createRegion(exampleRegionName2, factory.create());
   }
 
-  public void createPRRegion(VM vm){
-    vm.invoke(new CacheSerializableRunnable("Create Regions") {
-      public void run2() throws CacheException {
-        AttributesFactory factory = new AttributesFactory();
-        //factory.setDataPolicy(DataPolicy.PARTITION);
-        factory.setPartitionAttributes((new PartitionAttributesFactory()).setTotalNumBuckets(8).create());
-        
-        createRegion(exampleRegionName, factory.create());
-        createRegion(exampleRegionName2, factory.create());
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        exampleRegion.getCache().getLogger().fine("#### CREATING PR REGION....");
-      }
-    });
+  private void createPRRegion() {
+    AttributesFactory factory = new AttributesFactory();
+    //factory.setDataPolicy(DataPolicy.PARTITION);
+    factory.setPartitionAttributes((new PartitionAttributesFactory()).setTotalNumBuckets(8).create());
+
+    createRegion(exampleRegionName, factory.create());
+    createRegion(exampleRegionName2, factory.create());
+    Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+    exampleRegion.getCache().getLogger().fine("#### CREATING PR REGION....");
   }
 
-  public void configServer(VM server, final int queryMonitorTime, final String testName){
-    SerializableRunnable initServer = new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        try {
-          startBridgeServer(0, false);
-        } catch (Exception ex) {
-          Assert.fail("While starting CacheServer", ex);
-        }
-        Cache cache = getCache();
-        GemFireCacheImpl.getInstance().TEST_MAX_QUERY_EXECUTION_TIME = queryMonitorTime;
-        cache.getLogger().fine("#### RUNNING TEST : " + testName);
-        DefaultQuery.testHook = new QueryTimeoutHook(queryMonitorTime);
-        //((GemFireCache)cache).TEST_MAX_QUERY_EXECUTION_TIME = queryMonitorTime;
-        System.out.println("MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl)cache).TEST_MAX_QUERY_EXECUTION_TIME);
-      }
-    };
-    server.invoke(initServer);
+  private int configServer(final int queryMonitorTime, final String testName) {
+    int port = 0;
+    try {
+      port = startBridgeServer(0, false);
+    } catch (Exception ex) {
+      Assert.fail("While starting CacheServer", ex);
+    }
+    Cache cache = getCache();
+    GemFireCacheImpl.getInstance().TEST_MAX_QUERY_EXECUTION_TIME = queryMonitorTime;
+    cache.getLogger().fine("#### RUNNING TEST : " + testName);
+    DefaultQuery.testHook = new QueryTimeoutHook(queryMonitorTime);
+    //((GemFireCache)cache).TEST_MAX_QUERY_EXECUTION_TIME = queryMonitorTime;
+    System.out.println("MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl) cache).TEST_MAX_QUERY_EXECUTION_TIME);
+    return port;
   }
 
   // Stop server
-  public void stopServer(VM server){
-    SerializableRunnable stopServer = new SerializableRunnable("Stop CacheServer") {      
+  private void stopServer(VM server) {
+    SerializableRunnable stopServer = new SerializableRunnable("Stop CacheServer") {
       public void run() {
         // Reset the test flag.
         Cache cache = getCache();
         DefaultQuery.testHook = null;
         GemFireCacheImpl.getInstance().TEST_MAX_QUERY_EXECUTION_TIME = -1;
         stopBridgeServer(getCache());
-        System.out.println("MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl)cache).TEST_MAX_QUERY_EXECUTION_TIME);
+        System.out.println("MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl) cache).TEST_MAX_QUERY_EXECUTION_TIME);
       }
     };
     server.invoke(stopServer);
   }
   
-  public void configClient(VM client, VM[] server){
-    final int[] port = new int[server.length];
-    for (int i=0; i < server.length; i++){
-      port[i] = server[i].invoke(() -> QueryMonitorDUnitTest.getCacheServerPort());
-    }
-    final String host0 = NetworkUtils.getServerHostName(server[0].getHost());
-
-    SerializableRunnable initClient = new CacheSerializableRunnable("Init client") {
-      public void run2() throws CacheException {
-        AttributesFactory factory = new AttributesFactory();
-        factory.setScope(Scope.LOCAL);
-        PoolFactory poolFactory = PoolManager.createFactory();
-        poolFactory.setReadTimeout(10 * 60 * 1000); // 10 mins.
-        ClientServerTestCase.configureConnectionPoolWithNameAndFactory(factory, host0, port, true, -1, -1, null, poolName, poolFactory);
-      }
-    };
-    client.invoke(initClient);    
+  private void configClient(String host, int... ports) {
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.LOCAL);
+    PoolFactory poolFactory = PoolManager.createFactory();
+    poolFactory.setReadTimeout(10 * 60 * 1000); // 10 mins.
+    ClientServerTestCase.configureConnectionPoolWithNameAndFactory(factory, host, ports, true, -1, -1, null, poolName, poolFactory);
   }
   
-  public void verifyException(Exception e) {
+  private void verifyException(Exception e) {
     e.printStackTrace();
     String error = e.getMessage();
     if (e.getCause() != null) {
@@ -292,9 +263,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     if (error.contains("Query execution cancelled after exceeding max execution time") ||
         error.contains("The Query completed sucessfully before it got canceled") ||
         error.contains("The QueryMonitor thread may be sleeping longer than the set sleep time") ||
-        error.contains("The query task could not be found but the query is marked as having been canceled")){
+        error.contains("The query task could not be found but the query is marked as having been canceled")) {
       // Expected exception.
-      return;      
+      return;
     }
 
     System.out.println("Unexpected exception:");
@@ -306,7 +277,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     
     fail("Expected exception Not found. Expected exception with message: \n" +
         "\"Query execution taking more than the max execution time\"" + "\n Found \n" +
-        error);    
+        error);
   }
   
   /**
@@ -325,67 +296,77 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     VM client3 = host.getVM(3);
 
     final int numberOfEntries = 100;
+    String serverHostName = NetworkUtils.getServerHostName(host);
 
     // Start server
-    configServer(server, 20, "testQueryMonitorClientServer"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server);
+    int serverPort = server.invoke("Create BridgeServer",
+        () -> configServer(20, "testQueryMonitorClientServer")); // All the queries taking more than 20ms should be canceled by Query monitor.
+    server.invoke("createRegion", () -> createRegion());
     
     // Initialize server regions.
-    server.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-        for (int i= (1 + 100); i <= 200; i++) {
-          exampleRegion2.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server.invoke("populatePortfolioRegions", () -> populatePortfolioRegions(numberOfEntries));
 
     // Initialize Client1 and create client regions.
-    configClient(client1, new VM[] {server});
-    createRegion(client1);
-    
+    client1.invoke("Init client", () -> configClient(serverHostName, serverPort));
+    client1.invoke("createRegion", () -> createRegion());
+
     // Initialize Client2 and create client regions.
-    configClient(client2, new VM[] {server});
-    createRegion(client2);
-    
+    client2.invoke("Init client", () -> configClient(serverHostName, serverPort));
+    client2.invoke("createRegion", () -> createRegion());
+
     // Initialize Client3 and create client regions.
-    configClient(client3, new VM[] {server});
-    createRegion(client3);
+    client3.invoke("Init client", () -> configClient(serverHostName, serverPort));
+    client3.invoke("createRegion", () -> createRegion());
 
     // Execute client queries
-    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
-      public void run2() throws CacheException {
-        try {
-          Pool pool = PoolManager.find(poolName);
-          QueryService queryService = pool.getQueryService();
-          for (int k=0; k < queryStr.length; k++) {
-            String qStr = queryStr[k];
-            try {
-              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
-              Query query = queryService.newQuery(qStr);
-              query.execute();
-              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
-            }catch (Exception e){
-              verifyException(e);
-            }
-          }
-        } catch (Exception ex){
-          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
-        }
-      }
-    };
 
-    client1.invoke(executeQuery);
-    client2.invoke(executeQuery);
-    client3.invoke(executeQuery);
+    client1.invoke("execute Queries", () -> executeQueriesFromClient(20));
+    client2.invoke("execute Queries", () -> executeQueriesFromClient(20));
+    client3.invoke("execute Queries", () -> executeQueriesFromClient(20));
 
     stopServer(server);
   }
 
+  private void executeQueriesFromClient(int timeout) {
+    try {
+      ClientCache anyInstance = ClientCacheFactory.getAnyInstance();
+      ((GemFireCacheImpl) anyInstance).TEST_MAX_QUERY_EXECUTION_TIME = timeout;
+      Pool pool = PoolManager.find(poolName);
+      QueryService queryService = pool.getQueryService();
+      executeQueriesAgainstQueryService(queryService);
+    } catch (Exception ex) {
+      GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
+    }
+  }
+
+  private void executeQueriesOnServer() {
+    try {
+      QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
+      executeQueriesAgainstQueryService(queryService);
+    } catch (Exception ex) {
+      GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
+    }
+  }
+
+  private void executeQueriesAgainstQueryService(QueryService queryService) {
+    for (int k = 0; k < queryStr.length; k++) {
+      String qStr = queryStr[k];
+      executeQuery(queryService, qStr);
+    }
+  }
+
+  private void executeQuery(QueryService queryService, String qStr) {
+    try {
+      GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
+      Query query = queryService.newQuery(qStr);
+      query.execute();
+      fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
+    } catch (Exception e) {
+      System.out.println("queryStr = " + qStr);
+      verifyException(e);
+    }
+  }
+
   /**
    * Tests query execution from client to server (multi server).
    */
@@ -403,74 +384,35 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     final int numberOfEntries = 100;
 
+    String serverHostName = NetworkUtils.getServerHostName(host);
+
     // Start server
-    configServer(server1, 20, "testQueryMonitorMultiClientMultiServer"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server1);
+    int serverPort1 = server1.invoke("Create BridgeServer",
+        () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server1.invoke("createRegion", () -> createRegion());
 
-    configServer(server2, 20, "testQueryMonitorMultiClientMultiServer"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server2);
+    int serverPort2 = server2.invoke("Create BridgeServer",
+        () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server2.invoke("createRegion", () -> createRegion());
 
     // Initialize server regions.
-    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-        for (int i= (1 + 100); i <= 200; i++) {
-          exampleRegion2.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server1.invoke("Create Bridge Server", () -> populatePortfolioRegions(numberOfEntries));
 
     // Initialize server regions.
-    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-        for (int i= (1 + 100); i <= 200; i++) {
-          exampleRegion2.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server2.invoke("Create Bridge Server", () -> populatePortfolioRegions(numberOfEntries));
 
     // Initialize Client1 and create client regions.
-    configClient(client1, new VM[] {server1, server2});
-    createRegion(client1);
-    
+    client1.invoke("Init client", () -> configClient(serverHostName, serverPort1, serverPort2));
+    client1.invoke("createRegion", () -> createRegion());
+
     // Initialize Client2 and create client regions.
-    configClient(client2, new VM[] {server1, server2});
-    createRegion(client2);
-    
+    client2.invoke("Init client", () -> configClient(serverHostName, serverPort1, serverPort2));
+    client2.invoke("createRegion", () -> createRegion());
+
     // Execute client queries
-    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
-      public void run2() throws CacheException {
-        try {
-          Pool pool = PoolManager.find(poolName);
-          QueryService queryService = pool.getQueryService();
-          for (int k=0; k < queryStr.length; k++) {
-            String qStr = queryStr[k];
-            try {
-              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
-              Query query = queryService.newQuery(qStr);
-              query.execute();
-              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
-            }catch (Exception e){
-              verifyException(e);            
-            }
-          }
-        } catch (Exception ex){
-          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
-        }
-      }
-    };
 
-    client1.invoke(executeQuery);
-    client2.invoke(executeQuery);
+    client1.invoke("executeQueriesFromClient", () -> executeQueriesFromClient(20));
+    client2.invoke("executeQueriesFromClient", () -> executeQueriesFromClient(20));
 
     stopServer(server1);
     stopServer(server2);
@@ -493,64 +435,24 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     final int numberOfEntries = 100;
 
     // Start server
-    configServer(server1, 20, "testQueryExecutionLocally"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server1);
+    server1.invoke("Create BridgeServer",
+        () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server1.invoke("createRegion", () -> createRegion());
 
-    configServer(server2, 20, "testQueryExecutionLocally"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server2);
+    server2.invoke("Create BridgeServer",
+        () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server2.invoke("createRegion", () -> createRegion());
 
     // Initialize server regions.
-    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-        for (int i= (1 + 100); i <= 200; i++) {
-          exampleRegion2.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server1.invoke("Create Bridge Server", () -> populatePortfolioRegions(numberOfEntries));
 
     // Initialize server regions.
-    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-        for (int i= (1 + 100); i <= 200; i++) {
-          exampleRegion2.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server2.invoke("Create Bridge Server", () -> populatePortfolioRegions(numberOfEntries));
 
     // Execute server queries
-    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
-      public void run2() throws CacheException {
-        try {
-          QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
-          for (int k=0; k < queryStr.length; k++) {
-            String qStr = queryStr[k];
-            try {
-              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
-              Query query = queryService.newQuery(qStr);
-              query.execute();
-              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
-            }catch (Exception e){ // TODO: this is too broad -- catch only the expected exception
-              verifyException(e);
-            }
-          }
-        } catch (Exception ex){ // TODO: do not catch or rethrow inside AssertionError
-          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
-        }
-      }
-    };
 
-    server1.invoke(executeQuery);
-    server2.invoke(executeQuery);
+    server1.invoke("execute queries on Server", () -> executeQueriesOnServer());
+    server2.invoke("execute queries on Server", () -> executeQueriesOnServer());
 
     stopServer(server1);
     stopServer(server2);
@@ -572,39 +474,19 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     final int numberOfEntries = 1000;
 
     // Start server
-    configServer(server1, 20, "testQueryExecutionLocally"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server1);
+    server1.invoke("Create BridgeServer",
+        () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server1.invoke("createRegion", () -> createRegion());
 
-    configServer(server2, 20, "testQueryExecutionLocally"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server2);
+    server2.invoke("Create BridgeServer",
+        () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server2.invoke("createRegion", () -> createRegion());
 
     // Initialize server regions.
-    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-        for (int i= (1 + 100); i <= 200; i++) {
-          exampleRegion2.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server1.invoke("populatePortfolioRegions", () -> populatePortfolioRegions(numberOfEntries));
 
     // Initialize server regions.
-    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-        for (int i= (1 + 100); i <= 200; i++) {
-          exampleRegion2.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server2.invoke("populatePortfolioRegions", () -> populatePortfolioRegions(numberOfEntries));
 
     // Execute server queries
     SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
@@ -612,28 +494,21 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
         try {
           QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
           String qStr = "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
-            + " WHERE  x.ID = p.ID) as itrX";
-          try {
-            GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
-            Query query = queryService.newQuery(qStr);
-            query.execute();
-            fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
-          }catch (Exception e){
-            verifyException(e);
-          }
+              + " WHERE  x.ID = p.ID) as itrX";
+          executeQuery(queryService, qStr);
 
           // Create index and Perform cache op. Bug#44307
           queryService.createIndex("idIndex", IndexType.FUNCTIONAL, "ID", "/root/exampleRegion");
           queryService.createIndex("statusIndex", IndexType.FUNCTIONAL, "status", "/root/exampleRegion");
           Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-          for (int i= (1 + 100); i <= (numberOfEntries + 200); i++) {
-            exampleRegion.put(""+i, new Portfolio(i));
+          for (int i = (1 + 100); i <= (numberOfEntries + 200); i++) {
+            exampleRegion.put("" + i, new Portfolio(i));
           }
           
-        } catch (Exception ex){
+        } catch (Exception ex) {
           Assert.fail("Exception creating the query service", ex);
         }
-      }      
+      }
     };
 
     server1.invoke(executeQuery);
@@ -642,7 +517,18 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     stopServer(server1);
     stopServer(server2);
   }
-  
+
+  private void populatePortfolioRegions(int numberOfEntries) {
+    Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+    Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+    for (int i = (1 + 100); i <= (numberOfEntries + 100); i++) {
+      exampleRegion.put("" + i, new Portfolio(i));
+    }
+    for (int i = (1 + 100); i <= 200; i++) {
+      exampleRegion2.put("" + i, new Portfolio(i));
+    }
+  }
+
   /**
    * Tests query execution from client to server (multiple server) on Partition Region .
    */
@@ -660,73 +546,49 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     final int numberOfEntries = 100;
 
+    String serverHostName = NetworkUtils.getServerHostName(host);
+
     // Start server
-    configServer(server1, 100, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 100ms should be canceled by Query monitor.
-    createPRRegion(server1);
+    int serverPort1 = server1.invoke("configServer",
+        () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+    server1.invoke("createPRRegion", () -> createPRRegion());
 
-    configServer(server2, 100, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 100ms should be canceled by Query monitor.
-    createPRRegion(server2);
+    int serverPort2 = server2.invoke("configServer",
+        () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+    server2.invoke("createPRRegion", () -> createPRRegion());
     
     // Initialize server regions.
-    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server1.invoke("bulkInsertPorfolio", () -> bulkInsertPorfolio(101, numberOfEntries));
 
     // Initialize server regions.
-    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (numberOfEntries + 100); i <= (numberOfEntries + numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server2.invoke("bulkInsertPorfolio", () ->
+        bulkInsertPorfolio((numberOfEntries + 100), (numberOfEntries + numberOfEntries + 100)));
 
     // Initialize Client1 and create client regions.
-    configClient(client1, new VM[] {server1});
-    createRegion(client1);
+    client1.invoke("Init client", () -> configClient(serverHostName, serverPort1));
+    client1.invoke("createRegion", () -> createRegion());
     
     // Initialize Client2 and create client regions.
-    configClient(client2, new VM[] {server2});
-    createRegion(client2);
+    client2.invoke("Init client", () -> configClient(serverHostName, serverPort2));
+    client2.invoke("createRegion", () -> createRegion());
     
     // Execute client queries
-    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
-      public void run2() throws CacheException {
-        try {
-          Pool pool = PoolManager.find(poolName);
-          QueryService queryService = pool.getQueryService();
-          for (int k=0; k < prQueryStr.length; k++) {
-            String qStr = prQueryStr[k];
-            try {
-              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
-              Query query = queryService.newQuery(qStr);
-              query.execute();
-              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
-            }catch (Exception e){
-              verifyException(e);            
-            }
-          }
-        } catch (Exception ex){
-          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
-        }
-      }
-    };
 
-    client1.invoke(executeQuery);
-    client2.invoke(executeQuery);
+    client1.invoke("Execute Queries", () -> executeQueriesFromClient(20));
+    client2.invoke("Execute Queries", () -> executeQueriesFromClient(20));
 
     stopServer(server1);
     stopServer(server2);
   }
 
+  private void bulkInsertPorfolio(int startingId, int numberOfEntries) {
+    Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+    Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+    for (int i = startingId; i <= (numberOfEntries + 100); i++) {
+      exampleRegion.put("" + i, new Portfolio(i));
+    }
+  }
+
   /**
    * Tests query execution on Partition Region, executes query locally.
    */
@@ -743,59 +605,31 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     final int numberOfEntries = 100;
 
     // Start server
-    configServer(server1, 100, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 100ms should be canceled by Query monitor.
-    createPRRegion(server1);
+    server1.invoke("configServer",
+        () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+    server1.invoke("Create Partition Regions", () -> createPRRegion());
 
-    configServer(server2, 100, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 100ms should be canceled by Query monitor.
-    createPRRegion(server2);
+    server2.invoke("configServer",
+        () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+    server2.invoke("Create Partition Regions", () -> createPRRegion());
 
-    
     // Initialize server regions.
     server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
       public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
+        bulkInsertPorfolio(101, numberOfEntries);
       }
     });
 
     // Initialize server regions.
     server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
       public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (numberOfEntries + 100); i <= (numberOfEntries + numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
+        bulkInsertPorfolio((numberOfEntries + 100), (numberOfEntries + numberOfEntries + 100));
       }
     });
     
     // Execute client queries
-    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
-      public void run2() throws CacheException {
-        try {
-          QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
-          for (int k=0; k < prQueryStr.length; k++) {
-            String qStr = prQueryStr[k];
-            try {
-              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
-              Query query = queryService.newQuery(qStr);
-              query.execute();
-              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
-            }catch (Exception e){
-              verifyException(e);            
-            }
-          }
-        } catch (Exception ex){
-          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
-        }
-      }
-    };
-
-    server1.invoke(executeQuery);
-    server2.invoke(executeQuery);
+    server1.invoke("execute queries on server", () -> executeQueriesOnServer());
+    server2.invoke("execute queries on server", () -> executeQueriesOnServer());
 
     stopServer(server1);
     stopServer(server2);
@@ -817,69 +651,42 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     final int numberOfEntries = 100;
 
+    String serverHostName = NetworkUtils.getServerHostName(host);
+
     // Start server
-    configServer(server1, 20, "testQueryMonitorRegionWithEviction"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server1, true, "server1_testQueryMonitorRegionWithEviction");
+    int serverPort1 = server1.invoke("Create BridgeServer",
+        () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server1.invoke("createRegion", () -> createRegion(true, "server1_testQueryMonitorRegionWithEviction"));
 
-    configServer(server2, 20, "testQueryMonitorRegionWithEviction"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server2, true, "server2_testQueryMonitorRegionWithEviction");
+    int serverPort2 = server2.invoke("Create BridgeServer",
+        () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server2.invoke("createRegion", () -> createRegion(true, "server2_testQueryMonitorRegionWithEviction"));
 
-    
     // Initialize server regions.
     server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
       public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
+        bulkInsertPorfolio(101, numberOfEntries);
       }
     });
 
     // Initialize server regions.
     server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
       public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        for (int i= (numberOfEntries + 100); i <= (numberOfEntries + numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
+        bulkInsertPorfolio((numberOfEntries + 100), (numberOfEntries + numberOfEntries + 100));
       }
     });
 
     // Initialize Client1 and create client regions.
-    configClient(client1, new VM[] {server1});
-    createRegion(client1);
+    client1.invoke("Init client", () -> configClient(serverHostName, serverPort1));
+    client1.invoke("createRegion", () -> createRegion());
     
     // Initialize Client2 and create client regions.
-    configClient(client2, new VM[] {server2});
-    createRegion(client2);
+    client2.invoke("Init client", () -> configClient(serverHostName, serverPort2));
+    client2.invoke("createRegion", () -> createRegion());
     
     // Execute client queries
-    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
-      public void run2() throws CacheException {
-        try {
-          Pool pool = PoolManager.find(poolName);
-          QueryService queryService = pool.getQueryService();
-          for (int k=0; k < prQueryStr.length; k++) {
-            String qStr = prQueryStr[k];
-            try {
-              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
-              Query query = queryService.newQuery(qStr);
-              query.execute();
-              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
-            }catch (Exception e){
-              verifyException(e);
-            }
-          }
-        } catch (Exception ex){
-          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
-        }
-      }
-    };
-
-    client1.invoke(executeQuery);
-    client2.invoke(executeQuery);
+    client1.invoke("Execute Queries", () -> executeQueriesFromClient(20));
+    client2.invoke("Execute Queries", () -> executeQueriesFromClient(20));
 
     stopServer(server1);
     stopServer(server2);
@@ -902,124 +709,76 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     final int numberOfEntries = 100;
 
+    String serverHostName = NetworkUtils.getServerHostName(host);
+
     // Start server
-    configServer(server1, 20, "testQueryMonitorRegionWithIndex"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server1);
+    int serverPort1 = server1.invoke("configServer",
+        () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server1.invoke("createRegion", () -> createRegion());
 
-    configServer(server2, 20, "testQueryMonitorRegionWithIndex"); // All the queries taking more than 20ms should be canceled by Query monitor.
-    createRegion(server2);
+    int serverPort2 = server2.invoke("configServer",
+        () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
+    server2.invoke("createRegion", () -> createRegion());
 
-//    pause(1000);
-    
+    //    pause(1000);
 
     // Initialize server regions.
-    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-       
-        try {
-        // create index.
-        QueryService cacheQS = GemFireCacheImpl.getInstance().getQueryService();
-        cacheQS.createIndex("idIndex", IndexType.FUNCTIONAL,"p.ID","/root/exampleRegion p");
-        cacheQS.createIndex("statusIndex", IndexType.FUNCTIONAL,"p.status","/root/exampleRegion p");
-        cacheQS.createIndex("secIdIndex", IndexType.FUNCTIONAL,"pos.secId","/root/exampleRegion p, p.positions.values pos");
-        cacheQS.createIndex("posIdIndex", IndexType.FUNCTIONAL,"pos.Id","/root/exampleRegion p, p.positions.values pos");
-        cacheQS.createIndex("pkIndex", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion");
-        cacheQS.createIndex("pkidIndex", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion");
-        cacheQS.createIndex("idIndex2", IndexType.FUNCTIONAL,"p2.ID","/root/exampleRegion2 p2");
-        cacheQS.createIndex("statusIndex2", IndexType.FUNCTIONAL,"p2.status","/root/exampleRegion2 p2");
-        cacheQS.createIndex("secIdIndex2", IndexType.FUNCTIONAL,"pos.secId","/root/exampleRegion2 p2, p2.positions.values pos");
-        cacheQS.createIndex("posIdIndex2", IndexType.FUNCTIONAL,"pos.Id","/root/exampleRegion2 p2, p2.positions.values pos");
-        cacheQS.createIndex("pkIndex2", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion2");
-        cacheQS.createIndex("pkidIndex2", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion2");
-        } catch (Exception ex) {
-        }
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-        for (int i= (1 + 100); i <= (200 + 100); i++) {
-          exampleRegion2.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server1.invoke("Create Indexes", () -> createIndexes(numberOfEntries));
 
     // Initialize server regions.
-    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-      public void run2() throws CacheException {
-        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
-        // create index.
-        try {
-        QueryService cacheQS = GemFireCacheImpl.getInstance().getQueryService();
-        cacheQS.createIndex("idIndex", IndexType.FUNCTIONAL,"p.ID","/root/exampleRegion p");
-        cacheQS.createIndex("statusIndex", IndexType.FUNCTIONAL,"p.status","/root/exampleRegion p");
-        cacheQS.createIndex("secIdIndex", IndexType.FUNCTIONAL,"pos.secId","/root/exampleRegion p, p.positions.values pos");
-        cacheQS.createIndex("posIdIndex", IndexType.FUNCTIONAL,"pos.Id","/root/exampleRegion p, p.positions.values pos");
-        cacheQS.createIndex("pkIndex", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion");
-        cacheQS.createIndex("pkidIndex", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion");
-        cacheQS.createIndex("idIndex2", IndexType.FUNCTIONAL,"p2.ID","/root/exampleRegion2 p2");
-        cacheQS.createIndex("statusIndex2", IndexType.FUNCTIONAL,"p2.status","/root/exampleRegion2 p2");
-        cacheQS.createIndex("secIdIndex2", IndexType.FUNCTIONAL,"pos.secId","/root/exampleRegion2 p2, p2.positions.values pos");
-        cacheQS.createIndex("posIdIndex2", IndexType.FUNCTIONAL,"pos.Id","/root/exampleRegion2 p2, p2.positions.values pos");
-        cacheQS.createIndex("pkIndex2", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion2");
-        cacheQS.createIndex("pkidIndex2", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion2");
-        } catch (Exception ex) {
-        }
-
-        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
-        }
-        for (int i= (1 + 100); i <= (200 + 100); i++) {
-          exampleRegion2.put(""+i, new Portfolio(i));
-        }
-      }
-    });
+    server2.invoke("Create Indexes", () -> createIndexes(numberOfEntries));
 
     // Initialize Client1 and create client regions.
-    configClient(client1, new VM[] {server1});
-    createRegion(client1);
-    
+    client1.invoke("Init client", () -> configClient(serverHostName, serverPort1));
+    client1.invoke("createRegion", () -> createRegion());
+
     // Initialize Client2 and create client regions.
-    configClient(client2, new VM[] {server2});
-    createRegion(client2);
-    
-    // Execute client queries
-    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
-      public void run2() throws CacheException {
-        try {
-          Pool pool = PoolManager.find(poolName);
-          QueryService queryService = pool.getQueryService();
-          for (int k=0; k < queryStr.length; k++) {
-            String qStr = queryStr[k];
-            try {
-              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
-              Query query = queryService.newQuery(qStr);
-              query.execute();
-              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
-            }catch (Exception e){
-              verifyException(e);
-            }
-          }
-        } catch (Exception ex){
-          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
-        }
-      }
-    };
+    client2.invoke("Init client", () -> configClient(serverHostName, serverPort2));
+    client2.invoke("createRegion", () -> createRegion());
 
-    client1.invoke(executeQuery);
-    client2.invoke(executeQuery);
+    // Execute client queries
+    client1.invoke("executeQueriesFromClient", () -> executeQueriesFromClient(20));
+    client2.invoke("executeQueriesFromClient", () -> executeQueriesFromClient(20));
 
     stopServer(server1);
     stopServer(server2);
   }
-  
+
+  private void createIndexes(int numberOfEntries) {
+    Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+    Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+
+    try {
+      // create index.
+      QueryService cacheQS = GemFireCacheImpl.getInstance().getQueryService();
+      cacheQS.createIndex("idIndex", IndexType.FUNCTIONAL, "p.ID", "/root/exampleRegion p");
+      cacheQS.createIndex("statusIndex", IndexType.FUNCTIONAL, "p.status", "/root/exampleRegion p");
+      cacheQS.createIndex("secIdIndex", IndexType.FUNCTIONAL, "pos.secId", "/root/exampleRegion p, p.positions.values pos");
+      cacheQS.createIndex("posIdIndex", IndexType.FUNCTIONAL, "pos.Id", "/root/exampleRegion p, p.positions.values pos");
+      cacheQS.createIndex("pkIndex", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion");
+      cacheQS.createIndex("pkidIndex", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion");
+      cacheQS.createIndex("idIndex2", IndexType.FUNCTIONAL, "p2.ID", "/root/exampleRegion2 p2");
+      cacheQS.createIndex("statusIndex2", IndexType.FUNCTIONAL, "p2.status", "/root/exampleRegion2 p2");
+      cacheQS.createIndex("secIdIndex2", IndexType.FUNCTIONAL, "pos.secId", "/root/exampleRegion2 p2, p2.positions.values pos");
+      cacheQS.createIndex("posIdIndex2", IndexType.FUNCTIONAL, "pos.Id", "/root/exampleRegion2 p2, p2.positions.values pos");
+      cacheQS.createIndex("pkIndex2", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion2");
+      cacheQS.createIndex("pkidIndex2", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion2");
+    } catch (Exception ex) {
+    }
+    for (int i = (1 + 100); i <= (numberOfEntries + 100); i++) {
+      exampleRegion.put("" + i, new Portfolio(i));
+    }
+    for (int i = (1 + 100); i <= (200 + 100); i++) {
+      exampleRegion2.put("" + i, new Portfolio(i));
+    }
+  }
   
   protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest();
 
   /**
    * The following CQ test is added to make sure TEST_MAX_QUERY_EXECUTION_TIME is reset
    * and is not affecting other query related tests.
+   *
    * @throws Exception
    */
   @Test
@@ -1050,51 +809,49 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     
     // do destroys and invalidates.
     server.invoke(new CacheSerializableRunnable("Create values") {
-      public void run2() throws CacheException
-      {
+      public void run2() throws CacheException {
         Cache cache = getCache();
-        System.out.println("TEST CQ MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl)cache).TEST_MAX_QUERY_EXECUTION_TIME);
+        System.out.println("TEST CQ MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl) cache).TEST_MAX_QUERY_EXECUTION_TIME);
 
         Region region1 = getRootRegion().getSubregion(cqDUnitTest.regions[0]);
         for (int i = 1; i <= 5; i++) {
-          region1.destroy( CqQueryDUnitTest.KEY + i);
+          region1.destroy(CqQueryDUnitTest.KEY + i);
         }
       }
     });
     for (int i = 1; i <= 5; i++) {
-      cqDUnitTest.waitForDestroyed(client, name , CqQueryDUnitTest.KEY+i);
+      cqDUnitTest.waitForDestroyed(client, name, CqQueryDUnitTest.KEY + i);
     }
     // recreate the key values from 1 - 5
     cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 5);
     // wait for all creates to arrive.
     for (int i = 1; i <= 5; i++) {
-      cqDUnitTest.waitForCreated(client, name , CqQueryDUnitTest.KEY+i);
+      cqDUnitTest.waitForCreated(client, name, CqQueryDUnitTest.KEY + i);
     }
     
     // do more puts to push first five key-value to disk.
     cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 10);
     // do invalidates on fisrt five keys.
     server.invoke(new CacheSerializableRunnable("Create values") {
-      public void run2() throws CacheException
-      {
+      public void run2() throws CacheException {
         Cache cache = getCache();
-        System.out.println("TEST CQ MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl)cache).TEST_MAX_QUERY_EXECUTION_TIME);
+        System.out.println("TEST CQ MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl) cache).TEST_MAX_QUERY_EXECUTION_TIME);
 
         Region region1 = getRootRegion().getSubregion(cqDUnitTest.regions[0]);
         for (int i = 1; i <= 5; i++) {
-          region1.invalidate( CqQueryDUnitTest.KEY + i);
+          region1.invalidate(CqQueryDUnitTest.KEY + i);
         }
       }
     });
     // wait for invalidates now.
     for (int i = 1; i <= 5; i++) {
-      cqDUnitTest.waitForInvalidated(client, name , CqQueryDUnitTest.KEY+i);
+      cqDUnitTest.waitForInvalidated(client, name, CqQueryDUnitTest.KEY + i);
     }
-        
+
     // Close.
     cqDUnitTest.closeClient(client);
     cqDUnitTest.closeServer(server);
-  
+
   }
 
   /**
@@ -1115,17 +872,17 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     final int numberOfEntries = 1000;
 
     // Start server
-    configServer(server1, 5, "testQueryExecutionLocally"); 
-    createPRRegion(server1);
+    server1.invoke("Create BridgeServer", () -> configServer(5, "testQueryExecutionLocally"));
+    server1.invoke("Create Partition Regions", () -> createPRRegion());
 
-    configServer(server2, 5, "testQueryExecutionLocally"); 
-    createPRRegion(server2);
+    server2.invoke("Create BridgeServer", () -> configServer(5, "testQueryExecutionLocally"));
+    server2.invoke("Create Partition Regions", () -> createPRRegion());
 
-    configServer(server3, 5, "testQueryExecutionLocally"); 
-    createPRRegion(server3);
-    
-    configServer(server4, 5, "testQueryExecutionLocally"); 
-    createPRRegion(server4);
+    server3.invoke("Create BridgeServer", () -> configServer(5, "testQueryExecutionLocally"));
+    server3.invoke("Create Partition Regions", () -> createPRRegion());
+
+    server4.invoke("Create BridgeServer", () -> configServer(5, "testQueryExecutionLocally"));
+    server4.invoke("Create Partition Regions", () -> createPRRegion());
     
     server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
       public void run2() throws CacheException {
@@ -1137,8 +894,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
           fail("Failed to create index.");
         }
         Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        for (int i= 100; i <= (numberOfEntries); i++) {
-          exampleRegion.put(""+i, new Portfolio(i));
+        for (int i = 100; i <= (numberOfEntries); i++) {
+          exampleRegion.put("" + i, new Portfolio(i));
         }
       }
     });
@@ -1147,22 +904,21 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     AsyncInvocation ai1 = server1.invokeAsync(new CacheSerializableRunnable("Create Bridge Server") {
       public void run2() throws CacheException {
         Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        for (int j=0; j < 5; j++) {
-          for (int i= 1; i <= (numberOfEntries + 1000); i++) {
-            exampleRegion.put(""+i, new Portfolio(i));
+        for (int j = 0; j < 5; j++) {
+          for (int i = 1; i <= (numberOfEntries + 1000); i++) {
+            exampleRegion.put("" + i, new Portfolio(i));
           }
         }
         LogWriterUtils.getLogWriter().info("### Completed updates in server1 in testCacheOpAfterQueryCancel");
       }
     });
 
-   
     AsyncInvocation ai2 = server2.invokeAsync(new CacheSerializableRunnable("Create Bridge Server") {
       public void run2() throws CacheException {
         Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
-        for (int j=0; j < 5; j++) {
-          for (int i= (1 + 1000); i <= (numberOfEntries + 2000); i++) {
-            exampleRegion.put(""+i, new Portfolio(i));
+        for (int j = 0; j < 5; j++) {
+          for (int i = (1 + 1000); i <= (numberOfEntries + 2000); i++) {
+            exampleRegion.put("" + i, new Portfolio(i));
           }
         }
         LogWriterUtils.getLogWriter().info("### Completed updates in server2 in testCacheOpAfterQueryCancel");
@@ -1176,11 +932,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
           Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
           QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
           String qStr = "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values pos1, p.positions.values pos" +
-            " where p.ID < pos.sharesOutstanding OR p.ID > 0 OR p.position1.mktValue > 0 " +
-            " OR pos.secId in SET ('SUN', 'IBM', 'YHOO', 'GOOG', 'MSFT', " +
-            " 'AOL', 'APPL', 'ORCL', 'SAP', 'DELL', 'RHAT', 'NOVL', 'HP')" +
-            " order by p.status, p.ID desc";
-          for (int i=0; i < 500; i++) {
+              " where p.ID < pos.sharesOutstanding OR p.ID > 0 OR p.position1.mktValue > 0 " +
+              " OR pos.secId in SET ('SUN', 'IBM', 'YHOO', 'GOOG', 'MSFT', " +
+              " 'AOL', 'APPL', 'ORCL', 'SAP', 'DELL', 'RHAT', 'NOVL', 'HP')" +
+              " order by p.status, p.ID desc";
+          for (int i = 0; i < 500; i++) {
             try {
               GemFireCacheImpl.getInstance().getLogger().info("Executing query :" + qStr);
               Query query = queryService.newQuery(qStr);
@@ -1188,19 +944,19 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
             } catch (QueryExecutionTimeoutException qet) {
               LogWriterUtils.getLogWriter().info("### Got Expected QueryExecutionTimeout exception. " +
                   qet.getMessage());
-              if (qet.getMessage().contains("cancelled after exceeding max execution")){
+              if (qet.getMessage().contains("cancelled after exceeding max execution")) {
                 LogWriterUtils.getLogWriter().info("### Doing a put operation");
-                exampleRegion.put(""+i, new Portfolio(i));
+                exampleRegion.put("" + i, new Portfolio(i));
               }
-            } catch (Exception e){
+            } catch (Exception e) {
               fail("Exception executing query." + e.getMessage());
             }
           }
           LogWriterUtils.getLogWriter().info("### Completed Executing queries in testCacheOpAfterQueryCancel");
-        } catch (Exception ex){
+        } catch (Exception ex) {
           Assert.fail("Exception creating the query service", ex);
         }
-      }      
+      }
     };
 
     AsyncInvocation ai3 = server3.invokeAsync(executeQuery);
@@ -1230,11 +986,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     stopServer(server4);
   }
 
-  public void validateQueryMonitorThreadCnt(VM vm, final int threadCount, final int waitTime){
+  private void validateQueryMonitorThreadCnt(VM vm, final int threadCount, final int waitTime) {
     SerializableRunnable validateThreadCnt = new CacheSerializableRunnable("validateQueryMonitorThreadCnt") {
       public void run2() throws CacheException {
         Cache cache = getCache();
-        QueryMonitor qm = ((GemFireCacheImpl)cache).getQueryMonitor();
+        QueryMonitor qm = ((GemFireCacheImpl) cache).getQueryMonitor();
         if (qm == null) {
           fail("Didn't found query monitor.");
         }
@@ -1243,10 +999,10 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
           if (qm.getQueryMonitorThreadCount() != threadCount) {
             if (waited <= waitTime) {
               Wait.pause(10);
-              waited+=10;
+              waited += 10;
               continue;
             } else {
-              fail ("Didn't found expected monitoring thread. Expected: " + threadCount +
+              fail("Didn't found expected monitoring thread. Expected: " + threadCount +
                   " found :" + qm.getQueryMonitorThreadCount());
             }
           }
@@ -1263,52 +1019,48 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
    * deserializeValues and notifyBySubscription to serve up the
    * given region.
    */
-  protected void startBridgeServer(int port, boolean notifyBySubscription)
-  throws IOException {
+  protected int startBridgeServer(int port, boolean notifyBySubscription)
+      throws IOException {
 
     Cache cache = getCache();
     CacheServer bridge = cache.addCacheServer();
     bridge.setPort(port);
     bridge.setNotifyBySubscription(notifyBySubscription);
     bridge.start();
-    bridgeServerPort = bridge.getPort();
+    return bridge.getPort();
   }
 
   /**
    * Stops the bridge server that serves up the given cache.
    */
-  protected void stopBridgeServer(Cache cache) {
+  private void stopBridgeServer(Cache cache) {
     CacheServer bridge =
-      (CacheServer) cache.getCacheServers().iterator().next();
+        (CacheServer) cache.getCacheServers().iterator().next();
     bridge.stop();
     assertFalse(bridge.isRunning());
   }
 
-  private static int getCacheServerPort() {
-    return bridgeServerPort;
-  }
-  
   private class QueryTimeoutHook implements DefaultQuery.TestHook {
     long timeout;
-    public QueryTimeoutHook(long timeout) {
+
+    private QueryTimeoutHook(long timeout) {
       this.timeout = timeout;
     }
-    
+
     public void doTestHook(String description) {
       if (description.equals("6")) {
         try {
           Thread.sleep(timeout * 2);
-        }
-        catch (InterruptedException ie) {
+        } catch (InterruptedException ie) {
           Thread.currentThread().interrupt();
         }
       }
     }
-    
+
     public void doTestHook(int spot) {
       doTestHook("" + spot);
     }
-    
+
   }
 
 }


[02/17] incubator-geode git commit: GEODE-1377: Updating JavaDocs to point to the correct property definitions

Posted by ud...@apache.org.
GEODE-1377: Updating JavaDocs to point to the correct property definitions


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

Branch: refs/heads/develop
Commit: cc249d5de4c77c9e448a4a2790a54ca9de345ca4
Parents: ad7fd7e
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Jun 9 07:41:27 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Jun 10 05:39:36 2016 +1000

----------------------------------------------------------------------
 .../internal/DistributionConfig.java            | 1246 ++++++++----------
 1 file changed, 535 insertions(+), 711 deletions(-)
----------------------------------------------------------------------



[06/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
index 7f26156..404096f 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationOffHeapIntegrationTest.java
@@ -21,7 +21,7 @@ package com.gemstone.gemfire.cache.lucene;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.RegionShortcut;
 import com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.offheap.MemoryAllocatorImpl;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -49,7 +49,7 @@ public class LuceneIndexCreationOffHeapIntegrationTest extends LuceneIntegration
   @Override
   protected CacheFactory getCacheFactory() {
     CacheFactory factory = super.getCacheFactory();
-    factory.set(DistributedSystemConfigProperties.OFF_HEAP_MEMORY_SIZE, "100m");
+    factory.set(ConfigurationProperties.OFF_HEAP_MEMORY_SIZE, "100m");
     return factory;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java
index ff91873..f56966a 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIntegrationTest.java
@@ -23,11 +23,12 @@ import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
+
 import org.junit.After;
 import org.junit.Before;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 
 public class LuceneIntegrationTest {
@@ -53,8 +54,8 @@ public class LuceneIntegrationTest {
   protected CacheFactory getCacheFactory() {
     CacheFactory cf = new CacheFactory();
     cf.set(MCAST_PORT, "0");
-    cf.set(DistributedSystemConfigProperties.LOCATORS, "");
-    cf.set(DistributedSystemConfigProperties.LOG_LEVEL, System.getProperty("logLevel", "info"));
+    cf.set(ConfigurationProperties.LOCATORS, "");
+    cf.set(ConfigurationProperties.LOG_LEVEL, System.getProperty("logLevel", "info"));
     return cf;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
index 65e296d..67f318b 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexRecoveryHAIntegrationTest.java
@@ -39,7 +39,7 @@ import org.junit.experimental.categories.Category;
 
 import java.io.IOException;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
index 9ecaaa3..505bfd2 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImplIntegrationTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.rules.ExpectedException;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
index 8ed3ba5..15ef449 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
@@ -57,7 +57,7 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Microbenchmark of the IndexRepository to compare an

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
index 8329a47..ec360e5 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlGeneratorIntegrationJUnitTest.java
@@ -36,7 +36,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
 import java.nio.charset.Charset;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
index e88a3ee..6660ae9 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/xml/LuceneIndexXmlParserIntegrationJUnitTest.java
@@ -47,7 +47,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java
index ce338d6..4844823 100644
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/testbed/GemFireDistributedSystem.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
index 39c934d..245e89c 100644
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
@@ -44,7 +44,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class Server {
   private static final String DEFAULT_HOST = "127.0.0.1"; //"localhost"

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
index e102d08..5ab8d0e 100755
--- a/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
+++ b/geode-rebalancer/src/test/java/com/gemstone/gemfire/cache/util/AutoBalancerIntegrationJUnitTest.java
@@ -37,7 +37,7 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.jayway.awaitility.Awaitility.await;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.Matchers.equalTo;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index c0b8476..f076aef 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
index 46b3461..64b1906 100755
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/CacheClientNotifierDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 8cc03d8..358ffaf 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 37d061a..0ac13d4 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.disttx;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import org.junit.Ignore;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
index 541e5a3..338f253 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index 4c1746a..2d7a392 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
index 2d7d42e..9df768e 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -38,7 +38,7 @@ import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index 3435d5d..0d16804 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index 275d685..e2fe10b 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index edcfa78..7776402 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index 750f416..af72ed1 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -39,7 +39,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
 import static com.gemstone.gemfire.test.dunit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index 74137e8..9b0953e 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -32,8 +32,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
index 3d6458b..c084e76 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
@@ -33,7 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
index 36b856a..23ca687 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
@@ -30,8 +30,8 @@ import org.junit.experimental.categories.Category;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 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.pause;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
index 2234566..c627353 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
@@ -30,8 +30,8 @@ import org.junit.experimental.categories.Category;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 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.pause;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
index 543222c..74839a9 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+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.pause;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
index ded6be1..a33d793 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+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.pause;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index 6b3fa73..1a145cb 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+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.pause;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index 5e13790..609885d 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+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.pause;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
index 048bd37..362df80 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
@@ -29,8 +29,8 @@ import org.junit.experimental.categories.Category;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 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.pause;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 50466b5..692f92f 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
@@ -62,7 +62,7 @@ import java.net.UnknownHostException;
 import java.util.*;
 import java.util.Map.Entry;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
 import static com.gemstone.gemfire.internal.FileUtil.delete;
 import static com.gemstone.gemfire.internal.FileUtil.deleteMatching;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
index 4c687f7..27c948b 100644
--- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
+++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java
@@ -16,10 +16,10 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*;
 import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*;
 import static com.gemstone.gemfire.util.test.TestUtil.*;
 import static org.junit.Assert.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.io.File;
 import java.util.Properties;



[07/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java
index 7885fdf..aeba535 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/SortedSetsJUnitTest.java
@@ -32,7 +32,7 @@ import java.io.IOException;
 import java.util.*;
 import java.util.Map.Entry;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java
index 600af1b..1c31356 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/redis/StringsJunitTest.java
@@ -30,7 +30,7 @@ import redis.clients.jedis.Jedis;
 import java.io.IOException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
index c02a8bb..8a7a470 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthenticationTestUtils.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.Region;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
 import static com.gemstone.gemfire.security.SecurityTestUtils.*;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
index b5a088b..c222e6c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
@@ -18,7 +18,7 @@
  */
 package com.gemstone.gemfire.security;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePort.*;
 import static com.gemstone.gemfire.security.SecurityTestUtils.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
index b9d2d2d..cb1836e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/P2PAuthenticationDUnitTest.java
@@ -18,8 +18,8 @@
  */
 package com.gemstone.gemfire.security;
 
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.distributed.Locator;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
@@ -43,7 +43,7 @@ import org.junit.experimental.categories.Category;
 import javax.net.ssl.SSLHandshakeException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
 import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
 import static com.gemstone.gemfire.security.SecurityTestUtils.startLocator;
@@ -92,9 +92,9 @@ public class P2PAuthenticationDUnitTest extends JUnit4DistributedTestCase {
 
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "26753");
-    props.setProperty(DistributedSystemConfigProperties.LOCATORS, getIPLiteral() + "[" + port + "]");
-    props.setProperty(DistributedSystemConfigProperties.SECURITY_PEER_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create");
-    props.setProperty(DistributedSystemConfigProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
+    props.setProperty(ConfigurationProperties.LOCATORS, getIPLiteral() + "[" + port + "]");
+    props.setProperty(ConfigurationProperties.SECURITY_PEER_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create");
+    props.setProperty(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
 
     try {
       Locator.startLocatorAndDS(port, null, null, props);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
index c5bfa4c..b3eb186 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/SecurityTestUtils.java
@@ -19,7 +19,7 @@
 package com.gemstone.gemfire.security;
 
 import static com.gemstone.gemfire.cache30.ClientServerTestCase.*;
-import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePort.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
index 502b765..7cde86d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
@@ -29,7 +29,7 @@ import java.security.Principal;
 import java.util.Properties;
 import java.util.Random;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class LdapUserCredentialGenerator extends CredentialGenerator {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
index a15a3e3..c591732 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/SSLCredentialGenerator.java
@@ -25,7 +25,7 @@ import java.io.IOException;
 import java.security.Principal;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class SSLCredentialGenerator extends CredentialGenerator {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
index bc967db..cf6ce9a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
@@ -29,7 +29,7 @@ import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * <code>DistributedTestUtils</code> provides static utility methods that 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java
index 425bd64..885b1ec 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/LogWriterUtils.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.test.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
index db5be9c..73218e0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/cache/internal/JUnit4CacheTestCase.java
@@ -59,7 +59,7 @@ import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * This class is the base class for all distributed tests using JUnit 4 that

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
index cdabd42..9f962db 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/internal/JUnit4DistributedTestCase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.test.dunit.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
 import com.gemstone.gemfire.cache.Cache;
@@ -54,8 +54,8 @@ import java.io.Serializable;
 import java.text.DecimalFormat;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertNotNull;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
index cb517bb..b53327d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
@@ -50,7 +50,7 @@ import java.rmi.server.UnicastRemoteObject;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * A class to build a fake test configuration and launch some DUnit VMS.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
index b191013..6f8f8ca 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
@@ -33,7 +33,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
index 62feeb9..053ecd0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/JUnit4OverridingGetPropertiesDisconnectsAllDUnitTest.java
@@ -23,7 +23,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.Invoke.invokeInEveryVM;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
index 0a4b5d7..e62908a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/tests/OverridingGetPropertiesDisconnectsAllDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.test.dunit.tests;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Invoke.*;
 import static org.junit.Assert.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
index 5915eb7..de02f1a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/golden/GoldenTestCase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.test.golden;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.process.ProcessWrapper;
@@ -29,7 +29,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Test framework for launching processes and comparing output to expected golden output.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
index 645dd30..50c7307 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/process/ProcessWrapper.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.test.process;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.internal.logging.LogService;
 import org.apache.logging.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
index 51c4d0d..53c9ecd 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 
 import java.util.Set;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * This is a member representing site 1 who wants to send data to site 2

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
index afe22bb..0386e78 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
@@ -16,7 +16,7 @@
  */
 package com.main;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.distributed.Locator;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * This is a stand alone locator with a distributed-system-id = -1

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
index 7f82750..3cf6673 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.wan.GatewayReceiver;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * This is a member representing site 2 who wants to receive data from site 1

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
index 467af82..99747e2 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * This is a stand alone locator with a distributed-system-id = -2

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
index 0cb1c14..cee0af4 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.cq;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
index 53d473e..071ce2e 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.HashSet;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index 25d3380..c2216a6 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index d8fff8b..4827abf 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
index 6ba1e14..d95bfcd 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index 2b34dbd..c7b7b0f 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
index 06f1383..0032ee2 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index 9107250..9b0e974 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -14,18 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.gemstone.gemfire.cache.query.dunit;
 
-import static org.junit.Assert.*;
+package com.gemstone.gemfire.cache.query.dunit;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Properties;
 
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheException;
@@ -37,6 +32,8 @@ import com.gemstone.gemfire.cache.EvictionAttributes;
 import com.gemstone.gemfire.cache.PartitionAttributesFactory;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
 import com.gemstone.gemfire.cache.client.Pool;
 import com.gemstone.gemfire.cache.client.PoolFactory;
 import com.gemstone.gemfire.cache.client.PoolManager;
@@ -67,11 +64,15 @@ import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
 
 /**
  * Tests for QueryMonitoring service.
- *
  * @since GemFire 6.0
  */
 @Category(DistributedTest.class)
@@ -80,68 +81,68 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   private final String exampleRegionName = "exampleRegion";
   private final String exampleRegionName2 = "exampleRegion2";
   private final String poolName = "serverConnectionPool";
-  
-  
+
+
   /* Some of the queries are commented out as they were taking less time */
   String[] queryStr = {
-      "SELECT ID FROM /root/exampleRegion p WHERE  p.ID > 100",
-      "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pk != '1000'",
-      "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pkid != '1'",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pk > '1'",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pkid != '53'",
-      "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100",
-      "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100 and pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
-      "SELECT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
-      "SELECT * FROM /root/exampleRegion WHERE  ID > 100 and status = 'active'",
-      "SELECT DISTINCT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
-      "SELECT DISTINCT ID FROM /root/exampleRegion WHERE  status = 'active'",
-      "SELECT DISTINCT ID FROM /root/exampleRegion p WHERE  p.status = 'active'",
-      "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
-      "SELECT DISTINCT proj1:p, proj2:itrX FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
-          + " WHERE  pos.secId = 'YHOO') as itrX",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
-          + " WHERE  pos.secId = 'YHOO') as itrX",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT p.ID FROM /root/exampleRegion x"
-          + " WHERE  x.ID = p.ID) as itrX",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
-          + " WHERE  x.ID = p.ID) as itrX",
-      "SELECT DISTINCT x.ID FROM /root/exampleRegion x, x.positions.values v WHERE  "
-          + "v.secId = element(SELECT DISTINCT vals.secId FROM /root/exampleRegion p, p.positions.values vals WHERE  vals.secId = 'YHOO')",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.status = 'active'",
-      "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID",
-      "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p2.status = 'active'",
-      "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p.status = p2.status",
-      "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000",
-      "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = p2.status",
-      "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = 'active'",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId ='IBM')",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId !='IBM')",
-      "SELECT DISTINCT structset.sos, structset.key "
-          + "FROM /root/exampleRegion p, p.positions.values outerPos, "
-          + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
-          + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
-          + "where outerPos.secId != 'IBM' AND "
-          + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
-          + "where structset.sos > 2000",
-      "SELECT DISTINCT * "
-          + "FROM /root/exampleRegion p, p.positions.values outerPos, "
-          + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
-          + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
-          + "where outerPos.secId != 'IBM' AND "
-          + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
-          + "where structset.sos > 2000",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values position "
-          + "WHERE (true = null OR position.secId = 'SUN') AND true",
+    "SELECT ID FROM /root/exampleRegion p WHERE  p.ID > 100",
+    "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pk != '1000'",
+    "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pkid != '1'",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pk > '1'",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pkid != '53'",
+    "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100",
+    "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100 and pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
+    "SELECT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
+    "SELECT * FROM /root/exampleRegion WHERE  ID > 100 and status = 'active'",
+    "SELECT DISTINCT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
+    "SELECT DISTINCT ID FROM /root/exampleRegion WHERE  status = 'active'",
+    "SELECT DISTINCT ID FROM /root/exampleRegion p WHERE  p.status = 'active'",
+    "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
+    "SELECT DISTINCT proj1:p, proj2:itrX FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
+      + " WHERE  pos.secId = 'YHOO') as itrX",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
+      + " WHERE  pos.secId = 'YHOO') as itrX",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT p.ID FROM /root/exampleRegion x"
+      + " WHERE  x.ID = p.ID) as itrX",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
+      + " WHERE  x.ID = p.ID) as itrX",
+    "SELECT DISTINCT x.ID FROM /root/exampleRegion x, x.positions.values v WHERE  "
+      + "v.secId = element(SELECT DISTINCT vals.secId FROM /root/exampleRegion p, p.positions.values vals WHERE  vals.secId = 'YHOO')",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.status = 'active'",
+    "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID",
+    "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p2.status = 'active'",
+    "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p.status = p2.status",
+    "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000",
+    "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = p2.status",
+    "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = 'active'",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId ='IBM')",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId !='IBM')",
+    "SELECT DISTINCT structset.sos, structset.key "
+      + "FROM /root/exampleRegion p, p.positions.values outerPos, "
+      + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
+      + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
+      + "where outerPos.secId != 'IBM' AND "
+      + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
+      + "where structset.sos > 2000",
+    "SELECT DISTINCT * "
+      + "FROM /root/exampleRegion p, p.positions.values outerPos, "
+      + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
+      + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
+      + "where outerPos.secId != 'IBM' AND "
+      + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
+      + "where structset.sos > 2000",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values position "
+      + "WHERE (true = null OR position.secId = 'SUN') AND true",
   };
 
   String[] prQueryStr = {
-      "SELECT ID FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active'",
-      "SELECT * FROM /root/exampleRegion WHERE  ID > 100 and status = 'active'",
-      "SELECT DISTINCT * FROM /root/exampleRegion p WHERE   p.ID > 100 and p.status = 'active' and p.ID < 100000",
-      "SELECT DISTINCT p.ID FROM /root/exampleRegion p WHERE p.ID > 100 and p.ID < 100000 and p.status = 'active'",
-      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (pos.secId != 'IBM')",
+    "SELECT ID FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active'",
+    "SELECT * FROM /root/exampleRegion WHERE  ID > 100 and status = 'active'",
+    "SELECT DISTINCT * FROM /root/exampleRegion p WHERE   p.ID > 100 and p.status = 'active' and p.ID < 100000",
+    "SELECT DISTINCT p.ID FROM /root/exampleRegion p WHERE p.ID > 100 and p.ID < 100000 and p.status = 'active'",
+    "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (pos.secId != 'IBM')",
   };
-  
+
   private int numServers;
 
   @Override
@@ -149,7 +150,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     Host host = Host.getHost(0);
     disconnectFromDS();
     // shut down clients before servers
-    for (int i=numServers; i<4; i++) {
+    for (int i = numServers; i < 4; i++) {
       host.getVM(i).invoke(() -> CacheTestCase.disconnectFromDS());
     }
   }
@@ -161,14 +162,14 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     // avoid IllegalStateException from HandShake by connecting all vms tor
     // system before creating connection pools
     getSystem();
-    
+
     for (int i = 0; i < numServers; i++) {
       host.getVM(i).invoke("getSystem", () -> {
         getSystem();
         return 0;
       });
     }
-    
+
     for (int i = numServers; i < 4; i++) {
       host.getVM(i).invoke("getClientSystem", () -> {
         Properties props = DistributedTestUtils.getAllDistributedSystemProperties(new Properties());
@@ -178,8 +179,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     }
   }
 
-  public void createRegion(VM vm){
-    createRegion(vm, false, null);
+  public void createRegion() {
+    createRegion(false, null);
   }
 
   private void createRegion(final boolean eviction, final String dirName) {
@@ -195,7 +196,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
       DiskStore ds1 = dsf.setDiskDirs(f).create("ds1");
       factory.setDiskStoreName("ds1");
       EvictionAttributes evictAttrs = EvictionAttributes
-          .createLRUEntryAttributes(100, EvictionAction.OVERFLOW_TO_DISK);
+        .createLRUEntryAttributes(100, EvictionAction.OVERFLOW_TO_DISK);
       factory.setEvictionAttributes(evictAttrs);
     }
     // Create region
@@ -218,7 +219,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     int port = 0;
     try {
       port = startBridgeServer(0, false);
-    } catch (Exception ex) {
+    }
+    catch (Exception ex) {
       Assert.fail("While starting CacheServer", ex);
     }
     Cache cache = getCache();
@@ -244,7 +246,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     };
     server.invoke(stopServer);
   }
-  
+
   private void configClient(String host, int... ports) {
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.LOCAL);
@@ -252,18 +254,18 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     poolFactory.setReadTimeout(10 * 60 * 1000); // 10 mins.
     ClientServerTestCase.configureConnectionPoolWithNameAndFactory(factory, host, ports, true, -1, -1, null, poolName, poolFactory);
   }
-  
+
   private void verifyException(Exception e) {
     e.printStackTrace();
     String error = e.getMessage();
     if (e.getCause() != null) {
       error = e.getCause().getMessage();
     }
-    
+
     if (error.contains("Query execution cancelled after exceeding max execution time") ||
-        error.contains("The Query completed sucessfully before it got canceled") ||
-        error.contains("The QueryMonitor thread may be sleeping longer than the set sleep time") ||
-        error.contains("The query task could not be found but the query is marked as having been canceled")) {
+      error.contains("The Query completed sucessfully before it got canceled") ||
+      error.contains("The QueryMonitor thread may be sleeping longer than the set sleep time") ||
+      error.contains("The query task could not be found but the query is marked as having been canceled")) {
       // Expected exception.
       return;
     }
@@ -271,15 +273,16 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     System.out.println("Unexpected exception:");
     if (e.getCause() != null) {
       e.getCause().printStackTrace();
-    } else {
+    }
+    else {
       e.printStackTrace();
     }
-    
+
     fail("Expected exception Not found. Expected exception with message: \n" +
-        "\"Query execution taking more than the max execution time\"" + "\n Found \n" +
-        error);
+      "\"Query execution taking more than the max execution time\"" + "\n Found \n" +
+      error);
   }
-  
+
   /**
    * Tests query execution from client to server (single server).
    */
@@ -287,9 +290,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   public void testQueryMonitorClientServer() throws Exception {
 
     setup(1);
-    
+
     final Host host = Host.getHost(0);
-    
+
     VM server = host.getVM(0);
     VM client1 = host.getVM(1);
     VM client2 = host.getVM(2);
@@ -300,9 +303,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     // Start server
     int serverPort = server.invoke("Create BridgeServer",
-        () -> configServer(20, "testQueryMonitorClientServer")); // All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorClientServer")); // All the queries taking more than 20ms should be canceled by Query monitor.
     server.invoke("createRegion", () -> createRegion());
-    
+
     // Initialize server regions.
     server.invoke("populatePortfolioRegions", () -> populatePortfolioRegions(numberOfEntries));
 
@@ -334,7 +337,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
       Pool pool = PoolManager.find(poolName);
       QueryService queryService = pool.getQueryService();
       executeQueriesAgainstQueryService(queryService);
-    } catch (Exception ex) {
+    }
+    catch (Exception ex) {
       GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
     }
   }
@@ -343,7 +347,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     try {
       QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
       executeQueriesAgainstQueryService(queryService);
-    } catch (Exception ex) {
+    }
+    catch (Exception ex) {
       GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
     }
   }
@@ -361,7 +366,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
       Query query = queryService.newQuery(qStr);
       query.execute();
       fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
-    } catch (Exception e) {
+    }
+    catch (Exception e) {
       System.out.println("queryStr = " + qStr);
       verifyException(e);
     }
@@ -374,9 +380,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   public void testQueryMonitorMultiClientMultiServer() throws Exception {
 
     setup(2);
-    
+
     final Host host = Host.getHost(0);
-    
+
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
     VM client1 = host.getVM(2);
@@ -388,11 +394,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     // Start server
     int serverPort1 = server1.invoke("Create BridgeServer",
-        () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server1.invoke("createRegion", () -> createRegion());
 
     int serverPort2 = server2.invoke("Create BridgeServer",
-        () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorMultiClientMultiServer"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server2.invoke("createRegion", () -> createRegion());
 
     // Initialize server regions.
@@ -426,9 +432,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   public void testQueryExecutionLocally() throws Exception {
 
     setup(2);
-    
+
     final Host host = Host.getHost(0);
-    
+
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
 
@@ -436,11 +442,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     // Start server
     server1.invoke("Create BridgeServer",
-        () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server1.invoke("createRegion", () -> createRegion());
 
     server2.invoke("Create BridgeServer",
-        () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server2.invoke("createRegion", () -> createRegion());
 
     // Initialize server regions.
@@ -465,9 +471,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   public void testQueryExecutionLocallyAndCacheOp() throws Exception {
 
     setup(2);
-    
+
     final Host host = Host.getHost(0);
-    
+
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
 
@@ -475,11 +481,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     // Start server
     server1.invoke("Create BridgeServer",
-        () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server1.invoke("createRegion", () -> createRegion());
 
     server2.invoke("Create BridgeServer",
-        () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryExecutionLocally"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server2.invoke("createRegion", () -> createRegion());
 
     // Initialize server regions.
@@ -494,7 +500,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
         try {
           QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
           String qStr = "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
-              + " WHERE  x.ID = p.ID) as itrX";
+            + " WHERE  x.ID = p.ID) as itrX";
           executeQuery(queryService, qStr);
 
           // Create index and Perform cache op. Bug#44307
@@ -504,8 +510,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
           for (int i = (1 + 100); i <= (numberOfEntries + 200); i++) {
             exampleRegion.put("" + i, new Portfolio(i));
           }
-          
-        } catch (Exception ex) {
+
+        }
+        catch (Exception ex) {
           Assert.fail("Exception creating the query service", ex);
         }
       }
@@ -536,9 +543,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   public void testQueryMonitorOnPR() throws Exception {
 
     setup(2);
-    
+
     final Host host = Host.getHost(0);
-    
+
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
     VM client1 = host.getVM(2);
@@ -550,28 +557,28 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     // Start server
     int serverPort1 = server1.invoke("configServer",
-        () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
     server1.invoke("createPRRegion", () -> createPRRegion());
 
     int serverPort2 = server2.invoke("configServer",
-        () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
     server2.invoke("createPRRegion", () -> createPRRegion());
-    
+
     // Initialize server regions.
     server1.invoke("bulkInsertPorfolio", () -> bulkInsertPorfolio(101, numberOfEntries));
 
     // Initialize server regions.
     server2.invoke("bulkInsertPorfolio", () ->
-        bulkInsertPorfolio((numberOfEntries + 100), (numberOfEntries + numberOfEntries + 100)));
+      bulkInsertPorfolio((numberOfEntries + 100), (numberOfEntries + numberOfEntries + 100)));
 
     // Initialize Client1 and create client regions.
     client1.invoke("Init client", () -> configClient(serverHostName, serverPort1));
     client1.invoke("createRegion", () -> createRegion());
-    
+
     // Initialize Client2 and create client regions.
     client2.invoke("Init client", () -> configClient(serverHostName, serverPort2));
     client2.invoke("createRegion", () -> createRegion());
-    
+
     // Execute client queries
 
     client1.invoke("Execute Queries", () -> executeQueriesFromClient(20));
@@ -596,9 +603,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   public void testQueryMonitorWithLocalQueryOnPR() throws Exception {
 
     setup(2);
-    
+
     final Host host = Host.getHost(0);
-    
+
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
 
@@ -606,11 +613,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     // Start server
     server1.invoke("configServer",
-        () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
     server1.invoke("Create Partition Regions", () -> createPRRegion());
 
     server2.invoke("configServer",
-        () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorMultiClientMultiServerOnPR"));// All the queries taking more than 100ms should be canceled by Query monitor.
     server2.invoke("Create Partition Regions", () -> createPRRegion());
 
     // Initialize server regions.
@@ -626,7 +633,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
         bulkInsertPorfolio((numberOfEntries + 100), (numberOfEntries + numberOfEntries + 100));
       }
     });
-    
+
     // Execute client queries
     server1.invoke("execute queries on server", () -> executeQueriesOnServer());
     server2.invoke("execute queries on server", () -> executeQueriesOnServer());
@@ -643,7 +650,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   public void testQueryMonitorRegionWithEviction() throws CacheException {
 
     final Host host = Host.getHost(0);
-    
+
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
     VM client1 = host.getVM(2);
@@ -655,11 +662,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     // Start server
     int serverPort1 = server1.invoke("Create BridgeServer",
-        () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server1.invoke("createRegion", () -> createRegion(true, "server1_testQueryMonitorRegionWithEviction"));
 
     int serverPort2 = server2.invoke("Create BridgeServer",
-        () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorRegionWithEviction"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server2.invoke("createRegion", () -> createRegion(true, "server2_testQueryMonitorRegionWithEviction"));
 
     // Initialize server regions.
@@ -679,11 +686,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     // Initialize Client1 and create client regions.
     client1.invoke("Init client", () -> configClient(serverHostName, serverPort1));
     client1.invoke("createRegion", () -> createRegion());
-    
+
     // Initialize Client2 and create client regions.
     client2.invoke("Init client", () -> configClient(serverHostName, serverPort2));
     client2.invoke("createRegion", () -> createRegion());
-    
+
     // Execute client queries
     client1.invoke("Execute Queries", () -> executeQueriesFromClient(20));
     client2.invoke("Execute Queries", () -> executeQueriesFromClient(20));
@@ -699,9 +706,9 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   public void testQueryMonitorRegionWithIndex() throws Exception {
 
     setup(2);
-    
+
     final Host host = Host.getHost(0);
-    
+
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
     VM client1 = host.getVM(2);
@@ -713,11 +720,11 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     // Start server
     int serverPort1 = server1.invoke("configServer",
-        () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server1.invoke("createRegion", () -> createRegion());
 
     int serverPort2 = server2.invoke("configServer",
-        () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
+      () -> configServer(20, "testQueryMonitorRegionWithIndex"));// All the queries taking more than 20ms should be canceled by Query monitor.
     server2.invoke("createRegion", () -> createRegion());
 
     //    pause(1000);
@@ -763,7 +770,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
       cacheQS.createIndex("posIdIndex2", IndexType.FUNCTIONAL, "pos.Id", "/root/exampleRegion2 p2, p2.positions.values pos");
       cacheQS.createIndex("pkIndex2", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion2");
       cacheQS.createIndex("pkidIndex2", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion2");
-    } catch (Exception ex) {
+    }
+    catch (Exception ex) {
     }
     for (int i = (1 + 100); i <= (numberOfEntries + 100); i++) {
       exampleRegion.put("" + i, new Portfolio(i));
@@ -772,25 +780,24 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
       exampleRegion2.put("" + i, new Portfolio(i));
     }
   }
-  
+
   protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest();
 
   /**
    * The following CQ test is added to make sure TEST_MAX_QUERY_EXECUTION_TIME is reset
    * and is not affecting other query related tests.
-   *
    * @throws Exception
    */
   @Test
   public void testCQWithDestroysAndInvalidates() throws Exception
   {
     setup(1);
-    
+
     final Host host = Host.getHost(0);
     VM server = host.getVM(0);
     VM client = host.getVM(1);
     VM producerClient = host.getVM(2);
-    
+
     cqDUnitTest.createServer(server, 0, true);
     final int port = server.invoke(() -> CqQueryDUnitTest.getCacheServerPort());
     final String host0 = NetworkUtils.getServerHostName(server.getHost());
@@ -806,7 +813,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     cqDUnitTest.createCQ(client, name, cqDUnitTest.cqs[4]);
     cqDUnitTest.executeCQ(client, name, true, null);
-    
+
     // do destroys and invalidates.
     server.invoke(new CacheSerializableRunnable("Create values") {
       public void run2() throws CacheException {
@@ -828,7 +835,7 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     for (int i = 1; i <= 5; i++) {
       cqDUnitTest.waitForCreated(client, name, CqQueryDUnitTest.KEY + i);
     }
-    
+
     // do more puts to push first five key-value to disk.
     cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 10);
     // do invalidates on fisrt five keys.
@@ -861,14 +868,14 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
   public void testCacheOpAfterQueryCancel() throws Exception {
 
     setup(4);
-    
+
     final Host host = Host.getHost(0);
-    
+
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
     VM server3 = host.getVM(2);
     VM server4 = host.getVM(3);
-    
+
     final int numberOfEntries = 1000;
 
     // Start server
@@ -883,14 +890,15 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     server4.invoke("Create BridgeServer", () -> configServer(5, "testQueryExecutionLocally"));
     server4.invoke("Create Partition Regions", () -> createPRRegion());
-    
+
     server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
       public void run2() throws CacheException {
         try {
           QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
           queryService.createIndex("statusIndex", IndexType.FUNCTIONAL, "status", "/root/exampleRegion");
           queryService.createIndex("secIdIndex", IndexType.FUNCTIONAL, "pos.secId", "/root/exampleRegion p, p.positions.values pos");
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           fail("Failed to create index.");
         }
         Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
@@ -932,28 +940,31 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
           Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
           QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
           String qStr = "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values pos1, p.positions.values pos" +
-              " where p.ID < pos.sharesOutstanding OR p.ID > 0 OR p.position1.mktValue > 0 " +
-              " OR pos.secId in SET ('SUN', 'IBM', 'YHOO', 'GOOG', 'MSFT', " +
-              " 'AOL', 'APPL', 'ORCL', 'SAP', 'DELL', 'RHAT', 'NOVL', 'HP')" +
-              " order by p.status, p.ID desc";
+            " where p.ID < pos.sharesOutstanding OR p.ID > 0 OR p.position1.mktValue > 0 " +
+            " OR pos.secId in SET ('SUN', 'IBM', 'YHOO', 'GOOG', 'MSFT', " +
+            " 'AOL', 'APPL', 'ORCL', 'SAP', 'DELL', 'RHAT', 'NOVL', 'HP')" +
+            " order by p.status, p.ID desc";
           for (int i = 0; i < 500; i++) {
             try {
               GemFireCacheImpl.getInstance().getLogger().info("Executing query :" + qStr);
               Query query = queryService.newQuery(qStr);
               query.execute();
-            } catch (QueryExecutionTimeoutException qet) {
+            }
+            catch (QueryExecutionTimeoutException qet) {
               LogWriterUtils.getLogWriter().info("### Got Expected QueryExecutionTimeout exception. " +
-                  qet.getMessage());
+                qet.getMessage());
               if (qet.getMessage().contains("cancelled after exceeding max execution")) {
                 LogWriterUtils.getLogWriter().info("### Doing a put operation");
                 exampleRegion.put("" + i, new Portfolio(i));
               }
-            } catch (Exception e) {
+            }
+            catch (Exception e) {
               fail("Exception executing query." + e.getMessage());
             }
           }
           LogWriterUtils.getLogWriter().info("### Completed Executing queries in testCacheOpAfterQueryCancel");
-        } catch (Exception ex) {
+        }
+        catch (Exception ex) {
           Assert.fail("Exception creating the query service", ex);
         }
       }
@@ -961,25 +972,26 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
 
     AsyncInvocation ai3 = server3.invokeAsync(executeQuery);
     AsyncInvocation ai4 = server4.invokeAsync(executeQuery);
-    
+
     LogWriterUtils.getLogWriter().info("### Waiting for async threads to join in testCacheOpAfterQueryCancel");
     try {
       ThreadUtils.join(ai1, 5 * 60 * 1000);
       ThreadUtils.join(ai2, 5 * 60 * 1000);
       ThreadUtils.join(ai3, 5 * 60 * 1000);
       ThreadUtils.join(ai4, 5 * 60 * 1000);
-    } catch (Exception ex) {
+    }
+    catch (Exception ex) {
       fail("Async thread join failure");
     }
     LogWriterUtils.getLogWriter().info("### DONE Waiting for async threads to join in testCacheOpAfterQueryCancel");
-    
+
     validateQueryMonitorThreadCnt(server1, 0, 1000);
     validateQueryMonitorThreadCnt(server2, 0, 1000);
     validateQueryMonitorThreadCnt(server3, 0, 1000);
     validateQueryMonitorThreadCnt(server4, 0, 1000);
-    
+
     LogWriterUtils.getLogWriter().info("### DONE validating query monitor threads testCacheOpAfterQueryCancel");
-    
+
     stopServer(server1);
     stopServer(server2);
     stopServer(server3);
@@ -1001,9 +1013,10 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
               Wait.pause(10);
               waited += 10;
               continue;
-            } else {
+            }
+            else {
               fail("Didn't found expected monitoring thread. Expected: " + threadCount +
-                  " found :" + qm.getQueryMonitorThreadCount());
+                " found :" + qm.getQueryMonitorThreadCount());
             }
           }
           break;
@@ -1013,14 +1026,15 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
     };
     vm.invoke(validateThreadCnt);
   }
-  
+
   /**
    * Starts a bridge server on the given port, using the given
    * deserializeValues and notifyBySubscription to serve up the
    * given region.
    */
   protected int startBridgeServer(int port, boolean notifyBySubscription)
-      throws IOException {
+    throws IOException
+  {
 
     Cache cache = getCache();
     CacheServer bridge = cache.addCacheServer();
@@ -1035,12 +1049,13 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
    */
   private void stopBridgeServer(Cache cache) {
     CacheServer bridge =
-        (CacheServer) cache.getCacheServers().iterator().next();
+      (CacheServer) cache.getCacheServers().iterator().next();
     bridge.stop();
     assertFalse(bridge.isRunning());
   }
 
   private class QueryTimeoutHook implements DefaultQuery.TestHook {
+
     long timeout;
 
     private QueryTimeoutHook(long timeout) {
@@ -1051,7 +1066,8 @@ public class QueryMonitorDUnitTest extends JUnit4CacheTestCase {
       if (description.equals("6")) {
         try {
           Thread.sleep(timeout * 2);
-        } catch (InterruptedException ie) {
+        }
+        catch (InterruptedException ie) {
           Thread.currentThread().interrupt();
         }
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
index 327de28..6ccb0f7 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.snapshot;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
index c178454..4b00d82 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 08b047a..1b1dffb 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
index a806516..8271543 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index ed74c70..963df8f 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.ha;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index 9837cf6..f1f18c5 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -43,8 +43,8 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
 import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
 import static com.gemstone.gemfire.test.dunit.Assert.*;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index c8812bb..08b5afb 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index b9faf69..46b672d 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 17103c1..6944eb6 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index 4ed2934..cc54a47 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
index 22c0b47..0405b3c 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -21,8 +21,6 @@ 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 com.gemstone.gemfire.cache.Cache;
@@ -49,7 +47,7 @@ import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Cache Server related management test cases

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 129c146..5947883 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -58,7 +58,7 @@ import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index e8a5577..495f0c2 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.query.*;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.DistributedRegion;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.PartitionedRegion;
@@ -41,7 +40,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.assertTrue;
 import static com.gemstone.gemfire.test.dunit.DistributedTestUtils.getDUnitLocatorPort;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index 2015ee4..12fdea8 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.security;
 import com.gemstone.gemfire.DataSerializable;
 import com.gemstone.gemfire.Instantiator;
 import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.security.FilterPostAuthorization;
 import com.gemstone.gemfire.internal.security.FilterPreAuthorization;
@@ -212,13 +212,13 @@ public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestCase {
   private Properties buildProperties(final String authenticator, final Properties extraProps, final String preAccessor, final String postAccessor) {
     Properties authProps = new Properties();
     if (authenticator != null) {
-      authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
+      authProps.setProperty(ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
     }
     if (preAccessor != null) {
-      authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_ACCESSOR, preAccessor);
+      authProps.setProperty(ConfigurationProperties.SECURITY_CLIENT_ACCESSOR, preAccessor);
     }
     if (postAccessor != null) {
-      authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_ACCESSOR_PP, postAccessor);
+      authProps.setProperty(ConfigurationProperties.SECURITY_CLIENT_ACCESSOR_PP, postAccessor);
     }
     if (extraProps != null) {
       authProps.putAll(extraProps);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
index 3ed8c1b..e271336 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/security/MultiUserAPIDUnitTest.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.query.CqAttributesFactory;
 import com.gemstone.gemfire.cache.query.CqException;
 import com.gemstone.gemfire.cache.query.CqQuery;
 import com.gemstone.gemfire.cache.query.Query;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
 import com.gemstone.gemfire.security.generator.CredentialGenerator;
@@ -297,7 +297,7 @@ public class MultiUserAPIDUnitTest extends ClientAuthorizationTestCase {
     }
 
     if (authenticator != null) {
-      authProps.setProperty(DistributedSystemConfigProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
+      authProps.setProperty(ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR, authenticator);
     }
 
     return SecurityTestUtils.createCacheServer(authProps, javaProps, dsPort, locatorString, 0, NO_EXCEPTION);



[12/17] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties

Posted by ud...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
index c82d279..7655652 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MXMemoryPoolListenerExample.java
@@ -18,8 +18,8 @@ package com.gemstone.gemfire.cache.management;
 
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.cache.*;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 
 import javax.management.Notification;
 import javax.management.NotificationEmitter;
@@ -33,7 +33,7 @@ import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * An test class for exploring the various notification listener behaviors
@@ -102,10 +102,10 @@ public class MXMemoryPoolListenerExample implements NotificationListener {
 
     Properties dsProps = new Properties();
     dsProps.setProperty(MCAST_PORT, "0"); // Loner
-    dsProps.setProperty(DistributedSystemConfigProperties.LOG_LEVEL, "info");
-    dsProps.setProperty(DistributedSystemConfigProperties.STATISTIC_SAMPLE_RATE, "200");
-    dsProps.setProperty(DistributedSystemConfigProperties.ENABLE_TIME_STATISTICS, "true");
-    dsProps.setProperty(DistributedSystemConfigProperties.STATISTIC_SAMPLING_ENABLED, "true");
+    dsProps.setProperty(ConfigurationProperties.LOG_LEVEL, "info");
+    dsProps.setProperty(ConfigurationProperties.STATISTIC_SAMPLE_RATE, "200");
+    dsProps.setProperty(ConfigurationProperties.ENABLE_TIME_STATISTICS, "true");
+    dsProps.setProperty(ConfigurationProperties.STATISTIC_SAMPLING_ENABLED, "true");
     DistributedSystem ds = DistributedSystem.connect(dsProps);  
     final LogWriter logger = ds.getLogWriter();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
index 412713f..a91c8f5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.management;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
index d89641c..a95b87b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/management/MemoryThresholdsOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.management;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java
index af87509..5ccb951 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/ExceptionHandlingJUnitTest.java
@@ -25,8 +25,8 @@ import org.junit.experimental.categories.Category;
 import java.util.HashMap;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.fail;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java
index bf776e2..e609afc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/MapFunctionalJUnitTest.java
@@ -25,8 +25,8 @@ import org.junit.experimental.categories.Category;
 import java.util.HashMap;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.fail;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
index 1e018f6..5abfa68 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/mapInterface/PutAllGlobalLockJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.mapInterface;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
index 172ec73..1411e31 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/PutOperationContextJUnitTest.java
@@ -32,8 +32,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 @Category(IntegrationTest.class)
 public class PutOperationContextJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
index c2c2796..01b2dd1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/operations/internal/GetOperationContextImplJUnitTest.java
@@ -30,8 +30,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 @Category(IntegrationTest.class)
 public class GetOperationContextImplJUnitTest {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java
index cb47fd5..ed1e693 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/Bug32947ValueConstraintJUnitTest.java
@@ -29,7 +29,7 @@ import java.util.HashSet;
 import java.util.Properties;
 import java.util.Set;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.fail;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
index d001597..c5673d1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/CacheUtils.java
@@ -32,7 +32,7 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java
index 795dd8f..eabaf41 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/PdxStringQueryJUnitTest.java
@@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
index fa8980c..68f9b09 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/QueryTestUtils.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
index fdd5b50..bd613bb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/HelperTestCase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
index e1d698a..29a3083 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index 674eca4..fc8b5bf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -22,7 +22,6 @@ 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 com.gemstone.gemfire.cache.Cache;
@@ -36,7 +35,6 @@ import com.gemstone.gemfire.cache.query.QueryService;
 import com.gemstone.gemfire.cache.query.SelectResults;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.security.templates.DummyAuthenticator;
 import com.gemstone.gemfire.security.templates.UserPasswordAuthInit;
@@ -46,7 +44,7 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
 import org.junit.Ignore;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Test for accessing query bind parameters from authorization callbacks

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
index cf73b81..4672a94 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -68,7 +68,7 @@ import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
 
 /**
  * Tests remote (client/server) query execution.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 3866f40..3ab90c9 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
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
index 4a09351..d3e9959 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/ResourceManagerWithQueryMonitorDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.dunit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java
index 4c6aed1..941d7d5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IUMRSingleRegionJUnitTest.java
@@ -36,7 +36,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
index 8f21a8b..9ead04e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
@@ -26,7 +26,7 @@
  */
 package com.gemstone.gemfire.cache.query.functional;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
index 5646250..6097be7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/MultiRegionIndexUsageJUnitTest.java
@@ -36,7 +36,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java
index 7218b1c..df745c9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/NegativeNumberQueriesJUnitTest.java
@@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 // TODO:TEST clean this up and add assertions
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
index 245a5bc..4f3a24e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/AsyncIndexUpdaterThreadShutdownJUnitTest.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java
index 395405a..f01f925 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CompactRangeIndexJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.internal.index;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
index 790421e..160414b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.internal.index;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
index 108ea47..9cad9fc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/CopyOnReadIndexJUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.HashMap;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertEquals;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
index 7e84eb8..ef34fe2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
@@ -20,7 +20,7 @@
  */
 package com.gemstone.gemfire.cache.query.internal.index;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
index 3ee2a99..8c65049 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
@@ -34,7 +34,7 @@ import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
index 6f151bd..a7a760c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PdxCopyOnReadQueryJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.internal.index;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
index bb25ccd..1f9b399 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
@@ -30,7 +30,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.fail;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
index a6ff920..1223d5e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/PutAllWithIndexPerfDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.query.internal.index;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
index e2867c2..896cfda 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
@@ -37,7 +37,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
index da35bef..937fbd7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache.snapshot;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.examples.snapshot.MyObject;
 import com.gemstone.gemfire.cache.Cache;
@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Random;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 public class SnapshotTestCase {
   protected File store;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
index 830eead..46077cf 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug38741DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
index 60790f9..132925a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
@@ -31,7 +31,7 @@ import org.junit.experimental.categories.Category;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
index a53d62a..def3f7c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
@@ -26,7 +26,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
index 74a8b2b..7c9f2ed 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug44418JUnitTest.java
@@ -34,8 +34,8 @@ import org.junit.experimental.categories.Category;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.jayway.awaitility.Awaitility.with;
 import static org.junit.Assert.fail;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
index 8802328..1a1f99d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
index 3e9fffb..6b3d8b1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
index 1662dfe..26f9a53 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
index 39376e7..b5f7f45 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlGeode10DUnitTest.java
@@ -20,7 +20,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
index 7942db4..114e885 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
index a4a6d42..dc6af7a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientMembershipDUnitTest.java
@@ -69,8 +69,8 @@ import com.gemstone.gemfire.test.dunit.Wait;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Tests the ClientMembership API including ClientMembershipListener.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
index 8d0eae7..957fb5b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientRegisterInterestDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index 63b621e..957dcc0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
index 5fc8cc9..7027040 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckOverflowRegionCCEOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
index 36e2893..7cf8c9a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckPersistentRegionCCEOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
index 3794b37..652bd6b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -20,7 +20,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 import static org.junit.Assume.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
index 739da00..0366c1c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
index 48a97c9..792f66a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
index 388a6e3..39f4c6e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 5776158..3c05794 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
index 8720fcc..d610b19 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
index c871632..aff0fa0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
index b74956c..c2fdbfb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
index 9a8f0e0..1458e4f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
@@ -20,7 +20,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
index dddc2e5..2d81f54 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEOffHeapDUnitTest.java
@@ -17,12 +17,7 @@
 package com.gemstone.gemfire.cache30;
 
 import org.junit.experimental.categories.Category;
-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.util.Properties;
@@ -33,9 +28,7 @@ import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
-import java.util.Properties;
-
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Tests Global Region with ConcurrencyChecksEnabled and OffHeap memory.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
index d894565..0b71109 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
index 18d08c5..d0f21b2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/OffHeapLRUEvictionControllerDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
index 97856d2..4675e33 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/PartitionedRegionOffHeapDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
index 590166b..cd4ef5f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index f7a9830..f223487 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -22,7 +22,6 @@ 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 com.gemstone.gemfire.CancelException;
@@ -45,7 +44,6 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
 import com.gemstone.gemfire.test.dunit.*;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
-import org.junit.experimental.categories.Category;
 
 import java.io.File;
 import java.io.FileWriter;
@@ -56,7 +54,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 @SuppressWarnings("serial")
 @Category(DistributedTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
index 614e541..cfe31f7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityListenerDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
index ea369eb..6b99d11 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionReliabilityTestCase.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.ByteArrayInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
index e73481d..e86a227 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RequiredRolesDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.HashSet;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
index 3e66792..8a82cbe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RolePerformanceDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
index 241bfae..ce2cea5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/SlowRecDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
index de813ae..0eee516 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/TXDistributedDUnitTest.java
@@ -28,7 +28,7 @@
  */
 package com.gemstone.gemfire.cache30;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java
index 8d77205..1e50e37 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTest.java
@@ -30,7 +30,7 @@ import java.io.FileWriter;
 import java.util.Properties;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Integration tests for AbstractLauncher class. These tests require file system I/O.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
index 552aec1..cc13c48 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherIntegrationTestCase.java
@@ -40,7 +40,7 @@ import java.util.Properties;
 import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertTrue;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
index 298c3d6..ff46a42 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java
@@ -27,7 +27,7 @@ import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.Assert.*;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * The AbstractLauncherTest class is a test suite of unit tests testing the contract and functionality

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
index 6519d44..174ff84 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractServerLauncherIntegrationTestCase.java
@@ -29,7 +29,7 @@ import org.junit.rules.TemporaryFolder;
 
 import java.util.concurrent.Callable;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.assertNotNull;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
index 3b6ad55..ec888a9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java
@@ -34,7 +34,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
index 0ac4ac8..cd8f590 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemConnectPerf.java
@@ -19,7 +19,7 @@ package com.gemstone.gemfire.distributed;
 import java.io.PrintStream;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * This program is used to measure the amount of time it takes to

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 c61fbfc..5386ea1 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
@@ -46,7 +46,7 @@ import java.util.Enumeration;
 import java.util.Properties;
 import java.util.concurrent.TimeoutException;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
index 79e19ab..438c3f7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/HostedLocatorsDUnitTest.java
@@ -41,7 +41,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.Host.getHost;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
index 8c5afbe..8c570ac 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LauncherMemberMXBeanIntegrationTest.java
@@ -32,8 +32,8 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index b40f91b..2ca13b7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -21,7 +21,6 @@ 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;
 
@@ -49,7 +48,6 @@ import com.gemstone.gemfire.internal.logging.LocalLogWriter;
 import com.gemstone.gemfire.internal.tcp.Connection;
 import com.gemstone.gemfire.test.dunit.*;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
-import org.junit.experimental.categories.Category;
 
 import java.io.File;
 import java.io.IOException;
@@ -58,7 +56,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Tests the ability of the {@link Locator} API to start and stop

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java
index 64d938c..af0c30d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorJUnitTest.java
@@ -49,7 +49,7 @@ import java.net.InetAddress;
 import java.util.*;
 import java.util.function.IntSupplier;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePort.SOCKET;
 import static com.gemstone.gemfire.internal.AvailablePort.getRandomAvailablePort;
 import static org.junit.Assert.*;
@@ -163,7 +163,7 @@ public class LocatorJUnitTest {
   public void testServerOnly() throws Exception {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributedSystemConfigProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
+    props.setProperty(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
     locator = Locator.startLocatorAndDS(port, tmpFile, null, props, false, true, null);
    assertFalse(locator.isPeerLocator());
    assertTrue(locator.isServerLocator());
@@ -175,7 +175,7 @@ public class LocatorJUnitTest {
   public void testBothPeerAndServer() throws Exception {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributedSystemConfigProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
+    props.setProperty(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
 
     locator = Locator.startLocatorAndDS(port, tmpFile, null, props);
     assertTrue(locator.isPeerLocator());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
index d78b91b..d62f9a0 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java
@@ -39,7 +39,7 @@ import static com.googlecode.catchexception.apis.BDDCatchException.caughtExcepti
 import static com.googlecode.catchexception.apis.BDDCatchException.when;
 import static org.assertj.core.api.BDDAssertions.assertThat;
 import static org.assertj.core.api.BDDAssertions.then;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Integration tests for LocatorLauncher. These tests require file system I/O.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
index 76f09b8..faf6d31 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
@@ -39,7 +39,7 @@ import java.lang.management.ManagementFactory;
 import java.net.BindException;
 import java.net.InetAddress;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
index 7cb405b..8e978e9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
@@ -51,7 +51,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
index b10bbeb..951c631 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java
@@ -32,7 +32,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 
 import static org.junit.Assert.*;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * The LocatorLauncherTest class is a test suite of test cases for testing the contract and functionality of