geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [31/33] incubator-geode git commit: GEODE-420: Initial Alias defintion and removal of deprecated SSL-ENABLED properties
Date Wed, 15 Jun 2016 16:18:04 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/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 a26de3f..2c74d42 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
@@ -58,7 +58,6 @@ public interface DistributionConfig extends Config, LogConfig {
    * 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 #DEFAULT_NAME}.
-   *
    * @return the system's name.
    */
   @ConfigAttributeGetter(name = NAME)
@@ -67,11 +66,10 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the member's name.
    * <p> The name can not be changed while the system is running.
-   *
-   * @throws IllegalArgumentException                   if the specified value is not acceptable.
+   * @throws IllegalArgumentException if the specified value is not acceptable.
    * @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
-   * @throws com.gemstone.gemfire.GemFireIOException    if the set failure is caused by an error
-   *                                                    when writing to the system's configuration file.
+   * @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)
   void setName(String value);
@@ -288,13 +286,12 @@ public interface DistributionConfig extends Config, LogConfig {
    * A locator list is optional and by default empty.
    * Its used to by the system to locator other system nodes
    * and to publish itself so it can be located by others.
-   *
    * @param value must be of the form <code>hostName[portNum]</code>.
-   *              Multiple elements are allowed and must be seperated by a comma.
-   * @throws IllegalArgumentException                   if the specified value is not acceptable.
+   * Multiple elements are allowed and must be seperated by a comma.
+   * @throws IllegalArgumentException if the specified value is not acceptable.
    * @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
-   * @throws com.gemstone.gemfire.GemFireIOException    if the set failure is caused by an error
-   *                                                    when writing to the system's configuration file.
+   * @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)
   void setLocators(String value);
@@ -336,7 +333,6 @@ public interface DistributionConfig extends Config, LogConfig {
    * 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)
@@ -360,11 +356,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Sets the system's deploy working directory.
-   *
-   * @throws IllegalArgumentException                   if the specified value is not acceptable.
+   * @throws IllegalArgumentException if the specified value is not acceptable.
    * @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
-   * @throws com.gemstone.gemfire.GemFireIOException    if the set failure is caused by an error
-   *                                                    when writing to the system's configuration file.
+   * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+   * when writing to the system's configuration file.
    */
   @ConfigAttributeSetter(name = DEPLOY_WORKING_DIR)
   void setDeployWorkingDir(File value);
@@ -389,11 +384,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Sets the system's user command path.
-   *
-   * @throws IllegalArgumentException                   if the specified value is not acceptable.
+   * @throws IllegalArgumentException if the specified value is not acceptable.
    * @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
-   * @throws com.gemstone.gemfire.GemFireIOException    if the set failure is caused by an error
-   *                                                    when writing to the system's configuration file.
+   * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+   * when writing to the system's configuration file.
    */
   @ConfigAttributeSetter(name = USER_COMMAND_PACKAGES)
   void setUserCommandPackages(String value);
@@ -422,11 +416,10 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the system's log file.
    * <p> Non-absolute log files are relative to the system directory.
    * <p> The system log file can not be changed while the system is running.
-   *
-   * @throws IllegalArgumentException                   if the specified value is not acceptable.
+   * @throws IllegalArgumentException if the specified value is not acceptable.
    * @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
