geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [36/67] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public
Date Thu, 02 Jun 2016 00:08:22 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/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 f35ce8c..8033a41 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,18 +17,8 @@
 
 package com.gemstone.gemfire.distributed.internal;
 
-import java.io.File;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
 import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.internal.Config;
 import com.gemstone.gemfire.internal.ConfigSource;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
@@ -36,6 +26,12 @@ import com.gemstone.gemfire.internal.logging.LogConfig;
 import com.gemstone.gemfire.internal.tcp.Connection;
 import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
 
+import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.util.*;
+
 /**
  * Provides accessor (and in some cases mutator) methods for the
  * various GemFire distribution configuration properties.  The
@@ -52,7 +48,7 @@ import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
  *
  * @since GemFire 2.1
  */
-public interface DistributionConfig extends Config, LogConfig {
+public interface DistributionConfig extends Config, LogConfig, SystemConfigurationProperties {
 
   ////////////////////  Instance Methods  ////////////////////
 
@@ -67,7 +63,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @return the system's name.
    */
   @ConfigAttributeGetter(name=NAME_NAME)
-  public String getName();
+  String getName();
 
   /**
    * Sets the member's name.
@@ -78,19 +74,17 @@ public interface DistributionConfig extends Config, LogConfig {
    *   when writing to the system's configuration file.
    */
   @ConfigAttributeSetter(name=NAME_NAME)
-  public void setName(String value);
+  void setName(String value);
 
   /** The name of the "name" property */
   @ConfigAttribute(type=String.class)
-  public static final String NAME_NAME = "name";
-
-
+  String NAME_NAME = NAME;
 
   /**
    * The default system name.
    * <p> Actual value of this constant is <code>""</code>.
    */
-  public static final String DEFAULT_NAME = "";
+  String DEFAULT_NAME = "";
 
   /**
    * Returns the value of the <a
@@ -98,175 +92,187 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=MCAST_PORT_NAME)
-  public int getMcastPort();
+  int getMcastPort();
+
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#mcast-port">"mcast-port"</a>
    * property
    */
   @ConfigAttributeSetter(name=MCAST_PORT_NAME)
-  public void setMcastPort(int value);
-
+  void setMcastPort(int value);
 
   /** The default value of the "mcastPort" property */
-  public static final int DEFAULT_MCAST_PORT = 0;
+  int DEFAULT_MCAST_PORT = 0;
+
   /**
    * The minimum mcastPort.
    * <p> Actual value of this constant is <code>0</code>.
    */
-  public static final int MIN_MCAST_PORT = 0;
+  int MIN_MCAST_PORT = 0;
+
   /**
    * The maximum mcastPort.
    * <p> Actual value of this constant is <code>65535</code>.
    */
-  public static final int MAX_MCAST_PORT = 65535;
+  int MAX_MCAST_PORT = 65535;
 
   /** The name of the "mcastPort" property */
   @ConfigAttribute(type=Integer.class, min=MIN_MCAST_PORT, max=MAX_MCAST_PORT)
-  public static final String MCAST_PORT_NAME = "mcast-port";
+  String MCAST_PORT_NAME = MCAST_PORT;
 
   /**
    * Returns the value of the <a
    * href="../DistributedSystem.html#tcp-port">"tcp-port"</a>
    * property
    */
-  @ConfigAttributeGetter(name=TCP_PORT_NAME)
-  public int getTcpPort();
+  @ConfigAttributeGetter(name = TCP_PORT)
+  int getTcpPort();
+
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#tcp-port">"tcp-port"</a>
    * property
    */
-  @ConfigAttributeSetter(name=TCP_PORT_NAME)
-  public void setTcpPort(int value);
+  @ConfigAttributeSetter(name = TCP_PORT)
+  void setTcpPort(int value);
 
   /** The default value of the "tcpPort" property */
-  public static final int DEFAULT_TCP_PORT = 0;
+  int DEFAULT_TCP_PORT = 0;
+
   /**
    * The minimum tcpPort.
    * <p> Actual value of this constant is <code>0</code>.
    */
-  public static final int MIN_TCP_PORT = 0;
+  int MIN_TCP_PORT = 0;
+
   /**
    * The maximum tcpPort.
    * <p> Actual value of this constant is <code>65535</code>.
    */
-  public static final int MAX_TCP_PORT = 65535;
+  int MAX_TCP_PORT = 65535;
+
   /** The name of the "tcpPort" property */
   @ConfigAttribute(type=Integer.class, min=MIN_TCP_PORT, max=MAX_TCP_PORT)
-  public static final String TCP_PORT_NAME = "tcp-port";
+  String TCP_PORT_NAME = TCP_PORT;
 
   /**
    * Returns the value of the <a
    * href="../DistributedSystem.html#mcast-address">"mcast-address"</a>
    * property
    */
-  @ConfigAttributeGetter(name=MCAST_ADDRESS_NAME)
-  public InetAddress getMcastAddress();
+  @ConfigAttributeGetter(name = MCAST_ADDRESS)
+  InetAddress getMcastAddress();
+
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#mcast-address">"mcast-address"</a>
    * property
    */
-  @ConfigAttributeSetter(name=MCAST_ADDRESS_NAME)
-  public void setMcastAddress(InetAddress value);
-
+  @ConfigAttributeSetter(name = MCAST_ADDRESS)
+  void setMcastAddress(InetAddress value);
 
   /** The name of the "mcastAddress" property */
   @ConfigAttribute(type=InetAddress.class)
-  public static final String MCAST_ADDRESS_NAME = "mcast-address";
+  String MCAST_ADDRESS_NAME = MCAST_ADDRESS;
 
   /** The default value of the "mcastAddress" property.
    * Current value is <code>239.192.81.1</code>
    */
-  public static final InetAddress DEFAULT_MCAST_ADDRESS = AbstractDistributionConfig._getDefaultMcastAddress();
+  InetAddress DEFAULT_MCAST_ADDRESS = AbstractDistributionConfig._getDefaultMcastAddress();
 
   /**
    * Returns the value of the <a
    * href="../DistributedSystem.html#mcast-ttl">"mcast-ttl"</a>
    * property
    */
-  @ConfigAttributeGetter(name=MCAST_TTL_NAME)
-  public int getMcastTtl();
+  @ConfigAttributeGetter(name = MCAST_TTL)
+  int getMcastTtl();
+
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#mcast-ttl">"mcast-ttl"</a>
    * property
    */
-  @ConfigAttributeSetter(name=MCAST_TTL_NAME)
-  public void setMcastTtl(int value);
+  @ConfigAttributeSetter(name = MCAST_TTL)
+  void setMcastTtl(int value);
 
   /** The default value of the "mcastTtl" property */
-  public static final int DEFAULT_MCAST_TTL = 32;
+  int DEFAULT_MCAST_TTL = 32;
+
   /**
    * The minimum mcastTtl.
    * <p> Actual value of this constant is <code>0</code>.
    */
-  public static final int MIN_MCAST_TTL = 0;
+  int MIN_MCAST_TTL = 0;
+
   /**
    * The maximum mcastTtl.
    * <p> Actual value of this constant is <code>255</code>.
    */
-  public static final int MAX_MCAST_TTL = 255;
+  int MAX_MCAST_TTL = 255;
 
   /** The name of the "mcastTtl" property */
   @ConfigAttribute(type=Integer.class, min=MIN_MCAST_TTL, max=MAX_MCAST_TTL)
-  public static final String MCAST_TTL_NAME = "mcast-ttl";
+  String MCAST_TTL_NAME = MCAST_TTL;
 
   /**
    * Returns the value of the <a
    * href="../DistributedSystem.html#bind-address">"bind-address"</a>
    * property
    */
-  @ConfigAttributeGetter(name=BIND_ADDRESS_NAME)
-  public String getBindAddress();
+  @ConfigAttributeGetter(name = BIND_ADDRESS)
+  String getBindAddress();
+
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#bind-address">"bind-address"</a>
    * property
    */
-  @ConfigAttributeSetter(name=BIND_ADDRESS_NAME)
-  public void setBindAddress(String value);
+  @ConfigAttributeSetter(name = BIND_ADDRESS)
+  void setBindAddress(String value);
 
   /** The name of the "bindAddress" property */
   @ConfigAttribute(type=String.class)
-  public static final String BIND_ADDRESS_NAME = "bind-address";
+  String BIND_ADDRESS_NAME = BIND_ADDRESS;
 
   /** The default value of the "bindAddress" property.
    * Current value is an empty string <code>""</code>
    */
-  public static final String DEFAULT_BIND_ADDRESS = "";
+  String DEFAULT_BIND_ADDRESS = "";
 
   /**
    * Returns the value of the <a
    * href="../DistributedSystem.html#server-bind-address">"server-bind-address"</a>
    * property
    */
-  @ConfigAttributeGetter(name=SERVER_BIND_ADDRESS_NAME)
-  public String getServerBindAddress();
+  @ConfigAttributeGetter(name = SERVER_BIND_ADDRESS)
+  String getServerBindAddress();
+
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#server-bind-address">"server-bind-address"</a>
    * property
    */
-  @ConfigAttributeSetter(name=SERVER_BIND_ADDRESS_NAME)
-  public void setServerBindAddress(String value);
+  @ConfigAttributeSetter(name = SERVER_BIND_ADDRESS)
+  void setServerBindAddress(String value);
 
   /** The name of the "serverBindAddress" property */
   @ConfigAttribute(type=String.class)
-  public static final String SERVER_BIND_ADDRESS_NAME = "server-bind-address";
+  String SERVER_BIND_ADDRESS_NAME = SERVER_BIND_ADDRESS;
 
   /** The default value of the "serverBindAddress" property.
    * Current value is an empty string <code>""</code>
    */
-  public static final String DEFAULT_SERVER_BIND_ADDRESS = "";
+  String DEFAULT_SERVER_BIND_ADDRESS = "";
 
   /**
    * Returns the value of the <a
    * href="../DistributedSystem.html#locators">"locators"</a> property
    */
-  @ConfigAttributeGetter(name=LOCATORS_NAME)
-  public String getLocators();
+  @ConfigAttributeGetter(name = LOCATORS)
+  String getLocators();
+
   /**
    * Sets the system's locator list.
    * A locator list is optional and by default empty.
@@ -279,60 +285,63 @@ 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=LOCATORS_NAME)
-  public void setLocators(String value);
+  @ConfigAttributeSetter(name = LOCATORS)
+  void setLocators(String value);
 
   /** The name of the "locators" property */
   @ConfigAttribute(type=String.class)
-  public static final String LOCATORS_NAME = "locators";
+  String LOCATORS_NAME = LOCATORS;
 
   /** The default value of the "locators" property */
-  public static final String DEFAULT_LOCATORS = "";
+  String DEFAULT_LOCATORS = "";
 
   /**
    * Locator wait time - how long to wait for a locator to start before giving up &
    * throwing a GemFireConfigException
    */
   @ConfigAttribute(type=Integer.class)
-  public static final String LOCATOR_WAIT_TIME_NAME = "locator-wait-time";
-  public static final int DEFAULT_LOCATOR_WAIT_TIME = 0;
-  @ConfigAttributeGetter(name=LOCATOR_WAIT_TIME_NAME)
-  public int getLocatorWaitTime();
-  @ConfigAttributeSetter(name=LOCATOR_WAIT_TIME_NAME)
-  public void setLocatorWaitTime(int seconds);
+  String LOCATOR_WAIT_TIME_NAME = LOCATOR_WAIT_TIME;
+
+  int DEFAULT_LOCATOR_WAIT_TIME = 0;
+
+  @ConfigAttributeGetter(name = LOCATOR_WAIT_TIME)
+  int getLocatorWaitTime();
+
+  @ConfigAttributeSetter(name = LOCATOR_WAIT_TIME)
+  void setLocatorWaitTime(int seconds);
   
   
   /**
    * returns the value of the <a href="../DistribytedSystem.html#start-locator">"start-locator"
    * </a> property
    */
-  @ConfigAttributeGetter(name=START_LOCATOR_NAME)
-  public String getStartLocator();
+  @ConfigAttributeGetter(name = START_LOCATOR)
+  String getStartLocator();
   /**
    * Sets the 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
    * @param value must be of the form <code>hostName[portNum]</code>
    */
-  @ConfigAttributeSetter(name=START_LOCATOR_NAME)
-  public void setStartLocator(String value);
+  @ConfigAttributeSetter(name = START_LOCATOR)
+  void setStartLocator(String value);
 
   /**
    * The name of the "start-locator" property
    */
   @ConfigAttribute(type=String.class)
-  public static final String START_LOCATOR_NAME = "start-locator";
+  String START_LOCATOR_NAME = START_LOCATOR;
   /**
    * The default value of the "start-locator" property
    */
-  public static final String DEFAULT_START_LOCATOR = "";
+  String DEFAULT_START_LOCATOR = "";
   
   /**
    * Returns the value of the <a
    * href="../DistributedSystem.html#deploy-working-dir">"deploy-working-dir"</a> property
    */
   @ConfigAttributeGetter(name=DEPLOY_WORKING_DIR)
-  public File getDeployWorkingDir();
+  File getDeployWorkingDir();
   
   /**
    * Sets the system's deploy working directory.
@@ -342,26 +351,26 @@ public interface DistributionConfig extends Config, LogConfig {
    *   when writing to the system's configuration file.
    */
   @ConfigAttributeSetter(name=DEPLOY_WORKING_DIR)
-  public void setDeployWorkingDir(File value);
+  void setDeployWorkingDir(File value);
   
   /**
    * The name of the "deploy-working-dir" property.
    */
   @ConfigAttribute(type=File.class)
-  public static final String DEPLOY_WORKING_DIR = "deploy-working-dir";
+  String DEPLOY_WORKING_DIR = SystemConfigurationProperties.DEPLOY_WORKING_DIR;
   
   /**
    * Default will be the current working directory as determined by 
    * <code>System.getProperty("user.dir")</code>.
    */
-  public static final File DEFAULT_DEPLOY_WORKING_DIR = new File(".");
+  File DEFAULT_DEPLOY_WORKING_DIR = new File(".");
   
   /**
    * Returns the value of the <a
    * href="../DistributedSystem.html#user-command-packages">"user-command-packages"</a> property
    */
   @ConfigAttributeGetter(name=USER_COMMAND_PACKAGES)
-  public String getUserCommandPackages();
+  String getUserCommandPackages();
   
   /**
    * Sets the system's user command path.
@@ -371,18 +380,18 @@ public interface DistributionConfig extends Config, LogConfig {
    *   when writing to the system's configuration file.
    */
   @ConfigAttributeSetter(name=USER_COMMAND_PACKAGES)
-  public void setUserCommandPackages(String value);
+  void setUserCommandPackages(String value);
   
   /**
    * The name of the "user-command-packages" property.
    */
   @ConfigAttribute(type=String.class)
-  public static final String USER_COMMAND_PACKAGES = "user-command-packages";
+  String USER_COMMAND_PACKAGES = SystemConfigurationProperties.USER_COMMAND_PACKAGES;
   
   /**
    * The default value of the "user-command-packages" property
    */
-  public static final String DEFAULT_USER_COMMAND_PACKAGES = "";
+  String DEFAULT_USER_COMMAND_PACKAGES = "";
 
   /**
    * Returns the value of the <a
@@ -392,7 +401,7 @@ public interface DistributionConfig extends Config, LogConfig {
    *         out
    */
   @ConfigAttributeGetter(name=LOG_FILE_NAME)
-  public File getLogFile();
+  File getLogFile();
   /**
    * Sets the system's log file.
    * <p> Non-absolute log files are relative to the system directory.
@@ -402,19 +411,20 @@ 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=LOG_FILE_NAME)
-  public void setLogFile(File value);
+  void setLogFile(File value);
 
   /** The name of the "logFile" property */
   @ConfigAttribute(type=File.class)
-  public static final String LOG_FILE_NAME = "log-file";
+  String LOG_FILE_NAME = LOG_FILE;
 
   /**
    * The default log file.
    * <p> Actual value of this constant is <code>""</code> which directs
    * log message to standard output.
    */
-  public static final File DEFAULT_LOG_FILE = new File("");
+  File DEFAULT_LOG_FILE = new File("");
 
   /**
    * Returns the value of the <a
@@ -423,7 +433,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @see com.gemstone.gemfire.internal.logging.LogWriterImpl
    */
   @ConfigAttributeGetter(name=LOG_LEVEL_NAME)
-  public int getLogLevel();
+  int getLogLevel();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#log-level">"log-level"</a> property
@@ -431,28 +441,28 @@ public interface DistributionConfig extends Config, LogConfig {
    * @see com.gemstone.gemfire.internal.logging.LogWriterImpl
    */
   @ConfigAttributeSetter(name=LOG_LEVEL_NAME)
-  public void setLogLevel(int value);
+  void setLogLevel(int value);
 
   /**
    * The default log level.
    * <p> Actual value of this constant is {@link InternalLogWriter#CONFIG_LEVEL}.
    */
-  public static final int DEFAULT_LOG_LEVEL = InternalLogWriter.CONFIG_LEVEL;
+  int DEFAULT_LOG_LEVEL = InternalLogWriter.CONFIG_LEVEL;
   /**
    * The minimum log level.
    * <p> Actual value of this constant is {@link InternalLogWriter#ALL_LEVEL}.
    */
-  public static final int MIN_LOG_LEVEL = InternalLogWriter.ALL_LEVEL;
+  int MIN_LOG_LEVEL = InternalLogWriter.ALL_LEVEL;
   /**
    * The maximum log level.
    * <p> Actual value of this constant is {@link InternalLogWriter#NONE_LEVEL}.
    */
-  public static final int MAX_LOG_LEVEL = InternalLogWriter.NONE_LEVEL;
+  int MAX_LOG_LEVEL = InternalLogWriter.NONE_LEVEL;
 
   /** The name of the "logLevel" 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)
-  public static final String LOG_LEVEL_NAME = "log-level";
+  String LOG_LEVEL_NAME = LOG_LEVEL;
 
   /**
    * Returns the value of the <a
@@ -460,20 +470,19 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=STATISTIC_SAMPLING_ENABLED_NAME)
-  public boolean getStatisticSamplingEnabled();
+  boolean getStatisticSamplingEnabled();
   /**
    * Sets StatisticSamplingEnabled
    */
   @ConfigAttributeSetter(name=STATISTIC_SAMPLING_ENABLED_NAME)
-  public void setStatisticSamplingEnabled(boolean newValue);
+  void setStatisticSamplingEnabled(boolean newValue);
 
   /** The name of the "statisticSamplingEnabled" property */
   @ConfigAttribute(type=Boolean.class)
-  public static final String STATISTIC_SAMPLING_ENABLED_NAME =
-    "statistic-sampling-enabled";
+  String STATISTIC_SAMPLING_ENABLED_NAME = STATISTIC_SAMPLING_ENABLED;
 
   /** The default value of the "statisticSamplingEnabled" property */
-  public static final boolean DEFAULT_STATISTIC_SAMPLING_ENABLED = true;
+  boolean DEFAULT_STATISTIC_SAMPLING_ENABLED = true;
 
   /**
    * Returns the value of the <a
@@ -481,35 +490,34 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=STATISTIC_SAMPLE_RATE_NAME)
-  public int getStatisticSampleRate();
+  int getStatisticSampleRate();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#statistic-sample-rate">"statistic-sample-rate"</a>
    * property
    */
   @ConfigAttributeSetter(name=STATISTIC_SAMPLE_RATE_NAME)
-  public void setStatisticSampleRate(int value);
+  void setStatisticSampleRate(int value);
 
   /**
    * The default statistic sample rate.
    * <p> Actual value of this constant is <code>1000</code> milliseconds.
    */
-  public static final int DEFAULT_STATISTIC_SAMPLE_RATE = 1000;
+  int DEFAULT_STATISTIC_SAMPLE_RATE = 1000;
   /**
    * The minimum statistic sample rate.
    * <p> Actual value of this constant is <code>100</code> milliseconds.
    */
-  public static final int MIN_STATISTIC_SAMPLE_RATE = 100;
+  int MIN_STATISTIC_SAMPLE_RATE = 100;
   /**
    * The maximum statistic sample rate.
    * <p> Actual value of this constant is <code>60000</code> milliseconds.
    */
-  public static final int MAX_STATISTIC_SAMPLE_RATE = 60000;
+  int MAX_STATISTIC_SAMPLE_RATE = 60000;
 
   /** The name of the "statisticSampleRate" property */
   @ConfigAttribute(type=Integer.class, min=MIN_STATISTIC_SAMPLE_RATE, max=MAX_STATISTIC_SAMPLE_RATE)
-  public static final String STATISTIC_SAMPLE_RATE_NAME =
-    "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.
@@ -517,24 +525,23 @@ public interface DistributionConfig extends Config, LogConfig {
    * @return <code>null</code> if no file was specified
    */
   @ConfigAttributeGetter(name=STATISTIC_ARCHIVE_FILE_NAME)
-  public File getStatisticArchiveFile();
+  File getStatisticArchiveFile();
   /**
    * Sets the value of the <a href="../DistributedSystem.html#statistic-archive-file">"statistic-archive-file"</a> property.
    */
   @ConfigAttributeSetter(name=STATISTIC_ARCHIVE_FILE_NAME)
-  public void setStatisticArchiveFile(File value);
+  void setStatisticArchiveFile(File value);
 
   /** The name of the "statisticArchiveFile" property */
   @ConfigAttribute(type=File.class)
-  public static final String STATISTIC_ARCHIVE_FILE_NAME =
-    "statistic-archive-file";
+  String STATISTIC_ARCHIVE_FILE_NAME = STATISTIC_ARCHIVE_FILE;
 
   /**
    * The default statistic archive file.
    * <p> Actual value of this constant is <code>""</code> which
    * causes no archive file to be created.
    */
-  public static final File DEFAULT_STATISTIC_ARCHIVE_FILE = new File(""); // fix for bug 29786
+  File DEFAULT_STATISTIC_ARCHIVE_FILE = new File(""); // fix for bug 29786
 
 
   /**
@@ -543,21 +550,21 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=CACHE_XML_FILE_NAME)
-  public File getCacheXmlFile();
+  File getCacheXmlFile();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
    * property
    */
   @ConfigAttributeSetter(name=CACHE_XML_FILE_NAME)
-  public void setCacheXmlFile(File value);
+  void setCacheXmlFile(File value);
 
   /** The name of the "cacheXmlFile" property */
   @ConfigAttribute(type=File.class)
-  public static final String CACHE_XML_FILE_NAME = "cache-xml-file";
+  String CACHE_XML_FILE_NAME = CACHE_XML_FILE;
 
   /** The default value of the "cacheXmlFile" property */
-  public static final File DEFAULT_CACHE_XML_FILE = new File("cache.xml");
+  File DEFAULT_CACHE_XML_FILE = new File("cache.xml");
 
   /**
    * Returns the value of the <a
@@ -565,7 +572,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=ACK_WAIT_THRESHOLD_NAME)
-  public int getAckWaitThreshold();
+  int getAckWaitThreshold();
 
   /**
    * Sets the value of the <a
@@ -574,26 +581,26 @@ public interface DistributionConfig extends Config, LogConfig {
      * Setting this value too low will cause spurious alerts.
      */
   @ConfigAttributeSetter(name=ACK_WAIT_THRESHOLD_NAME)
-  public void setAckWaitThreshold(int newThreshold);
+  void setAckWaitThreshold(int newThreshold);
 
   /**
    * The default AckWaitThreshold.
    * <p> Actual value of this constant is <code>15</code> seconds.
    */
-  public static final int DEFAULT_ACK_WAIT_THRESHOLD = 15;
+  int DEFAULT_ACK_WAIT_THRESHOLD = 15;
   /**
    * The minimum AckWaitThreshold.
    * <p> Actual value of this constant is <code>1</code> second.
    */
-  public static final int MIN_ACK_WAIT_THRESHOLD = 1;
+  int MIN_ACK_WAIT_THRESHOLD = 1;
   /**
    * The maximum AckWaitThreshold.
    * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
    */
-  public static final int MAX_ACK_WAIT_THRESHOLD = Integer.MAX_VALUE;
+  int MAX_ACK_WAIT_THRESHOLD = Integer.MAX_VALUE;
   /** The name of the "ackWaitThreshold" property */
   @ConfigAttribute(type=Integer.class, min=MIN_ACK_WAIT_THRESHOLD)
-  public static final String ACK_WAIT_THRESHOLD_NAME = "ack-wait-threshold";
+  String ACK_WAIT_THRESHOLD_NAME = ACK_WAIT_THRESHOLD;
 
 
   /**
@@ -602,7 +609,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=ACK_SEVERE_ALERT_THRESHOLD_NAME)
-  public int getAckSevereAlertThreshold();
+  int getAckSevereAlertThreshold();
 
   /**
    * Sets the value of the <a
@@ -611,28 +618,28 @@ public interface DistributionConfig extends Config, LogConfig {
      * Setting this value too low will cause spurious forced disconnects.
      */
   @ConfigAttributeSetter(name=ACK_SEVERE_ALERT_THRESHOLD_NAME)
-  public void setAckSevereAlertThreshold(int newThreshold);
+  void setAckSevereAlertThreshold(int newThreshold);
 
   /**
    * The default ackSevereAlertThreshold.
    * <p> Actual value of this constant is <code>0</code> seconds, which
    * turns off shunning.
    */
-  public static final int DEFAULT_ACK_SEVERE_ALERT_THRESHOLD = 0;
+  int DEFAULT_ACK_SEVERE_ALERT_THRESHOLD = 0;
   /**
    * The minimum ackSevereAlertThreshold.
    * <p> Actual value of this constant is <code>0</code> second,
    * which turns off shunning.
    */
-  public static final int MIN_ACK_SEVERE_ALERT_THRESHOLD = 0;
+  int MIN_ACK_SEVERE_ALERT_THRESHOLD = 0;
   /**
    * The maximum ackSevereAlertThreshold.
    * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
    */
-  public static final int MAX_ACK_SEVERE_ALERT_THRESHOLD = Integer.MAX_VALUE;
+  int MAX_ACK_SEVERE_ALERT_THRESHOLD = Integer.MAX_VALUE;
   /** The name of the "ackSevereAlertThreshold" property */
   @ConfigAttribute(type=Integer.class, min=MIN_ACK_SEVERE_ALERT_THRESHOLD)
-  public static final String ACK_SEVERE_ALERT_THRESHOLD_NAME = "ack-severe-alert-threshold";
+  String ACK_SEVERE_ALERT_THRESHOLD_NAME = ACK_SEVERE_ALERT_THRESHOLD;
 
   /**
    * Returns the value of the <a
@@ -640,105 +647,102 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=ARCHIVE_FILE_SIZE_LIMIT_NAME)
-  public int getArchiveFileSizeLimit();
+  int getArchiveFileSizeLimit();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#archive-file-size-limit">"archive-file-size-limit"</a>
    * property
    */
   @ConfigAttributeSetter(name=ARCHIVE_FILE_SIZE_LIMIT_NAME)
-  public void setArchiveFileSizeLimit(int value);
+  void setArchiveFileSizeLimit(int value);
 
   /**
    * The default statistic archive file size limit.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
-  public static final int DEFAULT_ARCHIVE_FILE_SIZE_LIMIT = 0;
+  int DEFAULT_ARCHIVE_FILE_SIZE_LIMIT = 0;
   /**
    * The minimum statistic archive file size limit.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
-  public static final int MIN_ARCHIVE_FILE_SIZE_LIMIT = 0;
+  int MIN_ARCHIVE_FILE_SIZE_LIMIT = 0;
   /**
    * The maximum statistic archive file size limit.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
-  public static final int MAX_ARCHIVE_FILE_SIZE_LIMIT = 1000000;
+  int MAX_ARCHIVE_FILE_SIZE_LIMIT = 1000000;
 
   /** The name of the "ArchiveFileSizeLimit" property */
   @ConfigAttribute(type=Integer.class, min=MIN_ARCHIVE_FILE_SIZE_LIMIT, max=MAX_ARCHIVE_FILE_SIZE_LIMIT)
-  public static final String ARCHIVE_FILE_SIZE_LIMIT_NAME =
-    "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>
    * property
    */
   @ConfigAttributeGetter(name=ARCHIVE_DISK_SPACE_LIMIT_NAME)
-  public int getArchiveDiskSpaceLimit();
+  int getArchiveDiskSpaceLimit();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#archive-disk-space-limit">"archive-disk-space-limit"</a>
    * property
    */
   @ConfigAttributeSetter(name=ARCHIVE_DISK_SPACE_LIMIT_NAME)
-  public void setArchiveDiskSpaceLimit(int value);
+  void setArchiveDiskSpaceLimit(int value);
 
   /**
    * The default archive disk space limit.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
-  public static final int DEFAULT_ARCHIVE_DISK_SPACE_LIMIT = 0;
+  int DEFAULT_ARCHIVE_DISK_SPACE_LIMIT = 0;
   /**
    * The minimum archive disk space limit.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
-  public static final int MIN_ARCHIVE_DISK_SPACE_LIMIT = 0;
+  int MIN_ARCHIVE_DISK_SPACE_LIMIT = 0;
   /**
    * The maximum archive disk space limit.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
-  public static final int MAX_ARCHIVE_DISK_SPACE_LIMIT = 1000000;
+  int MAX_ARCHIVE_DISK_SPACE_LIMIT = 1000000;
 
   /** The name of the "ArchiveDiskSpaceLimit" property */
   @ConfigAttribute(type=Integer.class, min=MIN_ARCHIVE_DISK_SPACE_LIMIT, max=MAX_ARCHIVE_DISK_SPACE_LIMIT)
-  public static final String ARCHIVE_DISK_SPACE_LIMIT_NAME =
-    "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>
    * property
    */
   @ConfigAttributeGetter(name=LOG_FILE_SIZE_LIMIT_NAME)
-  public int getLogFileSizeLimit();
+  int getLogFileSizeLimit();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a>
    * property
    */
   @ConfigAttributeSetter(name=LOG_FILE_SIZE_LIMIT_NAME)
-  public void setLogFileSizeLimit(int value);
+  void setLogFileSizeLimit(int value);
 
   /**
    * The default log file size limit.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
-  public static final int DEFAULT_LOG_FILE_SIZE_LIMIT = 0;
+  int DEFAULT_LOG_FILE_SIZE_LIMIT = 0;
   /**
    * The minimum log file size limit.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
-  public static final int MIN_LOG_FILE_SIZE_LIMIT = 0;
+  int MIN_LOG_FILE_SIZE_LIMIT = 0;
   /**
    * The maximum log file size limit.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
-  public static final int MAX_LOG_FILE_SIZE_LIMIT = 1000000;
+  int MAX_LOG_FILE_SIZE_LIMIT = 1000000;
 
   /** The name of the "LogFileSizeLimit" property */
   @ConfigAttribute(type=Integer.class, min=MIN_LOG_FILE_SIZE_LIMIT, max=MAX_LOG_FILE_SIZE_LIMIT)
-  public static final String LOG_FILE_SIZE_LIMIT_NAME =
-    "log-file-size-limit";
+  String LOG_FILE_SIZE_LIMIT_NAME = LOG_FILE_SIZE_LIMIT;
 
   /**
    * Returns the value of the <a
@@ -746,35 +750,34 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=LOG_DISK_SPACE_LIMIT_NAME)
-  public int getLogDiskSpaceLimit();
+  int getLogDiskSpaceLimit();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a>
    * property
    */
   @ConfigAttributeSetter(name=LOG_DISK_SPACE_LIMIT_NAME)
-  public void setLogDiskSpaceLimit(int value);
+  void setLogDiskSpaceLimit(int value);
 
   /**
    * The default log disk space limit.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
-  public static final int DEFAULT_LOG_DISK_SPACE_LIMIT = 0;
+  int DEFAULT_LOG_DISK_SPACE_LIMIT = 0;
   /**
    * The minimum log disk space limit.
    * <p> Actual value of this constant is <code>0</code> megabytes.
    */
-  public static final int MIN_LOG_DISK_SPACE_LIMIT = 0;
+  int MIN_LOG_DISK_SPACE_LIMIT = 0;
   /**
    * The maximum log disk space limit.
    * <p> Actual value of this constant is <code>1000000</code> megabytes.
    */
-  public static final int MAX_LOG_DISK_SPACE_LIMIT = 1000000;
+  int MAX_LOG_DISK_SPACE_LIMIT = 1000000;
 
   /** The name of the "LogDiskSpaceLimit" property */
   @ConfigAttribute(type=Integer.class, min=MIN_LOG_DISK_SPACE_LIMIT, max=MAX_LOG_DISK_SPACE_LIMIT)
-  public static final String LOG_DISK_SPACE_LIMIT_NAME =
-    "log-disk-space-limit";
+  String LOG_DISK_SPACE_LIMIT_NAME = LOG_DISK_SPACE_LIMIT;
 
   /**
    * Returns the value of the <a
@@ -783,21 +786,20 @@ public interface DistributionConfig extends Config, LogConfig {
    * @deprecated as of 8.0 use {@link #getClusterSSLEnabled} instead.
    */
   @ConfigAttributeGetter(name=SSL_ENABLED_NAME)
-  public boolean getSSLEnabled();
+  boolean getSSLEnabled();
 
   /**
    * The default 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.
    */
-  public static final boolean DEFAULT_SSL_ENABLED = false;
+  boolean DEFAULT_SSL_ENABLED = false;
   
   /** The name of the "SSLEnabled" property 
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED_NAME} instead.
    */
   @ConfigAttribute(type=Boolean.class)
-  public static final String SSL_ENABLED_NAME =
-    "ssl-enabled";
+  String SSL_ENABLED_NAME = SSL_ENABLED;
 
   /**
    * Sets the value of the <a
@@ -806,7 +808,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @deprecated as of 8.0 use {@link #setClusterSSLEnabled} instead.
    */
   @ConfigAttributeSetter(name=SSL_ENABLED_NAME)
-  public void setSSLEnabled( boolean enabled );
+  void setSSLEnabled(boolean enabled);
 
   /**
    * Returns the value of the <a
@@ -815,7 +817,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @deprecated as of 8.0 use {@link #getClusterSSLProtocols} instead.
    */
   @ConfigAttributeGetter(name=SSL_PROTOCOLS_NAME)
-   public String getSSLProtocols( );
+  String getSSLProtocols();
 
   /**
    * Sets the value of the <a
@@ -824,20 +826,19 @@ public interface DistributionConfig extends Config, LogConfig {
    * @deprecated as of 8.0 use {@link #setClusterSSLProtocols} instead.
    */
   @ConfigAttributeSetter(name=SSL_PROTOCOLS_NAME)
-   public void setSSLProtocols( String protocols );
+  void setSSLProtocols(String protocols);
 
   /**
    * The default 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.
    */
-  public static final String DEFAULT_SSL_PROTOCOLS = "any";
+  String DEFAULT_SSL_PROTOCOLS = "any";
   /** The name of the "SSLProtocols" property 
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS_NAME} instead.
    */
   @ConfigAttribute(type=String.class)
-  public static final String SSL_PROTOCOLS_NAME =
-    "ssl-protocols";
+  String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
 
   /**
    * Returns the value of the <a
@@ -846,7 +847,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @deprecated as of 8.0 use {@link #getClusterSSLCiphers} instead.
    */
   @ConfigAttributeGetter(name=SSL_CIPHERS_NAME)
-   public String getSSLCiphers( );
+  String getSSLCiphers();
 
   /**
    * Sets the value of the <a
@@ -855,20 +856,19 @@ public interface DistributionConfig extends Config, LogConfig {
    * @deprecated as of 8.0 use {@link #setClusterSSLCiphers} instead.
    */
   @ConfigAttributeSetter(name=SSL_CIPHERS_NAME)
-   public void setSSLCiphers( String ciphers );
+  void setSSLCiphers(String ciphers);
 
    /**
    * The default 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.
    */
-  public static final String DEFAULT_SSL_CIPHERS = "any";
+   String DEFAULT_SSL_CIPHERS = "any";
   /** The name of the "SSLCiphers" property 
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS_NAME} instead.
    */
   @ConfigAttribute(type=String.class)
-  public static final String SSL_CIPHERS_NAME =
-    "ssl-ciphers";
+  String SSL_CIPHERS_NAME = SSL_CIPHERS;
 
   /**
    * Returns the value of the <a
@@ -877,7 +877,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @deprecated as of 8.0 use {@link #getClusterSSLRequireAuthentication} instead.
    */
   @ConfigAttributeGetter(name=SSL_REQUIRE_AUTHENTICATION_NAME)
-   public boolean getSSLRequireAuthentication( );
+  boolean getSSLRequireAuthentication();
 
   /**
    * Sets the value of the <a
@@ -886,20 +886,19 @@ public interface DistributionConfig extends Config, LogConfig {
    * @deprecated as of 8.0 use {@link #setClusterSSLRequireAuthentication} instead.
    */
   @ConfigAttributeSetter(name=SSL_REQUIRE_AUTHENTICATION_NAME)
-   public void setSSLRequireAuthentication( boolean enabled );
+  void setSSLRequireAuthentication(boolean enabled);
 
    /**
    * The default 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.
    */
-  public static final boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION = true;
+   boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION = true;
   /** The name of the "SSLRequireAuthentication" property 
    * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME} instead.
    */
   @ConfigAttribute(type=Boolean.class)
-  public static final String SSL_REQUIRE_AUTHENTICATION_NAME =
-    "ssl-require-authentication";
+  String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
 
   /**
    * Returns the value of the <a
@@ -907,17 +906,16 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=CLUSTER_SSL_ENABLED_NAME)
-  public boolean getClusterSSLEnabled();
+  boolean getClusterSSLEnabled();
 
   /**
    * The default cluster-ssl-enabled state.
    * <p> Actual value of this constant is <code>false</code>.
    */
-  public static final boolean DEFAULT_CLUSTER_SSL_ENABLED = false;
+  boolean DEFAULT_CLUSTER_SSL_ENABLED = false;
   /** The name of the "ClusterSSLEnabled" property */
   @ConfigAttribute(type=Boolean.class)
-  public static final String CLUSTER_SSL_ENABLED_NAME =
-    "cluster-ssl-enabled";
+  String CLUSTER_SSL_ENABLED_NAME = CLUSTER_SSL_ENABLED;
 
   /**
    * Sets the value of the <a
@@ -925,7 +923,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=CLUSTER_SSL_ENABLED_NAME)
-  public void setClusterSSLEnabled( boolean enabled );
+  void setClusterSSLEnabled(boolean enabled);
 
   /**
    * Returns the value of the <a
@@ -933,7 +931,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=CLUSTER_SSL_PROTOCOLS_NAME)
-   public String getClusterSSLProtocols( );
+  String getClusterSSLProtocols();
 
   /**
    * Sets the value of the <a
@@ -941,17 +939,16 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=CLUSTER_SSL_PROTOCOLS_NAME)
-   public void setClusterSSLProtocols( String protocols );
+  void setClusterSSLProtocols(String protocols);
 
   /**
    * The default cluster-ssl-protocols value.
    * <p> Actual value of this constant is <code>any</code>.
    */
-  public static final String DEFAULT_CLUSTER_SSL_PROTOCOLS = "any";
+  String DEFAULT_CLUSTER_SSL_PROTOCOLS = "any";
   /** The name of the "ClusterSSLProtocols" property */
   @ConfigAttribute(type=String.class)
-  public static final String CLUSTER_SSL_PROTOCOLS_NAME =
-    "cluster-ssl-protocols";
+  String CLUSTER_SSL_PROTOCOLS_NAME = CLUSTER_SSL_PROTOCOLS;
 
   /**
    * Returns the value of the <a
@@ -959,7 +956,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=CLUSTER_SSL_CIPHERS_NAME)
-   public String getClusterSSLCiphers( );
+  String getClusterSSLCiphers();
 
   /**
    * Sets the value of the <a
@@ -967,17 +964,16 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=CLUSTER_SSL_CIPHERS_NAME)
-   public void setClusterSSLCiphers( String ciphers );
+  void setClusterSSLCiphers(String ciphers);
 
    /**
    * The default cluster-ssl-ciphers value.
    * <p> Actual value of this constant is <code>any</code>.
    */
-  public static final String DEFAULT_CLUSTER_SSL_CIPHERS = "any";
+   String DEFAULT_CLUSTER_SSL_CIPHERS = "any";
   /** The name of the "ClusterSSLCiphers" property */
   @ConfigAttribute(type=String.class)
-  public static final String CLUSTER_SSL_CIPHERS_NAME =
-    "cluster-ssl-ciphers";
+  String CLUSTER_SSL_CIPHERS_NAME = CLUSTER_SSL_CIPHERS;
 
   /**
    * Returns the value of the <a
@@ -985,7 +981,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)
-   public boolean getClusterSSLRequireAuthentication( );
+  boolean getClusterSSLRequireAuthentication();
 
   /**
    * Sets the value of the <a
@@ -993,17 +989,16 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME)
-   public void setClusterSSLRequireAuthentication( boolean enabled );
+  void setClusterSSLRequireAuthentication(boolean enabled);
 
    /**
    * The default cluster-ssl-require-authentication value.
    * <p> Actual value of this constant is <code>true</code>.
    */
-  public static final boolean DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION = true;
+   boolean DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION = true;
   /** The name of the "ClusterSSLRequireAuthentication" property */
   @ConfigAttribute(type=Boolean.class)
-  public static final String CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME =
-    "cluster-ssl-require-authentication";
+  String CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME = CLUSTER_SSL_REQUIRE_AUTHENTICATION;
 
   
   /**
@@ -1012,7 +1007,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=CLUSTER_SSL_KEYSTORE_NAME)
-  public String getClusterSSLKeyStore( );
+  String getClusterSSLKeyStore();
   
   /**
    * Sets the value of the <a
@@ -1020,17 +1015,17 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=CLUSTER_SSL_KEYSTORE_NAME)
-  public void setClusterSSLKeyStore( String keyStore);
+  void setClusterSSLKeyStore(String keyStore);
   
   /**
    * The default cluster-ssl-keystore value.
    * <p> Actual value of this constant is "".
    */
-  public static final String DEFAULT_CLUSTER_SSL_KEYSTORE = "";
+  String DEFAULT_CLUSTER_SSL_KEYSTORE = "";
   
   /** The name of the "ClusterSSLKeyStore" property */
   @ConfigAttribute(type=String.class)
-  public static final String CLUSTER_SSL_KEYSTORE_NAME = "cluster-ssl-keystore";
+  String CLUSTER_SSL_KEYSTORE_NAME = CLUSTER_SSL_KEYSTORE;
   
   /**
    * Returns the value of the <a
@@ -1038,7 +1033,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=CLUSTER_SSL_KEYSTORE_TYPE_NAME)
-  public String getClusterSSLKeyStoreType( );
+  String getClusterSSLKeyStoreType();
   
   /**
    * Sets the value of the <a
@@ -1046,17 +1041,17 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=CLUSTER_SSL_KEYSTORE_TYPE_NAME)
-  public void setClusterSSLKeyStoreType( String keyStoreType);
+  void setClusterSSLKeyStoreType(String keyStoreType);
   
   /**
    * The default cluster-ssl-keystore-type value.
    * <p> Actual value of this constant is "".
    */
-  public static final String DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE = "";
+  String DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE = "";
   
   /** The name of the "ClusterSSLKeyStoreType" property */
   @ConfigAttribute(type=String.class)
-  public static final String CLUSTER_SSL_KEYSTORE_TYPE_NAME = "cluster-ssl-keystore-type";
+  String CLUSTER_SSL_KEYSTORE_TYPE_NAME = CLUSTER_SSL_KEYSTORE_TYPE;
   
   /**
    * Returns the value of the <a
@@ -1064,7 +1059,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)
-  public String getClusterSSLKeyStorePassword( );
+  String getClusterSSLKeyStorePassword();
   
   /**
    * Sets the value of the <a
@@ -1072,17 +1067,17 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=CLUSTER_SSL_KEYSTORE_PASSWORD_NAME)
-  public void setClusterSSLKeyStorePassword( String keyStorePassword);
+  void setClusterSSLKeyStorePassword(String keyStorePassword);
   
   /**
    * The default cluster-ssl-keystore-password value.
    * <p> Actual value of this constant is "".
    */
-  public static final String DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD = "";
+  String DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD = "";
   
   /** The name of the "ClusterSSLKeyStorePassword" property */
   @ConfigAttribute(type=String.class)
-  public static final String CLUSTER_SSL_KEYSTORE_PASSWORD_NAME = "cluster-ssl-keystore-password";
+  String CLUSTER_SSL_KEYSTORE_PASSWORD_NAME = CLUSTER_SSL_KEYSTORE_PASSWORD;
   
   /**
    * Returns the value of the <a
@@ -1090,7 +1085,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=CLUSTER_SSL_TRUSTSTORE_NAME)
-  public String getClusterSSLTrustStore( );
+  String getClusterSSLTrustStore();
   
   /**
    * Sets the value of the <a
@@ -1098,17 +1093,17 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=CLUSTER_SSL_TRUSTSTORE_NAME)
-  public void setClusterSSLTrustStore( String trustStore);
+  void setClusterSSLTrustStore(String trustStore);
   
   /**
    * The default cluster-ssl-truststore value.
    * <p> Actual value of this constant is "".
    */
-  public static final String DEFAULT_CLUSTER_SSL_TRUSTSTORE = "";
+  String DEFAULT_CLUSTER_SSL_TRUSTSTORE = "";
   
   /** The name of the "ClusterSSLTrustStore" property */
   @ConfigAttribute(type=String.class)
-  public static final String CLUSTER_SSL_TRUSTSTORE_NAME = "cluster-ssl-truststore";
+  String CLUSTER_SSL_TRUSTSTORE_NAME = CLUSTER_SSL_TRUSTSTORE;
   
   /**
    * Returns the value of the <a
@@ -1116,7 +1111,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)
-  public String getClusterSSLTrustStorePassword( );
+  String getClusterSSLTrustStorePassword();
   
   /**
    * Sets the value of the <a
@@ -1124,16 +1119,16 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME)
-  public void setClusterSSLTrustStorePassword( String trusStorePassword);
+  void setClusterSSLTrustStorePassword(String trusStorePassword);
   /**
    * The default cluster-ssl-truststore-password value.
    * <p> Actual value of this constant is "".
    */
-  public static final String DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD = "";
+  String DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD = "";
   
   /** The name of the "ClusterSSLKeyStorePassword" property */
   @ConfigAttribute(type=String.class)
-  public static final String CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME = "cluster-ssl-truststore-password";
+  String CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME = CLUSTER_SSL_TRUSTSTORE_PASSWORD;
   
   
   /** The name of an internal property that specifies a {@link
@@ -1157,7 +1152,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * disconnect.
    * @since GemFire 8.1
    */
-  public static final String DS_RECONNECTING_NAME = "ds-reconnecting";
+  String DS_RECONNECTING_NAME = "ds-reconnecting";
   
   /**
    * The name of an internal property that specifies the
@@ -1165,7 +1160,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * This should be used if the DS_RECONNECTING_NAME property
    * is used.
    */
-  public static final String DS_QUORUM_CHECKER_NAME = "ds-quorum-checker";
+  String DS_QUORUM_CHECKER_NAME = "ds-quorum-checker";
   
   /**
    * The name of an internal property that specifies a {@link
@@ -1174,7 +1169,7 @@ public interface DistributionConfig extends Config, LogConfig {
    *
    * @since GemFire 5.5
    */
-  public static final String SECURITY_LOG_WRITER_NAME = "security-log-writer";
+  String SECURITY_LOG_WRITER_NAME = "security-log-writer";
 
   /** The name of an internal property that specifies a
    * FileOutputStream associated with the internal property
@@ -1184,7 +1179,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * with setProperty()
    * @since GemFire 5.0
    */
-  public static final String LOG_OUTPUTSTREAM_NAME = "log-output-stream";
+  String LOG_OUTPUTSTREAM_NAME = "log-output-stream";
 
   /**
    * The name of an internal property that specifies a FileOutputStream
@@ -1194,7 +1189,7 @@ public interface DistributionConfig extends Config, LogConfig {
    *
    * @since GemFire 5.5
    */
-  public static final String SECURITY_LOG_OUTPUTSTREAM_NAME = "security-log-output-stream";
+  String SECURITY_LOG_OUTPUTSTREAM_NAME = "security-log-output-stream";
 
   /**
    * Returns the value of the <a
@@ -1202,33 +1197,33 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=SOCKET_LEASE_TIME_NAME)
-  public int getSocketLeaseTime();
+  int getSocketLeaseTime();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#socket-lease-time">"socket-lease-time"</a>
    * property
    */
   @ConfigAttributeSetter(name=SOCKET_LEASE_TIME_NAME)
-  public void setSocketLeaseTime(int value);
+  void setSocketLeaseTime(int value);
 
 
 
   /** The default value of the "socketLeaseTime" property */
-  public static final int DEFAULT_SOCKET_LEASE_TIME = 60000;
+  int DEFAULT_SOCKET_LEASE_TIME = 60000;
   /**
    * The minimum socketLeaseTime.
    * <p> Actual value of this constant is <code>0</code>.
    */
-  public static final int MIN_SOCKET_LEASE_TIME = 0;
+  int MIN_SOCKET_LEASE_TIME = 0;
   /**
    * The maximum socketLeaseTime.
    * <p> Actual value of this constant is <code>600000</code>.
    */
-  public static final int MAX_SOCKET_LEASE_TIME = 600000;
+  int MAX_SOCKET_LEASE_TIME = 600000;
 
   /** The name of the "socketLeaseTime" property */
   @ConfigAttribute(type=Integer.class, min=MIN_SOCKET_LEASE_TIME, max=MAX_SOCKET_LEASE_TIME)
-  public static final String SOCKET_LEASE_TIME_NAME = "socket-lease-time";
+  String SOCKET_LEASE_TIME_NAME = SOCKET_LEASE_TIME;
 
   /**
    * Returns the value of the <a
@@ -1236,35 +1231,35 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=SOCKET_BUFFER_SIZE_NAME)
-  public int getSocketBufferSize();
+  int getSocketBufferSize();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#socket-buffer-size">"socket-buffer-size"</a>
    * property
    */
   @ConfigAttributeSetter(name=SOCKET_BUFFER_SIZE_NAME)
-  public void setSocketBufferSize(int value);
+  void setSocketBufferSize(int value);
 
 
   /** The default value of the "socketBufferSize" property */
-  public static final int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
+  int DEFAULT_SOCKET_BUFFER_SIZE = 32768;
   /**
    * The minimum socketBufferSize.
    * <p> Actual value of this constant is <code>1024</code>.
    */
-  public static final int MIN_SOCKET_BUFFER_SIZE = 1024;
+  int MIN_SOCKET_BUFFER_SIZE = 1024;
   /**
    * The maximum socketBufferSize.
    * <p> Actual value of this constant is <code>20000000</code>.
    */
-  public static final int MAX_SOCKET_BUFFER_SIZE = Connection.MAX_MSG_SIZE;
+  int MAX_SOCKET_BUFFER_SIZE = Connection.MAX_MSG_SIZE;
 
-  public static final boolean VALIDATE = Boolean.getBoolean("gemfire.validateMessageSize");
-  public static final int VALIDATE_CEILING = Integer.getInteger("gemfire.validateMessageSizeCeiling",  8 * 1024 * 1024).intValue();
+  boolean VALIDATE = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "validateMessageSize");
+  int VALIDATE_CEILING = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "validateMessageSizeCeiling", 8 * 1024 * 1024).intValue();
 
   /** The name of the "socketBufferSize" property */
   @ConfigAttribute(type=Integer.class, min=MIN_SOCKET_BUFFER_SIZE, max=MAX_SOCKET_BUFFER_SIZE)
-  public static final String SOCKET_BUFFER_SIZE_NAME = "socket-buffer-size";
+  String SOCKET_BUFFER_SIZE_NAME = SOCKET_BUFFER_SIZE;
 
 
   /**
@@ -1273,7 +1268,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=MCAST_SEND_BUFFER_SIZE_NAME)
-  public int getMcastSendBufferSize();
+  int getMcastSendBufferSize();
 
   /**
    * Set the value of the
@@ -1281,26 +1276,26 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeSetter(name=MCAST_SEND_BUFFER_SIZE_NAME)
-  public void setMcastSendBufferSize(int value);
+  void setMcastSendBufferSize(int value);
 
 
   /**
    * The default value of the corresponding property
    */
-  public static final int DEFAULT_MCAST_SEND_BUFFER_SIZE = 65535;
+  int DEFAULT_MCAST_SEND_BUFFER_SIZE = 65535;
 
 
   /**
    * The minimum size of the buffer, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
-  public static final int MIN_MCAST_SEND_BUFFER_SIZE = 2048;
+  int MIN_MCAST_SEND_BUFFER_SIZE = 2048;
 
   /**
    * The name of the corresponding property
    */
   @ConfigAttribute(type=Integer.class, min=MIN_MCAST_SEND_BUFFER_SIZE)
-  public static final String MCAST_SEND_BUFFER_SIZE_NAME = "mcast-send-buffer-size";
+  String MCAST_SEND_BUFFER_SIZE_NAME = MCAST_SEND_BUFFER_SIZE;
 
   /**
    * Get the value of the
@@ -1308,7 +1303,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=MCAST_RECV_BUFFER_SIZE_NAME)
-  public int getMcastRecvBufferSize();
+  int getMcastRecvBufferSize();
 
   /**
    * Set the value of the
@@ -1316,25 +1311,25 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeSetter(name=MCAST_RECV_BUFFER_SIZE_NAME)
-  public void setMcastRecvBufferSize(int value);
+  void setMcastRecvBufferSize(int value);
 
 
   /**
    * The default value of the corresponding property
    */
-  public static final int DEFAULT_MCAST_RECV_BUFFER_SIZE = 1048576;
+  int DEFAULT_MCAST_RECV_BUFFER_SIZE = 1048576;
 
   /**
    * The minimum size of the buffer, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
-  public static final int MIN_MCAST_RECV_BUFFER_SIZE = 2048;
+  int MIN_MCAST_RECV_BUFFER_SIZE = 2048;
 
   /**
    * The name of the corresponding property
    */
   @ConfigAttribute(type=Integer.class, min=MIN_MCAST_RECV_BUFFER_SIZE)
-  public static final String MCAST_RECV_BUFFER_SIZE_NAME = "mcast-recv-buffer-size";
+  String MCAST_RECV_BUFFER_SIZE_NAME = MCAST_RECV_BUFFER_SIZE;
 
 
   /**
@@ -1343,7 +1338,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=MCAST_FLOW_CONTROL_NAME)
-  public FlowControlParams getMcastFlowControl();
+  FlowControlParams getMcastFlowControl();
 
   /**
    * Set the value of the
@@ -1351,49 +1346,49 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeSetter(name=MCAST_FLOW_CONTROL_NAME)
-  public void setMcastFlowControl(FlowControlParams values);
+  void setMcastFlowControl(FlowControlParams values);
 
   /**
    * The name of the corresponding property
    */
   @ConfigAttribute(type=FlowControlParams.class)
-  public static final String MCAST_FLOW_CONTROL_NAME = "mcast-flow-control";
+  String MCAST_FLOW_CONTROL_NAME = MCAST_FLOW_CONTROL;
 
   /**
    * The default value of the corresponding property
    */
-  public static final FlowControlParams DEFAULT_MCAST_FLOW_CONTROL
+  FlowControlParams DEFAULT_MCAST_FLOW_CONTROL
     = new FlowControlParams(1048576, (float)0.25, 5000);
 
   /**
    * The minimum byteAllowance for the mcast-flow-control setting of
    * <code>100000</code>.
    */
-  public static final int MIN_FC_BYTE_ALLOWANCE = 10000;
+  int MIN_FC_BYTE_ALLOWANCE = 10000;
 
   /**
    * The minimum rechargeThreshold for the mcast-flow-control setting of
    * <code>0.1</code>
    */
-  public static final float MIN_FC_RECHARGE_THRESHOLD = (float)0.1;
+  float MIN_FC_RECHARGE_THRESHOLD = (float) 0.1;
 
   /**
    * The maximum rechargeThreshold for the mcast-flow-control setting of
    * <code>0.5</code>
    */
-  public static final float MAX_FC_RECHARGE_THRESHOLD = (float)0.5;
+  float MAX_FC_RECHARGE_THRESHOLD = (float) 0.5;
 
   /**
    * The minimum rechargeBlockMs for the mcast-flow-control setting of
    * <code>500</code>
    */
-  public static final int MIN_FC_RECHARGE_BLOCK_MS = 500;
+  int MIN_FC_RECHARGE_BLOCK_MS = 500;
 
   /**
    * The maximum rechargeBlockMs for the mcast-flow-control setting of
    * <code>60000</code>
    */
-  public static final int MAX_FC_RECHARGE_BLOCK_MS = 60000;
+  int MAX_FC_RECHARGE_BLOCK_MS = 60000;
 
   /**
    * Get the value of the
@@ -1401,7 +1396,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=UDP_FRAGMENT_SIZE_NAME)
-  public int getUdpFragmentSize();
+  int getUdpFragmentSize();
 
   /**
    * Set the value of the
@@ -1409,26 +1404,26 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeSetter(name=UDP_FRAGMENT_SIZE_NAME)
-  public void setUdpFragmentSize(int value);
+  void setUdpFragmentSize(int value);
 
   /**
    * The default value of the corresponding property
    */
-  public static final int DEFAULT_UDP_FRAGMENT_SIZE = 60000;
+  int DEFAULT_UDP_FRAGMENT_SIZE = 60000;
 
   /** The minimum allowed udp-fragment-size setting of 1000
   */
-  public static final int MIN_UDP_FRAGMENT_SIZE = 1000;
+  int MIN_UDP_FRAGMENT_SIZE = 1000;
 
   /** The maximum allowed udp-fragment-size setting of 60000
   */
-  public static final int MAX_UDP_FRAGMENT_SIZE = 60000;
+  int MAX_UDP_FRAGMENT_SIZE = 60000;
 
   /**
    * The name of the corresponding property
    */
   @ConfigAttribute(type=Integer.class, min=MIN_UDP_FRAGMENT_SIZE, max=MAX_UDP_FRAGMENT_SIZE)
-  public static final String UDP_FRAGMENT_SIZE_NAME = "udp-fragment-size";
+  String UDP_FRAGMENT_SIZE_NAME = UDP_FRAGMENT_SIZE;
 
 
 
@@ -1439,7 +1434,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=UDP_SEND_BUFFER_SIZE_NAME)
-  public int getUdpSendBufferSize();
+  int getUdpSendBufferSize();
 
   /**
    * Set the value of the
@@ -1447,24 +1442,24 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeSetter(name=UDP_SEND_BUFFER_SIZE_NAME)
-  public void setUdpSendBufferSize(int value);
+  void setUdpSendBufferSize(int value);
 
   /**
    * The default value of the corresponding property
    */
-  public static final int DEFAULT_UDP_SEND_BUFFER_SIZE = 65535;
+  int DEFAULT_UDP_SEND_BUFFER_SIZE = 65535;
 
   /**
    * The minimum size of the buffer, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
-  public static final int MIN_UDP_SEND_BUFFER_SIZE = 2048;
+  int MIN_UDP_SEND_BUFFER_SIZE = 2048;
 
   /**
    * The name of the corresponding property
    */
   @ConfigAttribute(type=Integer.class, min=MIN_UDP_SEND_BUFFER_SIZE)
-  public static final String UDP_SEND_BUFFER_SIZE_NAME = "udp-send-buffer-size";
+  String UDP_SEND_BUFFER_SIZE_NAME = UDP_SEND_BUFFER_SIZE;
 
   /**
    * Get the value of the
@@ -1472,7 +1467,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=UDP_RECV_BUFFER_SIZE_NAME)
-  public int getUdpRecvBufferSize();
+  int getUdpRecvBufferSize();
 
   /**
    * Set the value of the
@@ -1480,31 +1475,31 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeSetter(name=UDP_RECV_BUFFER_SIZE_NAME)
-  public void setUdpRecvBufferSize(int value);
+  void setUdpRecvBufferSize(int value);
 
   /**
    * The default value of the unicast receive buffer size property
    */
-  public static final int DEFAULT_UDP_RECV_BUFFER_SIZE = 1048576;
+  int DEFAULT_UDP_RECV_BUFFER_SIZE = 1048576;
 
   /**
    * The default size of the unicast receive buffer property if tcp/ip sockets are
    * enabled and multicast is disabled
    */
-  public static final int DEFAULT_UDP_RECV_BUFFER_SIZE_REDUCED = 65535;
+  int DEFAULT_UDP_RECV_BUFFER_SIZE_REDUCED = 65535;
 
   /**
    * The minimum size of the buffer, in bytes.
    * <p> Actual value of this constant is <code>2048</code>.
    */
-  public static final int MIN_UDP_RECV_BUFFER_SIZE = 2048;
+  int MIN_UDP_RECV_BUFFER_SIZE = 2048;
 
 
   /**
    * The name of the corresponding property
    */
   @ConfigAttribute(type=Integer.class, min=MIN_UDP_RECV_BUFFER_SIZE)
-  public static final String UDP_RECV_BUFFER_SIZE_NAME = "udp-recv-buffer-size";
+  String UDP_RECV_BUFFER_SIZE_NAME = UDP_RECV_BUFFER_SIZE;
 
   /**
    * Returns the value of the <a
@@ -1512,28 +1507,28 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=DISABLE_TCP_NAME)
-  public boolean getDisableTcp();
+  boolean getDisableTcp();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#disable-tcp">"disable-tcp"</a>
    * property.
    */
   @ConfigAttributeSetter(name=DISABLE_TCP_NAME)
-  public void setDisableTcp(boolean newValue);
+  void setDisableTcp(boolean newValue);
 
   /** The name of the corresponding property */
   @ConfigAttribute(type=Boolean.class)
-  public static final String DISABLE_TCP_NAME = "disable-tcp";
+  String DISABLE_TCP_NAME = DISABLE_TCP;
 
   /** The default value of the corresponding property */
-  public static final boolean DEFAULT_DISABLE_TCP = false;
+  boolean DEFAULT_DISABLE_TCP = false;
 
 
   /**
    * Turns on timing statistics for the distributed system
    */
   @ConfigAttributeSetter(name=ENABLE_TIME_STATISTICS_NAME)
-  public void setEnableTimeStatistics(boolean newValue);
+  void setEnableTimeStatistics(boolean newValue);
 
   /**
    * Returns the value of <a
@@ -1541,14 +1536,14 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=ENABLE_TIME_STATISTICS_NAME)
-  public boolean getEnableTimeStatistics();
+  boolean getEnableTimeStatistics();
 
   /** the name of the corresponding property */
   @ConfigAttribute(type=Boolean.class)
-  public static final String ENABLE_TIME_STATISTICS_NAME = "enable-time-statistics";
+  String ENABLE_TIME_STATISTICS_NAME = ENABLE_TIME_STATISTICS;
 
   /** The default value of the corresponding property */
-  public static final boolean DEFAULT_ENABLE_TIME_STATISTICS = false;
+  boolean DEFAULT_ENABLE_TIME_STATISTICS = false;
 
 
   /**
@@ -1556,7 +1551,7 @@ public interface DistributionConfig extends Config, LogConfig {
    <a href="../DistributedSystem.html#use-cluster-configuration">use-shared-configuration</a>
    */
   @ConfigAttributeSetter(name=USE_CLUSTER_CONFIGURATION_NAME)
-  public void setUseSharedConfiguration(boolean newValue);
+  void setUseSharedConfiguration(boolean newValue);
 
   /**
    * Returns the value of <a
@@ -1564,21 +1559,21 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=USE_CLUSTER_CONFIGURATION_NAME)
-  public boolean getUseSharedConfiguration();
+  boolean getUseSharedConfiguration();
 
   /** the name of the corresponding property */
   @ConfigAttribute(type=Boolean.class)
-  public static final String USE_CLUSTER_CONFIGURATION_NAME = "use-cluster-configuration";
+  String USE_CLUSTER_CONFIGURATION_NAME = USE_CLUSTER_CONFIGURATION;
 
   /** The default value of the corresponding property */
-  public static final boolean DEFAULT_USE_CLUSTER_CONFIGURATION = true;
+  boolean DEFAULT_USE_CLUSTER_CONFIGURATION = true;
   
   /**
    * Sets the value for 
    <a href="../DistributedSystem.html#enable-cluster-configuration">enable-cluster-configuration</a>
    */
   @ConfigAttributeSetter(name=ENABLE_CLUSTER_CONFIGURATION_NAME)
-  public void setEnableClusterConfiguration(boolean newValue);
+  void setEnableClusterConfiguration(boolean newValue);
 
   /**
    * Returns the value of <a
@@ -1586,17 +1581,18 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=ENABLE_CLUSTER_CONFIGURATION_NAME)
-  public boolean getEnableClusterConfiguration();
+  boolean getEnableClusterConfiguration();
 
   /** the name of the corresponding property */
   @ConfigAttribute(type=Boolean.class)
-  public static final String ENABLE_CLUSTER_CONFIGURATION_NAME = "enable-cluster-configuration";
+  String ENABLE_CLUSTER_CONFIGURATION_NAME = ENABLE_CLUSTER_CONFIGURATION;
+
   /** The default value of the corresponding property */
-  public static final boolean DEFAULT_ENABLE_CLUSTER_CONFIGURATION = true;
+  boolean DEFAULT_ENABLE_CLUSTER_CONFIGURATION = true;
 
   @ConfigAttribute(type=Boolean.class)
-  public static final String LOAD_CLUSTER_CONFIG_FROM_DIR_NAME = "load-cluster-configuration-from-dir";
-  public static final boolean DEFAULT_LOAD_CLUSTER_CONFIG_FROM_DIR = false;
+  String LOAD_CLUSTER_CONFIG_FROM_DIR_NAME = LOAD_CLUSTER_CONFIGURATION_FROM_DIR;
+  boolean DEFAULT_LOAD_CLUSTER_CONFIG_FROM_DIR = false;
   
   /**
    * Returns the value of 
@@ -1604,7 +1600,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=LOAD_CLUSTER_CONFIG_FROM_DIR_NAME)
-  public boolean getLoadClusterConfigFromDir();
+  boolean getLoadClusterConfigFromDir();
   
   /**
    * Sets the value of 
@@ -1612,30 +1608,30 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeSetter(name=LOAD_CLUSTER_CONFIG_FROM_DIR_NAME)
-  public void setLoadClusterConfigFromDir(boolean newValue);
+  void setLoadClusterConfigFromDir(boolean newValue);
 
   @ConfigAttribute(type=String.class)
-  public static final String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
-  public static final String DEFAULT_CLUSTER_CONFIGURATION_DIR = System.getProperty("user.dir");
+  String CLUSTER_CONFIGURATION_DIR = SystemConfigurationProperties.CLUSTER_CONFIGURATION_DIR;
+  String DEFAULT_CLUSTER_CONFIGURATION_DIR = System.getProperty("user.dir");
 
   @ConfigAttributeGetter(name=CLUSTER_CONFIGURATION_DIR)
-  public String getClusterConfigDir();
+  String getClusterConfigDir();
   @ConfigAttributeSetter(name=CLUSTER_CONFIGURATION_DIR)
-  public void setClusterConfigDir(final String clusterConfigDir);
+  void setClusterConfigDir(String clusterConfigDir);
   
   /** Turns on network partition detection */
   @ConfigAttributeSetter(name=ENABLE_NETWORK_PARTITION_DETECTION_NAME)
-  public void setEnableNetworkPartitionDetection(boolean newValue);
+  void setEnableNetworkPartitionDetection(boolean newValue);
   /**
    * Returns the value of the enable-network-partition-detection property
    */
   @ConfigAttributeGetter(name=ENABLE_NETWORK_PARTITION_DETECTION_NAME)
-  public boolean getEnableNetworkPartitionDetection();
+  boolean getEnableNetworkPartitionDetection();
+
   /** the name of the corresponding property */
   @ConfigAttribute(type=Boolean.class)
-  public static final String ENABLE_NETWORK_PARTITION_DETECTION_NAME =
-    "enable-network-partition-detection";
-  public static final boolean DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION = false;
+  String ENABLE_NETWORK_PARTITION_DETECTION_NAME = ENABLE_NETWORK_PARTITION_DETECTION;
+  boolean DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION = false;
 
   /**
    * Get the value of the
@@ -1643,7 +1639,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=MEMBER_TIMEOUT_NAME)
-  public int getMemberTimeout();
+  int getMemberTimeout();
 
   /**
    * Set the value of the
@@ -1651,34 +1647,34 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeSetter(name=MEMBER_TIMEOUT_NAME)
-  public void setMemberTimeout(int value);
+  void setMemberTimeout(int value);
 
   /**
    * The default value of the corresponding property
    */
-  public static final int DEFAULT_MEMBER_TIMEOUT = 5000;
+  int DEFAULT_MEMBER_TIMEOUT = 5000;
 
   /** The minimum member-timeout setting of 1000 milliseconds */
-  public static final int MIN_MEMBER_TIMEOUT = 10;
+  int MIN_MEMBER_TIMEOUT = 10;
 
   /**The maximum member-timeout setting of 600000 millieseconds */
-  public static final int MAX_MEMBER_TIMEOUT = 600000;
+  int MAX_MEMBER_TIMEOUT = 600000;
   /**
    * The name of the corresponding property
    */
   @ConfigAttribute(type=Integer.class, min=MIN_MEMBER_TIMEOUT, max=MAX_MEMBER_TIMEOUT)
-  public static final String MEMBER_TIMEOUT_NAME = "member-timeout";
+  String MEMBER_TIMEOUT_NAME = MEMBER_TIMEOUT;
 
   @ConfigAttribute(type=int[].class)
-  public static final String MEMBERSHIP_PORT_RANGE_NAME = "membership-port-range";
-  
-  public static final int[] DEFAULT_MEMBERSHIP_PORT_RANGE = new int[]{1024,65535};
+  String MEMBERSHIP_PORT_RANGE_NAME = MEMBERSHIP_PORT_RANGE;
+
+  int[] DEFAULT_MEMBERSHIP_PORT_RANGE = new int[] { 1024, 65535 };
 
   @ConfigAttributeGetter(name=MEMBERSHIP_PORT_RANGE_NAME)
-  public int[] getMembershipPortRange();
+  int[] getMembershipPortRange();
 
   @ConfigAttributeSetter(name=MEMBERSHIP_PORT_RANGE_NAME)
-  public void setMembershipPortRange(int[] range);
+  void setMembershipPortRange(int[] range);
   
   /**
    * Returns the value of the <a
@@ -1686,21 +1682,21 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=CONSERVE_SOCKETS_NAME)
-  public boolean getConserveSockets();
+  boolean getConserveSockets();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#conserve-sockets">"conserve-sockets"</a>
    * property.
    */
   @ConfigAttributeSetter(name=CONSERVE_SOCKETS_NAME)
-  public void setConserveSockets(boolean newValue);
+  void setConserveSockets(boolean newValue);
 
   /** The name of the "conserveSockets" property */
   @ConfigAttribute(type=Boolean.class)
-  public static final String CONSERVE_SOCKETS_NAME = "conserve-sockets";
+  String CONSERVE_SOCKETS_NAME = CONSERVE_SOCKETS;
 
   /** The default value of the "conserveSockets" property */
-  public static final boolean DEFAULT_CONSERVE_SOCKETS = true;
+  boolean DEFAULT_CONSERVE_SOCKETS = true;
 
   /**
    * Returns the value of the <a
@@ -1708,65 +1704,66 @@ public interface DistributionConfig extends Config, LogConfig {
    * property
    */
   @ConfigAttributeGetter(name=ROLES_NAME)
-  public String getRoles();
+  String getRoles();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#roles">"roles"</a>
    * property.
    */
   @ConfigAttributeSetter(name=ROLES_NAME)
-  public void setRoles(String roles);
+  void setRoles(String roles);
   /** The name of the "roles" property */
   @ConfigAttribute(type=String.class)
-  public static final String ROLES_NAME = "roles";
+  String ROLES_NAME = ROLES;
+
   /** The default value of the "roles" property */
-  public static final String DEFAULT_ROLES = "";
+  String DEFAULT_ROLES = "";
 
 
   /**
    * The name of the "max wait time for reconnect" property */
   @ConfigAttribute(type=Integer.class)
-  public static final String MAX_WAIT_TIME_FOR_RECONNECT_NAME = "max-wait-time-reconnect";
+  String MAX_WAIT_TIME_FOR_RECONNECT_NAME = MAX_WAIT_TIME_RECONNECT;
 
   /**
    * Default value for MAX_WAIT_TIME_FOR_RECONNECT, 60,000 milliseconds.
    */
-  public static final int DEFAULT_MAX_WAIT_TIME_FOR_RECONNECT = 60000;
+  int DEFAULT_MAX_WAIT_TIME_FOR_RECONNECT = 60000;
 
   /**
    * Sets the max wait timeout, in milliseconds, for reconnect.
    * */
   @ConfigAttributeSetter(name=MAX_WAIT_TIME_FOR_RECONNECT_NAME)
-  public void setMaxWaitTimeForReconnect( int timeOut);
+  void setMaxWaitTimeForReconnect(int timeOut);
 
   /**
    * Returns the max wait timeout, in milliseconds, for reconnect.
    * */
   @ConfigAttributeGetter(name=MAX_WAIT_TIME_FOR_RECONNECT_NAME)
-  public int getMaxWaitTimeForReconnect();
+  int getMaxWaitTimeForReconnect();
 
   /**
    * The name of the "max number of tries for reconnect" property.
    * */
   @ConfigAttribute(type=Integer.class)
-  public static final String MAX_NUM_RECONNECT_TRIES = "max-num-reconnect-tries";
+  String MAX_NUM_RECONNECT_TRIES = SystemConfigurationProperties.MAX_NUM_RECONNECT_TRIES;
 
   /**
    * Default value for MAX_NUM_RECONNECT_TRIES.
    */
-  public static final int DEFAULT_MAX_NUM_RECONNECT_TRIES = 3;
+  int DEFAULT_MAX_NUM_RECONNECT_TRIES = 3;
 
   /**
    * Sets the max number of tries for reconnect.
    * */
   @ConfigAttributeSetter(name=MAX_NUM_RECONNECT_TRIES)
-  public void setMaxNumReconnectTries(int tries);
+  void setMaxNumReconnectTries(int tries);
 
   /**
    * Returns the value for max number of tries for reconnect.
    * */
   @ConfigAttributeGetter(name=MAX_NUM_RECONNECT_TRIES)
-  public int getMaxNumReconnectTries();
+  int getMaxNumReconnectTries();
 
   // ------------------- Asynchronous Messaging Properties -------------------
 
@@ -1776,70 +1773,70 @@ public interface DistributionConfig extends Config, LogConfig {
    * "async-distribution-timeout"</a> property.
    */
   @ConfigAttributeGetter(name=ASYNC_DISTRIBUTION_TIMEOUT_NAME)
-  public int getAsyncDistributionTimeout();
+  int getAsyncDistributionTimeout();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#async-distribution-timeout">
    * "async-distribution-timeout"</a> property.
    */
   @ConfigAttributeSetter(name=ASYNC_DISTRIBUTION_TIMEOUT_NAME)
-  public void setAsyncDistributionTimeout(int newValue);
+  void setAsyncDistributionTimeout(int newValue);
 
   /** The default value of "asyncDistributionTimeout" is <code>0</code>. */
-  public static final int DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT = 0;
+  int DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT = 0;
   /** The minimum value of "asyncDistributionTimeout" is <code>0</code>. */
-  public static final int MIN_ASYNC_DISTRIBUTION_TIMEOUT = 0;
+  int MIN_ASYNC_DISTRIBUTION_TIMEOUT = 0;
   /** The maximum value of "asyncDistributionTimeout" is <code>60000</code>. */
-  public static final int MAX_ASYNC_DISTRIBUTION_TIMEOUT = 60000;
+  int MAX_ASYNC_DISTRIBUTION_TIMEOUT = 60000;
 
   /** The name of the "asyncDistributionTimeout" property */
   @ConfigAttribute(type=Integer.class, min=MIN_ASYNC_DISTRIBUTION_TIMEOUT, max=MAX_ASYNC_DISTRIBUTION_TIMEOUT)
-  public static final String ASYNC_DISTRIBUTION_TIMEOUT_NAME = "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.
    */
   @ConfigAttributeGetter(name=ASYNC_QUEUE_TIMEOUT_NAME)
-  public int getAsyncQueueTimeout();
+  int getAsyncQueueTimeout();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#async-queue-timeout">
    * "async-queue-timeout"</a> property.
    */
   @ConfigAttributeSetter(name=ASYNC_QUEUE_TIMEOUT_NAME)
-  public void setAsyncQueueTimeout(int newValue);
+  void setAsyncQueueTimeout(int newValue);
 
   /** The default value of "asyncQueueTimeout" is <code>60000</code>. */
-  public static final int DEFAULT_ASYNC_QUEUE_TIMEOUT = 60000;
+  int DEFAULT_ASYNC_QUEUE_TIMEOUT = 60000;
   /** The minimum value of "asyncQueueTimeout" is <code>0</code>. */
-  public static final int MIN_ASYNC_QUEUE_TIMEOUT = 0;
+  int MIN_ASYNC_QUEUE_TIMEOUT = 0;
   /** The maximum value of "asyncQueueTimeout" is <code>86400000</code>. */
-  public static final int MAX_ASYNC_QUEUE_TIMEOUT = 86400000;
+  int MAX_ASYNC_QUEUE_TIMEOUT = 86400000;
   /** The name of the "asyncQueueTimeout" property */
   @ConfigAttribute(type=Integer.class, min=MIN_ASYNC_QUEUE_TIMEOUT, max=MAX_ASYNC_QUEUE_TIMEOUT)
-  public static final String ASYNC_QUEUE_TIMEOUT_NAME = "async-queue-timeout";
+  String ASYNC_QUEUE_TIMEOUT_NAME = ASYNC_QUEUE_TIMEOUT;
   /**
    * Returns the value of the <a
    * href="../DistributedSystem.html#async-max-queue-size">
    * "async-max-queue-size"</a> property.
    */
   @ConfigAttributeGetter(name=ASYNC_MAX_QUEUE_SIZE_NAME)
-  public int getAsyncMaxQueueSize();
+  int getAsyncMaxQueueSize();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#async-max-queue-size">
    * "async-max-queue-size"</a> property.
    */
   @ConfigAttributeSetter(name=ASYNC_MAX_QUEUE_SIZE_NAME)
-  public void setAsyncMaxQueueSize(int newValue);
+  void setAsyncMaxQueueSize(int newValue);
 
   /** The default value of "asyncMaxQueueSize" is <code>8</code>. */
-  public static final int DEFAULT_ASYNC_MAX_QUEUE_SIZE = 8;
+  int DEFAULT_ASYNC_MAX_QUEUE_SIZE = 8;
   /** The minimum value of "asyncMaxQueueSize" is <code>0</code>. */
-  public static final int MIN_ASYNC_MAX_QUEUE_SIZE = 0;
+  int MIN_ASYNC_MAX_QUEUE_SIZE = 0;
   /** The maximum value of "asyncMaxQueueSize" is <code>1024</code>. */
-  public static final int MAX_ASYNC_MAX_QUEUE_SIZE = 1024;
+  int MAX_ASYNC_MAX_QUEUE_SIZE = 1024;
 
   /** The name of the "asyncMaxQueueSize" property */
   @ConfigAttribute(type=Integer.class, min=MIN_ASYNC_MAX_QUEUE_SIZE, max=MAX_ASYNC_MAX_QUEUE_SIZE)
@@ -1857,14 +1854,14 @@ public interface DistributionConfig extends Config, LogConfig {
      
   /** @since Geode 1.0 */
   @ConfigAttribute(type=Boolean.class)
-  public static final String DISTRIBUTED_TRANSACTIONS_NAME = "distributed-transactions";
-  public static final boolean DEFAULT_DISTRIBUTED_TRANSACTIONS = false;
+  String DISTRIBUTED_TRANSACTIONS_NAME = DISTRIBUTED_TRANSACTIONS;
+  boolean DEFAULT_DISTRIBUTED_TRANSACTIONS = false;
 
   @ConfigAttributeGetter(name=DISTRIBUTED_TRANSACTIONS_NAME)
-  public boolean getDistributedTransactions();
+  boolean getDistributedTransactions();
 
   @ConfigAttributeSetter(name=DISTRIBUTED_TRANSACTIONS_NAME)
-  public void setDistributedTransactions(boolean value);
+  void setDistributedTransactions(boolean value);
   
   /**
    * Returns the value of the <a
@@ -1873,7 +1870,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @since GemFire 5.7
    */
   @ConfigAttributeGetter(name=CLIENT_CONFLATION_PROP_NAME)
-  public String getClientConflation();
+  String getClientConflation();
   /**
    * Sets the value of the <a
    * href="../DistributedSystem.html#conflate-events">"conflate-events"</a>
@@ -1881,7 +1878,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @since GemFire 5.7
    */
   @ConfigAttributeSetter(name=CLIENT_CONFLATION_PROP_NAME)
-  public void setClientConflation(String clientConflation);
+  void setClientConflation(String clientConflation);
   // -------------------------------------------------------------------------
   /**
    * Returns the value of the <a
@@ -1889,7 +1886,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=DURABLE_CLIENT_ID_NAME)
-  public String getDurableClientId();
+  String getDurableClientId();
 
   /**
    * Sets the value of the <a
@@ -1897,17 +1894,17 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=DURABLE_CLIENT_ID_NAME)
-  public void setDurableClientId(String durableClientId);
+  void setDurableClientId(String durableClientId);
 
   /** The name of the "durableClientId" property */
   @ConfigAttribute(type=String.class)
-  public static final String DURABLE_CLIENT_ID_NAME = "durable-client-id";
+  String DURABLE_CLIENT_ID_NAME = DURABLE_CLIENT_ID;
 
   /**
    * The default durable client id.
    * <p> Actual value of this constant is <code>""</code>.
    */
-  public static final String DEFAULT_DURABLE_CLIENT_ID = "";
+  String DEFAULT_DURABLE_CLIENT_ID = "";
 
   /**
    * Returns the value of the <a
@@ -1915,7 +1912,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeGetter(name=DURABLE_CLIENT_TIMEOUT_NAME)
-  public int getDurableClientTimeout();
+  int getDurableClientTimeout();
 
   /**
    * Sets the value of the <a
@@ -1923,24 +1920,24 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=DURABLE_CLIENT_TIMEOUT_NAME)
-  public void setDurableClientTimeout(int durableClientTimeout);
+  void setDurableClientTimeout(int durableClientTimeout);
 
   /** The name of the "durableClientTimeout" property */
   @ConfigAttribute(type=Integer.class)
-  public static final String DURABLE_CLIENT_TIMEOUT_NAME = "durable-client-timeout";
+  String DURABLE_CLIENT_TIMEOUT_NAME = DURABLE_CLIENT_TIMEOUT;
 
   /**
    * The default durable client timeout in seconds.
    * <p> Actual value of this constant is <code>"300"</code>.
    */
-  public static final int DEFAULT_DURABLE_CLIENT_TIMEOUT = 300;
+  int DEFAULT_DURABLE_CLIENT_TIMEOUT = 300;
 
   /**
    * Returns user module name for client authentication initializer in <a
    * href="../DistributedSystem.html#security-client-auth-init">"security-client-auth-init"</a>
    */
   @ConfigAttributeGetter(name=SECURITY_CLIENT_AUTH_INIT_NAME)
-  public String getSecurityClientAuthInit();
+  String getSecurityClientAuthInit();
 
   /**
    * Sets the user module name in <a
@@ -1948,24 +1945,24 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=SECURITY_CLIENT_AUTH_INIT_NAME)
-  public void setSecurityClientAuthInit(String attValue);
+  void setSecurityClientAuthInit(String attValue);
 
   /** The name of user defined method name for "security-client-auth-init" property*/
   @ConfigAttribute(type=String.class)
-  public static final String SECURITY_CLIENT_AUTH_INIT_NAME = "security-client-auth-init";
+  String SECURITY_CLIENT_AUTH_INIT_NAME = SECURITY_CLIENT_AUTH_INIT;
 
   /**
    * The default client authentication initializer method name.
    * <p> Actual value of this is in format <code>"jar file:module name"</code>.
    */
-  public static final String DEFAULT_SECURITY_CLIENT_AUTH_INIT = "";
+  String DEFAULT_SECURITY_CLIENT_AUTH_INIT = "";
 
   /**
    * Returns user module name authenticating client credentials in <a
    * href="../DistributedSystem.html#security-client-authenticator">"security-client-authenticator"</a>
    */
   @ConfigAttributeGetter(name=SECURITY_CLIENT_AUTHENTICATOR_NAME)
-  public String getSecurityClientAuthenticator();
+  String getSecurityClientAuthenticator();
 
   /**
    * Sets the user defined method name in <a
@@ -1973,24 +1970,24 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=SECURITY_CLIENT_AUTHENTICATOR_NAME)
-  public void setSecurityClientAuthenticator(String attValue);
+  void setSecurityClientAuthenticator(String attValue);
 
   /** The name of factory method for "security-client-authenticator" property */
   @ConfigAttribute(type=String.class)
-  public static final String SECURITY_CLIENT_AUTHENTICATOR_NAME = "security-client-authenticator";
+  String SECURITY_CLIENT_AUTHENTICATOR_NAME = SECURITY_CLIENT_AUTHENTICATOR;
 
   /**
    * The default client authentication method name.
    * <p> Actual value of this is fully qualified <code>"method name"</code>.
    */
-  public static final String DEFAULT_SECURITY_CLIENT_AUTHENTICATOR = "";
+  String DEFAULT_SECURITY_CLIENT_AUTHENTICATOR = "";
 
   /**
    * Returns name of algorithm to use for Diffie-Hellman key exchange <a
    * href="../DistributedSystem.html#security-client-dhalgo">"security-client-dhalgo"</a>
    */
   @ConfigAttributeGetter(name=SECURITY_CLIENT_DHALGO_NAME)
-  public String getSecurityClientDHAlgo();
+  String getSecurityClientDHAlgo();
 
   /**
    * Set the name of algorithm to use for Diffie-Hellman key exchange <a
@@ -1998,14 +1995,14 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=SECURITY_CLIENT_DHALGO_NAME)
-  public void setSecurityClientDHAlgo(String attValue);
+  void setSecurityClientDHAlgo(String attValue);
 
   /**
    * The name of the Diffie-Hellman symmetric algorithm "security-client-dhalgo"
    * property.
    */
   @ConfigAttribute(type=String.class)
-  public static final String SECURITY_CLIENT_DHALGO_NAME = "security-client-dhalgo";
+  String SECURITY_CLIENT_DHALGO_NAME = SECURITY_CLIENT_DHALGO;
 
   /**
    * The default Diffie-Hellman symmetric algorithm name.
@@ -2013,14 +2010,14 @@ public interface DistributionConfig extends Config, LogConfig {
    * Actual value of this is one of the available symmetric algorithm names in
    * JDK like "DES", "DESede", "AES", "Blowfish".
    */
-  public static final String DEFAULT_SECURITY_CLIENT_DHALGO = "";
+  String DEFAULT_SECURITY_CLIENT_DHALGO = "";
 
   /**
    * Returns user defined method name for peer authentication initializer in <a
    * href="../DistributedSystem.html#security-peer-auth-init">"security-peer-auth-init"</a>
    */
   @ConfigAttributeGetter(name=SECURITY_PEER_AUTH_INIT_NAME)
-  public String getSecurityPeerAuthInit();
+  String getSecurityPeerAuthInit();
 
   /**
    * Sets the user module name in <a
@@ -2028,24 +2025,24 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=SECURITY_PEER_AUTH_INIT_NAME)
-  public void setSecurityPeerAuthInit(String attValue);
+  void setSecurityPeerAuthInit(String attValue);
 
   /** The name of user module for "security-peer-auth-init" property*/
   @ConfigAttribute(type=String.class)
-  public static final String SECURITY_PEER_AUTH_INIT_NAME = "security-peer-auth-init";
+  String SECURITY_PEER_AUTH_INIT_NAME = SECURITY_PEER_AUTH_INIT;
 
   /**
    * The default client authenticaiton method name.
    * <p> Actual value of this is fully qualified <code>"method name"</code>.
    */
-  public static final String DEFAULT_SECURITY_PEER_AUTH_INIT = "";
+  String DEFAULT_SECURITY_PEER_AUTH_INIT = "";
 
   /**
    * Returns user defined method name authenticating peer's credentials in <a
    * href="../DistributedSystem.html#security-peer-authenticator">"security-peer-authenticator"</a>
    */
   @ConfigAttributeGetter(name=SECURITY_PEER_AUTHENTICATOR_NAME)
-  public String getSecurityPeerAuthenticator();
+  String getSecurityPeerAuthenticator();
 
   /**
    * Sets the user module name in <a
@@ -2053,24 +2050,24 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=SECURITY_PEER_AUTHENTICATOR_NAME)
-  public void setSecurityPeerAuthenticator(String attValue);
+  void setSecurityPeerAuthenticator(String attValue);
 
   /** The name of user defined method for "security-peer-authenticator" property*/
   @ConfigAttribute(type=String.class)
-  public static final String SECURITY_PEER_AUTHENTICATOR_NAME = "security-peer-authenticator";
+  String SECURITY_PEER_AUTHENTICATOR_NAME = SECURITY_PEER_AUTHENTICATOR;
 
   /**
    * The default client authenticaiton method.
    * <p> Actual value of this is fully qualified <code>"method name"</code>.
    */
-  public static final String DEFAULT_SECURITY_PEER_AUTHENTICATOR = "";
+  String DEFAULT_SECURITY_PEER_AUTHENTICATOR = "";
 
   /**
    * Returns user module name authorizing client credentials in <a
    * href="../DistributedSystem.html#security-client-accessor">"security-client-accessor"</a>
    */
   @ConfigAttributeGetter(name=SECURITY_CLIENT_ACCESSOR_NAME)
-  public String getSecurityClientAccessor();
+  String getSecurityClientAccessor();
 
   /**
    * Sets the user defined method name in <a
@@ -2078,24 +2075,24 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    */
   @ConfigAttributeSetter(name=SECURITY_CLIENT_ACCESSOR_NAME)
-  public void setSecurityClientAccessor(String attValue);
+  void setSecurityCli

<TRUNCATED>


Mime
View raw message