-   * @throws com.gemstone.gemfire.GemFireIOException    if the set failure is caused by an error
-   *                                                    when writing to the system's configuration file.
+   * @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)
@@ -815,139 +808,6 @@ public interface DistributionConfig extends Config, LogConfig {
   String LOG_DISK_SPACE_LIMIT_NAME = LOG_DISK_SPACE_LIMIT;
 
   /**
-   * Returns the value of the {@link ConfigurationProperties#SSL_ENABLED}
-   * property.
-   *
-   * @deprecated as of 8.0 use {@link #getClusterSSLEnabled} instead.
-   */
-  @ConfigAttributeGetter(name = SSL_ENABLED)
-  boolean getSSLEnabled();
-
-  /**
-   * 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.
-   */
-  boolean DEFAULT_SSL_ENABLED = false;
-
-  /**
-   * The name of the {@link ConfigurationProperties#SSL_ENABLED} property
-   *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED_NAME} instead.
-   */
-  @ConfigAttribute(type = Boolean.class)
-  String SSL_ENABLED_NAME = SSL_ENABLED;
-
-  /**
-   * Sets the value of the {@link ConfigurationProperties#SSL_ENABLED}
-   * property.
-   *
-   * @deprecated as of 8.0 use {@link #setClusterSSLEnabled} instead.
-   */
-  @ConfigAttributeSetter(name = SSL_ENABLED)
-  void setSSLEnabled(boolean enabled);
-
-  /**
-   * Returns the value of the {@link ConfigurationProperties#SSL_PROTOCOLS}
-   * property.
-   *
-   * @deprecated as of 8.0 use {@link #getClusterSSLProtocols} instead.
-   */
-  @ConfigAttributeGetter(name = SSL_PROTOCOLS)
-  String getSSLProtocols();
-
-  /**
-   * Sets the value of the {@link ConfigurationProperties#SSL_PROTOCOLS}
-   * property.
-   *
-   * @deprecated as of 8.0 use {@link #setClusterSSLProtocols} instead.
-   */
-  @ConfigAttributeSetter(name = SSL_PROTOCOLS)
-  void setSSLProtocols(String protocols);
-
-  /**
-   * 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 ConfigurationProperties#SSL_PROTOCOLS} property
-   *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS_NAME} instead.
-   */
-  @ConfigAttribute(type = String.class)
-  String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
-
-  /**
-   * Returns the value of the {@link ConfigurationProperties#SSL_CIPHERS}
-   * property.
-   *
-   * @deprecated as of 8.0 use {@link #getClusterSSLCiphers} instead.
-   */
-  @ConfigAttributeGetter(name = SSL_CIPHERS)
-  String getSSLCiphers();
-
-  /**
-   * Sets the value of the {@link ConfigurationProperties#SSL_CIPHERS}
-   * property.
-   *
-   * @deprecated as of 8.0 use {@link #setClusterSSLCiphers} instead.
-   */
-  @ConfigAttributeSetter(name = SSL_CIPHERS)
-  void setSSLCiphers(String ciphers);
-
-  /**
-   * 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 ConfigurationProperties#SSL_CIPHERS} property
-   *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS_NAME} instead.
-   */
-  @ConfigAttribute(type = String.class)
-  String SSL_CIPHERS_NAME = SSL_CIPHERS;
-
-  /**
-   * Returns the value of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION}
-   * property.
-   *
-   * @deprecated as of 8.0 use {@link #getClusterSSLRequireAuthentication} instead.
-   */
-  @ConfigAttributeGetter(name = SSL_REQUIRE_AUTHENTICATION)
-  boolean getSSLRequireAuthentication();
-
-  /**
-   * Sets the value of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION}
-   * property.
-   *
-   * @deprecated as of 8.0 use {@link #setClusterSSLRequireAuthentication} instead.
-   */
-  @ConfigAttributeSetter(name = SSL_REQUIRE_AUTHENTICATION)
-  void setSSLRequireAuthentication(boolean enabled);
-
-  /**
-   * 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 ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION} property
-   *
-   * @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;
-
-  /**
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ENABLED}
    * property.
    */
@@ -1181,7 +1041,6 @@ public interface DistributionConfig extends Config, LogConfig {
    * The name of an internal property that specifies a {@link
    * com.gemstone.gemfire.i18n.LogWriterI18n} instance to log to.
    * Set this property with put(), not with setProperty()
-   *
    * @since GemFire 4.0
    */
   String LOG_WRITER_NAME = "log-writer";
@@ -1191,7 +1050,6 @@ public interface DistributionConfig extends Config, LogConfig {
    * a DistributionConfigImpl that the locator is passing
    * in to a ds connect.
    * Set this property with put(), not with setProperty()
-   *
    * @since GemFire 7.0
    */
   String DS_CONFIG_NAME = "ds-config";
@@ -1200,7 +1058,6 @@ public interface DistributionConfig extends Config, LogConfig {
    * 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";
@@ -1217,7 +1074,6 @@ public interface DistributionConfig extends Config, LogConfig {
    * The name of an internal property that specifies a {@link
    * com.gemstone.gemfire.LogWriter} instance to log security messages to. Set
    * this property with put(), not with setProperty()
-   *
    * @since GemFire 5.5
    */
   String SECURITY_LOG_WRITER_NAME = "security-log-writer";
@@ -1229,7 +1085,6 @@ 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";
@@ -1239,7 +1094,6 @@ public interface DistributionConfig extends Config, LogConfig {
    * associated with the internal property SECURITY_LOG_WRITER_NAME. If this
    * property is set, the FileOutputStream will be closed when the distributed
    * system disconnects. Set this property with put(), not with setProperty()
-   *
    * @since GemFire 5.5
    */
   String SECURITY_LOG_OUTPUTSTREAM_NAME = "security-log-output-stream";
@@ -1409,7 +1263,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default value of the {@link ConfigurationProperties#MCAST_FLOW_CONTROL} property
    */
   FlowControlParams DEFAULT_MCAST_FLOW_CONTROL
-      = new FlowControlParams(1048576, (float) 0.25, 5000);
+    = new FlowControlParams(1048576, (float) 0.25, 5000);
 
   /**
    * The minimum byteAllowance for the{@link ConfigurationProperties#MCAST_FLOW_CONTROL} setting of
@@ -1970,7 +1824,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#CONFLATE_EVENTS}
    * property.
-   *
    * @since GemFire 5.7
    */
   @ConfigAttributeGetter(name = CONFLATE_EVENTS)
@@ -1979,7 +1832,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#CONFLATE_EVENTS}
    * property.
-   *
    * @since GemFire 5.7
    */
   @ConfigAttributeSetter(name = CONFLATE_EVENTS)
@@ -2256,11 +2108,10 @@ public interface DistributionConfig extends Config, LogConfig {
    * Non-absolute log files are relative to the system directory.
    * <p>
    * The security log file can not be changed while the system is running.
-   *
-   * @throws IllegalArgumentException                   if the specified value is not acceptable.
+   * @throws IllegalArgumentException if the specified value is not acceptable.
    * @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
-   * @throws com.gemstone.gemfire.GemFireIOException    if the set failure is caused by an error when writing to
-   *                                                    the system's configuration file.
+   * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error when writing to
+   * the system's configuration file.
    */
   @ConfigAttributeSetter(name = SECURITY_LOG_FILE)
   void setSecurityLogFile(File value);
@@ -2283,7 +2134,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Get timeout for peer membership check when security is enabled.
-   *
    * @return Timeout in milliseconds.
    */
   @ConfigAttributeGetter(name = SECURITY_PEER_VERIFY_MEMBER_TIMEOUT)
@@ -2292,7 +2142,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Set timeout for peer membership check when security is enabled. The timeout must be less
    * than peer handshake timeout.
-   *
    * @param attValue
    */
   @ConfigAttributeSetter(name = SECURITY_PEER_VERIFY_MEMBER_TIMEOUT)
@@ -2340,6 +2189,13 @@ public interface DistributionConfig extends Config, LogConfig {
   String GEMFIRE_PREFIX = "gemfire.";
 
   /**
+   * The static String definition of the cluster ssl prefix <i>"cluster-ssl"</i> used in conjunction with other <i>cluster-ssl-*</i> properties property
+   * <a name="cluster-ssl"/a></p>
+   * <U>Description</U>: The cluster-ssl property prefix
+   */
+  String CLUSTER_SSL_PREFIX = "cluster-ssl";
+
+  /**
    * For the "custom-" prefixed properties
    */
   String USERDEFINED_PREFIX_NAME = "custom-";
@@ -2378,7 +2234,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#REMOVE_UNRESPONSIVE_CLIENT}
    * property.
-   *
    * @since GemFire 6.0
    */
   @ConfigAttributeGetter(name = REMOVE_UNRESPONSIVE_CLIENT)
@@ -2387,7 +2242,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#REMOVE_UNRESPONSIVE_CLIENT}
    * property.
-   *
    * @since GemFire 6.0
    */
   @ConfigAttributeSetter(name = REMOVE_UNRESPONSIVE_CLIENT)
@@ -2404,7 +2258,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#DELTA_PROPAGATION}
    * property.
-   *
    * @since GemFire 6.3
    */
   @ConfigAttributeGetter(name = DELTA_PROPAGATION)
@@ -2413,7 +2266,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#DELTA_PROPAGATION}
    * property.
-   *
    * @since GemFire 6.3
    */
   @ConfigAttributeSetter(name = DELTA_PROPAGATION)
@@ -2473,6 +2325,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * @since GemFire 8.0
+   * @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
    */
   Properties getJmxSSLProperties();
 
@@ -2498,7 +2351,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#GROUPS} property
    * <p> The default value is: {@link #DEFAULT_GROUPS}.
-   *
    * @return the value of the property
    * @since GemFire 7.0
    */
@@ -2508,11 +2360,10 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the {@link ConfigurationProperties#GROUPS} property.
    * <p> The groups can not be changed while the system is running.
-   *
-   * @throws IllegalArgumentException                   if the specified value is not acceptable.
+   * @throws IllegalArgumentException if the specified value is not acceptable.
    * @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
-   * @throws com.gemstone.gemfire.GemFireIOException    if the set failure is caused by an error
-   *                                                    when writing to the system's configuration file.
+   * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
+   * when writing to the system's configuration file.
    * @since GemFire 7.0
    */
   @ConfigAttributeSetter(name = GROUPS)
@@ -2528,7 +2379,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GROUPS}.
    * <p> Actual value of this constant is <code>""</code>.
-   *
    * @since GemFire 7.0
    */
   String DEFAULT_GROUPS = "";
@@ -2586,31 +2436,9 @@ public interface DistributionConfig extends Config, LogConfig {
   int DEFAULT_JMX_MANAGER_PORT = 1099;
 
   /**
-   * @deprecated as of 8.0 use {@link #getJmxManagerSSLEnabled} instead.
-   */
-  @ConfigAttributeGetter(name = JMX_MANAGER_SSL)
-  boolean getJmxManagerSSL();
-
-  /**
-   * @deprecated as of 8.0 use {@link #setJmxManagerSSLEnabled} instead.
-   */
-  @ConfigAttributeSetter(name = JMX_MANAGER_SSL)
-  void setJmxManagerSSL(boolean value);
-
-  /**
-   * @deprecated as of 8.0 use {@link #JMX_MANAGER_SSL_ENABLED_NAME} instead.
-   */
-  @ConfigAttribute(type = Boolean.class)
-  String JMX_MANAGER_SSL_NAME = JMX_MANAGER_SSL;
-
-  /**
-   * @deprecated as of 8.0 use {@link #DEFAULT_JMX_MANAGER_SSL_ENABLED} instead.
-   */
-  boolean DEFAULT_JMX_MANAGER_SSL = false;
-
-  /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_ENABLED)
   boolean getJmxManagerSSLEnabled();
@@ -2618,11 +2446,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED} state.
    * <p> Actual value of this constant is <code>false</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
    */
   boolean DEFAULT_JMX_MANAGER_SSL_ENABLED = false;
 
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
    */
   @ConfigAttribute(type = Boolean.class)
   String JMX_MANAGER_SSL_ENABLED_NAME = JMX_MANAGER_SSL_ENABLED;
@@ -2630,6 +2460,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_ENABLED)
   void setJmxManagerSSLEnabled(boolean enabled);
@@ -2637,7 +2468,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE}
    * property.
-   *
    * @since Geode 1.0
    */
   @ConfigAttributeGetter(name = OFF_HEAP_MEMORY_SIZE)
@@ -2646,7 +2476,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE}
    * property.
-   *
    * @since Geode 1.0
    */
   @ConfigAttributeSetter(name = OFF_HEAP_MEMORY_SIZE)
@@ -2662,7 +2491,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE}
    * value of <code>""</code>.
-   *
    * @since Geode 1.0
    */
   String DEFAULT_OFF_HEAP_MEMORY_SIZE = "";
@@ -2670,6 +2498,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_PROTOCOLS)
   String getJmxManagerSSLProtocols();
@@ -2677,6 +2506,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLProtocols(String)}
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_PROTOCOLS)
   void setJmxManagerSSLProtocols(String protocols);
@@ -2684,10 +2514,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} value.
    * <p> Actual value of this constant is <code>any</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
    */
   String DEFAULT_JMX_MANAGER_SSL_PROTOCOLS = "any";
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
    */
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_PROTOCOLS_NAME = JMX_MANAGER_SSL_PROTOCOLS;
@@ -2695,6 +2528,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_CIPHERS)
   String getJmxManagerSSLCiphers();
@@ -2702,6 +2536,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_CIPHERS)
   void setJmxManagerSSLCiphers(String ciphers);
@@ -2709,10 +2544,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} value.
    * <p> Actual value of this constant is <code>any</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS}
    */
   String DEFAULT_JMX_MANAGER_SSL_CIPHERS = "any";
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}
    */
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_CIPHERS_NAME = JMX_MANAGER_SSL_CIPHERS;
@@ -2720,6 +2558,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION)
   boolean getJmxManagerSSLRequireAuthentication();
@@ -2727,6 +2566,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION)
   void setJmxManagerSSLRequireAuthentication(boolean enabled);
@@ -2734,10 +2574,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION} value.
    * <p> Actual value of this constant is <code>true</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
   boolean DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = true;
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
   @ConfigAttribute(type = Boolean.class)
   String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME = JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION;
@@ -2745,6 +2588,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_KEYSTORE)
   String getJmxManagerSSLKeyStore();
@@ -2752,6 +2596,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_KEYSTORE)
   void setJmxManagerSSLKeyStore(String keyStore);
@@ -2759,11 +2604,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
    */
   String DEFAULT_JMX_MANAGER_SSL_KEYSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
    */
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_KEYSTORE_NAME = JMX_MANAGER_SSL_KEYSTORE;
@@ -2771,6 +2619,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_KEYSTORE_TYPE)
   String getJmxManagerSSLKeyStoreType();
@@ -2778,6 +2627,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_KEYSTORE_TYPE)
   void setJmxManagerSSLKeyStoreType(String keyStoreType);
@@ -2785,11 +2635,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
    */
   String DEFAULT_JMX_MANAGER_SSL_KEYSTORE_TYPE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_TYPE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    */
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME = JMX_MANAGER_SSL_KEYSTORE_TYPE;
@@ -2797,6 +2650,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_KEYSTORE_PASSWORD)
   String getJmxManagerSSLKeyStorePassword();
@@ -2804,6 +2658,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_KEYSTORE_PASSWORD)
   void setJmxManagerSSLKeyStorePassword(String keyStorePassword);
@@ -2811,11 +2666,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
   String DEFAULT_JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD} propery
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME = JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
@@ -2823,6 +2681,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_TRUSTSTORE)
   String getJmxManagerSSLTrustStore();
@@ -2830,6 +2689,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_TRUSTSTORE)
   void setJmxManagerSSLTrustStore(String trustStore);
@@ -2837,11 +2697,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
    */
   String DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
    */
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_TRUSTSTORE_NAME = JMX_MANAGER_SSL_TRUSTSTORE;
@@ -2849,6 +2712,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD)
   String getJmxManagerSSLTrustStorePassword();
@@ -2856,6 +2720,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD)
   void setJmxManagerSSLTrustStorePassword(String trusStorePassword);
@@ -2863,11 +2728,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
   String DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME = JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
@@ -2915,6 +2783,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property
    *
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property
    * @deprecated as of 8.0 use {@link #getHttpServicePort()} instead.
    */
   @ConfigAttributeGetter(name = JMX_MANAGER_HTTP_PORT)
@@ -2923,6 +2792,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Set the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} for jmx-manager.
    *
+   * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} for jmx-manager.
    * @param value the port number for jmx-manager HTTP service
    * @deprecated as of 8.0 use {@link #setHttpServicePort(int)} instead.
    */
@@ -2932,6 +2802,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
    *
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
    * @deprecated as of 8.0 use {{@link #HTTP_SERVICE_PORT_NAME} instead.
    */
   @ConfigAttribute(type = Integer.class, min = 0, max = 65535)
@@ -2940,7 +2811,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default value of the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
    * Current value is a <code>7070</code>
-   *
    * @deprecated as of 8.0 use {@link #DEFAULT_HTTP_SERVICE_PORT} instead.
    */
   int DEFAULT_JMX_MANAGER_HTTP_PORT = 7070;
@@ -2960,6 +2830,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#MEMCACHED_PORT} property
    *
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#MEMCACHED_PORT} property
    * @return the port on which GemFireMemcachedServer should be started
    * @since GemFire 7.0
    */
@@ -2976,6 +2847,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#MEMCACHED_PROTOCOL} property
    *
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#MEMCACHED_PROTOCOL} property
    * @return the protocol for GemFireMemcachedServer
    * @since GemFire 7.0
    */
@@ -2992,6 +2864,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#MEMCACHED_BIND_ADDRESS} property
    *
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#MEMCACHED_BIND_ADDRESS} property
    * @return the bind address for GemFireMemcachedServer
    * @since GemFire 7.0
    */
@@ -3024,6 +2897,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#REDIS_BIND_ADDRESS} property
    *
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#REDIS_BIND_ADDRESS} property
    * @return the bind address for GemFireRedisServer
    * @since GemFire 8.0
    */
@@ -3040,6 +2914,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#REDIS_PASSWORD} property
    *
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#REDIS_PASSWORD} property
    * @return the authentication password for GemFireRedisServer
    * @since GemFire 8.0
    */
@@ -3058,6 +2933,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_PORT} property
    *
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} property
    * @return the HTTP service port
    * @since GemFire 8.0
    */
@@ -3067,6 +2943,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Set the {@link ConfigurationProperties#HTTP_SERVICE_PORT} for HTTP service.
    *
+   * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} for HTTP service.
    * @param value the port number for HTTP service
    * @since GemFire 8.0
    */
@@ -3076,6 +2953,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_PORT} property
    *
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} property
    * @since GemFire 8.0
    */
   @ConfigAttribute(type = Integer.class, min = 0, max = 65535)
@@ -3084,7 +2962,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default value of the {@link ConfigurationProperties#HTTP_SERVICE_PORT} property.
    * Current value is a <code>7070</code>
-   *
    * @since GemFire 8.0
    */
   int DEFAULT_HTTP_SERVICE_PORT = 7070;
@@ -3092,6 +2969,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property
    *
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property
    * @return the bind-address for HTTP service
    * @since GemFire 8.0
    */
@@ -3101,6 +2979,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Set the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} for HTTP service.
    *
+   * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} for HTTP service.
    * @param value the bind-address for HTTP service
    * @since GemFire 8.0
    */
@@ -3118,7 +2997,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default value of the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property.
    * Current value is an empty string <code>""</code>
-   *
    * @since GemFire 8.0
    */
   String DEFAULT_HTTP_SERVICE_BIND_ADDRESS = "";
@@ -3128,6 +3006,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_ENABLED)
   boolean getHttpServiceSSLEnabled();
@@ -3135,6 +3014,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_ENABLED)
   void setHttpServiceSSLEnabled(boolean httpServiceSSLEnabled);
@@ -3142,11 +3022,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} state.
    * <p> Actual value of this constant is <code>false</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
    */
   boolean DEFAULT_HTTP_SERVICE_SSL_ENABLED = false;
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_ENABLED} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
    */
   @ConfigAttribute(type = Boolean.class)
   String HTTP_SERVICE_SSL_ENABLED_NAME = HTTP_SERVICE_SSL_ENABLED;
@@ -3154,6 +3037,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION)
   boolean getHttpServiceSSLRequireAuthentication();
@@ -3161,6 +3045,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION)
   void setHttpServiceSSLRequireAuthentication(boolean httpServiceSSLRequireAuthentication);
@@ -3168,11 +3053,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION} value.
    * <p> Actual value of this constant is <code>true</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
   boolean DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = false;
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
   @ConfigAttribute(type = Boolean.class)
   String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME = HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION;
@@ -3180,6 +3068,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_PROTOCOLS)
   String getHttpServiceSSLProtocols();
@@ -3187,6 +3076,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLProtocols(String)}
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_PROTOCOLS)
   void setHttpServiceSSLProtocols(String protocols);
@@ -3194,11 +3084,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} value.
    * <p> Actual value of this constant is <code>any</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
    */
   String DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS = "any";
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_PROTOCOLS} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
    */
   @ConfigAttribute(type = String.class)
   String HTTP_SERVICE_SSL_PROTOCOLS_NAME = HTTP_SERVICE_SSL_PROTOCOLS;
@@ -3206,6 +3099,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_CIPHERS)
   String getHttpServiceSSLCiphers();
@@ -3213,6 +3107,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_CIPHERS)
   void setHttpServiceSSLCiphers(String ciphers);
@@ -3220,11 +3115,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} value.
    * <p> Actual value of this constant is <code>any</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS}
    */
   String DEFAULT_HTTP_SERVICE_SSL_CIPHERS = "any";
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_CIPHERS} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}
    */
   @ConfigAttribute(type = String.class)
   String HTTP_SERVICE_SSL_CIPHERS_NAME = HTTP_SERVICE_SSL_CIPHERS;
@@ -3232,6 +3130,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_KEYSTORE)
   String getHttpServiceSSLKeyStore();
@@ -3239,6 +3138,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_KEYSTORE)
   void setHttpServiceSSLKeyStore(String keyStore);
@@ -3246,11 +3146,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE
    */
   String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
    */
   @ConfigAttribute(type = String.class)
   String HTTP_SERVICE_SSL_KEYSTORE_NAME = HTTP_SERVICE_SSL_KEYSTORE;
@@ -3258,6 +3161,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_KEYSTORE_PASSWORD)
   String getHttpServiceSSLKeyStorePassword();
@@ -3265,6 +3169,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_KEYSTORE_PASSWORD)
   void setHttpServiceSSLKeyStorePassword(String keyStorePassword);
@@ -3272,11 +3177,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
   String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_PASSWORD} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
   @ConfigAttribute(type = String.class)
   String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME = HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
@@ -3284,6 +3192,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_KEYSTORE_TYPE)
   String getHttpServiceSSLKeyStoreType();
@@ -3291,6 +3200,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_KEYSTORE_TYPE)
   void setHttpServiceSSLKeyStoreType(String keyStoreType);
@@ -3298,11 +3208,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
    */
   String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_TYPE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    */
   @ConfigAttribute(type = String.class)
   String HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME = HTTP_SERVICE_SSL_KEYSTORE_TYPE;
@@ -3310,6 +3223,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_TRUSTSTORE)
   String getHttpServiceSSLTrustStore();
@@ -3317,6 +3231,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_TRUSTSTORE)
   void setHttpServiceSSLTrustStore(String trustStore);
@@ -3324,11 +3239,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
    */
   String DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
    */
   @ConfigAttribute(type = String.class)
   String HTTP_SERVICE_SSL_TRUSTSTORE_NAME = HTTP_SERVICE_SSL_TRUSTSTORE;
@@ -3336,6 +3254,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD)
   String getHttpServiceSSLTrustStorePassword();
@@ -3343,6 +3262,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD)
   void setHttpServiceSSLTrustStorePassword(String trustStorePassword);
@@ -3350,15 +3270,21 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
   String DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
   @ConfigAttribute(type = String.class)
   String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME = HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
 
+  /**
+   * @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
+   */
   Properties getHttpServiceSSLProperties();
 
   //Added for API REST
@@ -3366,6 +3292,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#START_DEV_REST_API} property
    *
+   * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#START_DEV_REST_API} property
    * @return the value of the property
    * @since GemFire 8.0
    */
@@ -3375,6 +3302,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Set the {@link ConfigurationProperties#START_DEV_REST_API} for HTTP service.
    *
+   * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#START_DEV_REST_API} for HTTP service.
    * @param value for the property
    * @since GemFire 8.0
    */
@@ -3384,6 +3312,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The name of the {@link ConfigurationProperties#START_DEV_REST_API} property
    *
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#START_DEV_REST_API} property
    * @since GemFire 8.0
    */
   @ConfigAttribute(type = Boolean.class)
@@ -3392,7 +3321,6 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default value of the {@link ConfigurationProperties#START_DEV_REST_API} property.
    * Current value is <code>"false"</code>
-   *
    * @since GemFire 8.0
    */
   boolean DEFAULT_START_DEV_REST_API = false;
@@ -3424,11 +3352,15 @@ public interface DistributionConfig extends Config, LogConfig {
   @ConfigAttributeSetter(name = DISABLE_AUTO_RECONNECT)
   void setDisableAutoReconnect(boolean value);
 
+  /**
+   * @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
+   */
   Properties getServerSSLProperties();
 
   /**
    * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_ENABLED}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
    */
   @ConfigAttributeGetter(name = SERVER_SSL_ENABLED)
   boolean getServerSSLEnabled();
@@ -3436,10 +3368,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#SERVER_SSL_ENABLED} state.
    * <p> Actual value of this constant is <code>false</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
    */
   boolean DEFAULT_SERVER_SSL_ENABLED = false;
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_ENABLED} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_ENABLED} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_ENABLED}
    */
   @ConfigAttribute(type = Boolean.class)
   String SERVER_SSL_ENABLED_NAME = SERVER_SSL_ENABLED;
@@ -3447,6 +3382,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#SERVER_SSL_ENABLED}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
    */
   @ConfigAttributeSetter(name = SERVER_SSL_ENABLED)
   void setServerSSLEnabled(boolean enabled);
@@ -3454,6 +3390,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
    */
   @ConfigAttributeGetter(name = SERVER_SSL_PROTOCOLS)
   String getServerSSLProtocols();
@@ -3468,10 +3405,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS} value.
    * <p> Actual value of this constant is <code>any</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
    */
   String DEFAULT_SERVER_SSL_PROTOCOLS = "any";
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_PROTOCOLS} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
    */
   @ConfigAttribute(type = String.class)
   String SERVER_SSL_PROTOCOLS_NAME = SERVER_SSL_PROTOCOLS;
@@ -3479,6 +3419,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()} 
    */
   @ConfigAttributeGetter(name = SERVER_SSL_CIPHERS)
   String getServerSSLCiphers();
@@ -3486,6 +3427,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)} 
    */
   @ConfigAttributeSetter(name = SERVER_SSL_CIPHERS)
   void setServerSSLCiphers(String ciphers);
@@ -3493,10 +3435,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#SERVER_SSL_CIPHERS} value.
    * <p> Actual value of this constant is <code>any</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS} 
    */
   String DEFAULT_SERVER_SSL_CIPHERS = "any";
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_CIPHERS} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS} 
    */
   @ConfigAttribute(type = String.class)
   String SERVER_SSL_CIPHERS_NAME = SERVER_SSL_CIPHERS;
@@ -3504,6 +3449,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()} 
    */
   @ConfigAttributeGetter(name = SERVER_SSL_REQUIRE_AUTHENTICATION)
   boolean getServerSSLRequireAuthentication();
@@ -3511,6 +3457,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)} 
    */
   @ConfigAttributeSetter(name = SERVER_SSL_REQUIRE_AUTHENTICATION)
   void setServerSSLRequireAuthentication(boolean enabled);
@@ -3518,10 +3465,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION} value.
    * <p> Actual value of this constant is <code>true</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
   boolean DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION = true;
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_REQUIRE_AUTHENTICATION} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
   @ConfigAttribute(type = Boolean.class)
   String SERVER_SSL_REQUIRE_AUTHENTICATION_NAME = SERVER_SSL_REQUIRE_AUTHENTICATION;
@@ -3529,6 +3479,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
    */
   @ConfigAttributeGetter(name = SERVER_SSL_KEYSTORE)
   String getServerSSLKeyStore();
@@ -3536,6 +3487,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
    */
   @ConfigAttributeSetter(name = SERVER_SSL_KEYSTORE)
   void setServerSSLKeyStore(String keyStore);
@@ -3543,11 +3495,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#SERVER_SSL_KEYSTORE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
    */
   String DEFAULT_SERVER_SSL_KEYSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
    */
   @ConfigAttribute(type = String.class)
   String SERVER_SSL_KEYSTORE_NAME = SERVER_SSL_KEYSTORE;
@@ -3555,6 +3510,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
    */
   @ConfigAttributeGetter(name = SERVER_SSL_KEYSTORE_TYPE)
   String getServerSSLKeyStoreType();
@@ -3569,11 +3525,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
    */
   String DEFAULT_SERVER_SSL_KEYSTORE_TYPE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE_TYPE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    */
   @ConfigAttribute(type = String.class)
   String SERVER_SSL_KEYSTORE_TYPE_NAME = SERVER_SSL_KEYSTORE_TYPE;
@@ -3581,6 +3540,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
    */
   @ConfigAttributeGetter(name = SERVER_SSL_KEYSTORE_PASSWORD)
   String getServerSSLKeyStorePassword();
@@ -3595,11 +3555,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
   String DEFAULT_SERVER_SSL_KEYSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_KEYSTORE_PASSWORD} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
   @ConfigAttribute(type = String.class)
   String SERVER_SSL_KEYSTORE_PASSWORD_NAME = SERVER_SSL_KEYSTORE_PASSWORD;
@@ -3607,6 +3570,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
    */
   @ConfigAttributeGetter(name = SERVER_SSL_TRUSTSTORE)
   String getServerSSLTrustStore();
@@ -3614,6 +3578,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setServerSSLTrustStore(String)}
    */
   @ConfigAttributeSetter(name = SERVER_SSL_TRUSTSTORE)
   void setServerSSLTrustStore(String trustStore);
@@ -3621,11 +3586,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
    */
   String DEFAULT_SERVER_SSL_TRUSTSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_TRUSTSTORE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
    */
   @ConfigAttribute(type = String.class)
   String SERVER_SSL_TRUSTSTORE_NAME = SERVER_SSL_TRUSTSTORE;
@@ -3633,6 +3601,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
    */
   @ConfigAttributeGetter(name = SERVER_SSL_TRUSTSTORE_PASSWORD)
   String getServerSSLTrustStorePassword();
@@ -3640,6 +3609,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
    */
   @ConfigAttributeSetter(name = SERVER_SSL_TRUSTSTORE_PASSWORD)
   void setServerSSLTrustStorePassword(String trusStorePassword);
@@ -3647,11 +3617,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
   String DEFAULT_SERVER_SSL_TRUSTSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#SERVER_SSL_TRUSTSTORE_PASSWORD} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
   @ConfigAttribute(type = String.class)
   String SERVER_SSL_TRUSTSTORE_PASSWORD_NAME = SERVER_SSL_TRUSTSTORE_PASSWORD;
@@ -3659,6 +3632,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
    */
   @ConfigAttributeGetter(name = GATEWAY_SSL_ENABLED)
   boolean getGatewaySSLEnabled();
@@ -3666,10 +3640,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GATEWAY_SSL_ENABLED} state.
    * <p> Actual value of this constant is <code>false</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
    */
   boolean DEFAULT_GATEWAY_SSL_ENABLED = false;
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_ENABLED} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
    */
   @ConfigAttribute(type = Boolean.class)
   String GATEWAY_SSL_ENABLED_NAME = GATEWAY_SSL_ENABLED;
@@ -3677,6 +3654,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_ENABLED}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
    */
   @ConfigAttributeSetter(name = GATEWAY_SSL_ENABLED)
   void setGatewaySSLEnabled(boolean enabled);
@@ -3684,6 +3662,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
    */
   @ConfigAttributeGetter(name = GATEWAY_SSL_PROTOCOLS)
   String getGatewaySSLProtocols();
@@ -3691,6 +3670,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
    */
   @ConfigAttributeSetter(name = GATEWAY_SSL_PROTOCOLS)
   void setGatewaySSLProtocols(String protocols);
@@ -3698,10 +3678,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} value.
    * <p> Actual value of this constant is <code>any</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
    */
   String DEFAULT_GATEWAY_SSL_PROTOCOLS = "any";
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_PROTOCOLS} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
    */
   @ConfigAttribute(type = String.class)
   String GATEWAY_SSL_PROTOCOLS_NAME = GATEWAY_SSL_PROTOCOLS;
@@ -3709,6 +3692,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()} 
    */
   @ConfigAttributeGetter(name = GATEWAY_SSL_CIPHERS)
   String getGatewaySSLCiphers();
@@ -3716,6 +3700,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)} 
    */
   @ConfigAttributeSetter(name = GATEWAY_SSL_CIPHERS)
   void setGatewaySSLCiphers(String ciphers);
@@ -3723,10 +3708,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS} value.
    * <p> Actual value of this constant is <code>any</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS} 
    */
   String DEFAULT_GATEWAY_SSL_CIPHERS = "any";
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_CIPHERS} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_CIPHERS} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS} 
    */
   @ConfigAttribute(type = String.class)
   String GATEWAY_SSL_CIPHERS_NAME = GATEWAY_SSL_CIPHERS;
@@ -3734,6 +3722,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
    */
   @ConfigAttributeGetter(name = GATEWAY_SSL_REQUIRE_AUTHENTICATION)
   boolean getGatewaySSLRequireAuthentication();
@@ -3741,6 +3730,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION}
    * property.
+   * @deprecated Geode 1.0 use {@link #setGatewaySSLRequireAuthentication(boolean)}
    */
   @ConfigAttributeSetter(name = GATEWAY_SSL_REQUIRE_AUTHENTICATION)
   void setGatewaySSLRequireAuthentication(boolean enabled);
@@ -3748,10 +3738,13 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION} value.
    * <p> Actual value of this constant is <code>true</code>.
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
   boolean DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION = true;
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
   @ConfigAttribute(type = Boolean.class)
   String GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME = GATEWAY_SSL_REQUIRE_AUTHENTICATION;
@@ -3759,6 +3752,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
    */
   @ConfigAttributeGetter(name = GATEWAY_SSL_KEYSTORE)
   String getGatewaySSLKeyStore();
@@ -3766,6 +3760,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
    */
   @ConfigAttributeSetter(name = GATEWAY_SSL_KEYSTORE)
   void setGatewaySSLKeyStore(String keyStore);
@@ -3773,11 +3768,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
    */
   String DEFAULT_GATEWAY_SSL_KEYSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
    */
   @ConfigAttribute(type = String.class)
   String GATEWAY_SSL_KEYSTORE_NAME = GATEWAY_SSL_KEYSTORE;
@@ -3792,6 +3790,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
    */
   @ConfigAttributeSetter(name = GATEWAY_SSL_KEYSTORE_TYPE)
   void setGatewaySSLKeyStoreType(String keyStoreType);
@@ -3799,11 +3798,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
    */
   String DEFAULT_GATEWAY_SSL_KEYSTORE_TYPE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE_TYPE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    */
   @ConfigAttribute(type = String.class)
   String GATEWAY_SSL_KEYSTORE_TYPE_NAME = GATEWAY_SSL_KEYSTORE_TYPE;
@@ -3811,6 +3813,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
    */
   @ConfigAttributeGetter(name = GATEWAY_SSL_KEYSTORE_PASSWORD)
   String getGatewaySSLKeyStorePassword();
@@ -3818,6 +3821,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
    */
   @ConfigAttributeSetter(name = GATEWAY_SSL_KEYSTORE_PASSWORD)
   void setGatewaySSLKeyStorePassword(String keyStorePassword);
@@ -3825,11 +3829,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
   String DEFAULT_GATEWAY_SSL_KEYSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_KEYSTORE_PASSWORD} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
   @ConfigAttribute(type = String.class)
   String GATEWAY_SSL_KEYSTORE_PASSWORD_NAME = GATEWAY_SSL_KEYSTORE_PASSWORD;
@@ -3837,6 +3844,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
    */
   @ConfigAttributeGetter(name = GATEWAY_SSL_TRUSTSTORE)
   String getGatewaySSLTrustStore();
@@ -3844,6 +3852,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
    */
   @ConfigAttributeSetter(name = GATEWAY_SSL_TRUSTSTORE)
   void setGatewaySSLTrustStore(String trustStore);
@@ -3851,11 +3860,14 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
    */
   String DEFAULT_GATEWAY_SSL_TRUSTSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
    */
   @ConfigAttribute(type = String.class)
   String GATEWAY_SSL_TRUSTSTORE_NAME = GATEWAY_SSL_TRUSTSTORE;
@@ -3863,6 +3875,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
    */
   @ConfigAttributeGetter(name = GATEWAY_SSL_TRUSTSTORE_PASSWORD)
   String getGatewaySSLTrustStorePassword();
@@ -3870,6 +3883,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD}
    * property.
+   * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
    */
   @ConfigAttributeSetter(name = GATEWAY_SSL_TRUSTSTORE_PASSWORD)
   void setGatewaySSLTrustStorePassword(String trusStorePassword);
@@ -3877,15 +3891,21 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
+   * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
   String DEFAULT_GATEWAY_SSL_TRUSTSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD} property
+   * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD} property
+   * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
   @ConfigAttribute(type = String.class)
   String GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME = GATEWAY_SSL_TRUSTSTORE_PASSWORD;
 
+  /**
+   * @deprecated Geode 1.0 use {@link #getClusterSSLProperties()}
+   */
   Properties getGatewaySSLProperties();
 
   ConfigSource getConfigSource(String attName);
@@ -3894,7 +3914,6 @@ public interface DistributionConfig extends Config, LogConfig {
    * The name of the {@link ConfigurationProperties#LOCK_MEMORY} property.  Used to cause
    * pages to be locked
    * into memory, thereby preventing them from being swapped to disk.
-   *
    * @since Geode 1.0
    */
   @ConfigAttribute(type = Boolean.class)
@@ -3904,6 +3923,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * Gets the value of {@link ConfigurationProperties#LOCK_MEMORY}
    *
+   * Gets the value of {@link com.gemstone.gemfire.distributed.ConfigurationProperties#LOCK_MEMORY}
    * @since Geode 1.0
    */
   @ConfigAttributeGetter(name = LOCK_MEMORY)
@@ -3927,6 +3947,109 @@ public interface DistributionConfig extends Config, LogConfig {
   @ConfigAttributeGetter(name = SECURITY_SHIRO_INIT)
   String getShiroInit();
 
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeGetter(name = CLUSTER_SSL_ALIAS)
+  String getClusterSSLAlias();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeSetter(name = CLUSTER_SSL_ALIAS)
+  void setClusterSSLAlias(String alias);
+
+  String DEFAULT_CLUSTER_SSL_ALIAS = "";
+
+  /**
+   * The name of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS} property
+   */
+  @ConfigAttribute(type = String.class)
+  String CLUSTER_SSL_ALIAS_NAME = CLUSTER_SSL_ALIAS;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#GATEWAY_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeGetter(name = GATEWAY_SSL_ALIAS)
+  String getGatewaySSLAlias();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#GATEWAY_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeSetter(name = GATEWAY_SSL_ALIAS)
+  void setGatewaySSLAlias(String alias);
+
+  /**
+   * The name of the {@link ConfigurationProperties#GATEWAY_SSL_ALIAS} property
+   */
+  @ConfigAttribute(type = String.class)
+  String GATEWAY_SSL_ALIAS_NAME = GATEWAY_SSL_ALIAS;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeGetter(name = HTTP_SERVICE_SSL_ALIAS)
+  String getHTTPServiceSSLAlias();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeSetter(name = HTTP_SERVICE_SSL_ALIAS)
+  void setHTTPServiceSSLAlias(String alias);
+
+  /**
+   * The name of the {@link ConfigurationProperties#HTTP_SERVICE_SSL_ALIAS} property
+   */
+  @ConfigAttribute(type = String.class)
+  String HTTP_SERVICE_SSL_ALIAS_NAME = HTTP_SERVICE_SSL_ALIAS;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeGetter(name = JMX_MANAGER_SSL_ALIAS)
+  String getJMXManagerSSLAlias();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeSetter(name = JMX_MANAGER_SSL_ALIAS)
+  void setJMXManagerSSLAlias(String alias);
+
+  /**
+   * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ALIAS} property
+   */
+  @ConfigAttribute(type = String.class)
+  String JMX_MANAGER_SSL_ALIAS_NAME = JMX_MANAGER_SSL_ALIAS;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#SERVER_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeGetter(name = SERVER_SSL_ALIAS)
+  String getServerSSLAlias();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#SERVER_SSL_ALIAS}
+   * property.
+   */
+  @ConfigAttributeSetter(name = SERVER_SSL_ALIAS)
+  void setServerSSLAlias(String alias);
+
+  /**
+   * The name of the {@link ConfigurationProperties#SERVER_SSL_ALIAS} property
+   */
+  @ConfigAttribute(type = String.class)
+  String SERVER_SSL_ALIAS_NAME = SERVER_SSL_ALIAS;
+
   //*************** Initializers to gather all the annotations in this class ************************
 
   Map<String, ConfigAttribute> attributes = new HashMap<>();
@@ -3941,7 +4064,8 @@ public interface DistributionConfig extends Config, LogConfig {
         try {
           atts.add((String) field.get(null));
           attributes.put((String) field.get(null), field.getAnnotation(ConfigAttribute.class));
-   

<TRUNCATED>


Mime
View raw message