geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [2/3] incubator-geode git commit: GEODE-420: Amended method signature in SSLConfigurationFactory.java and SocketCreatorFactory.java to be more generic. Deprecated Cluster-ssl-* configuration and replaced it with new ssl-* configuration properties.
Date Tue, 09 Aug 2016 20:06:05 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/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 3eac56a..721a5fc 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
@@ -36,6 +36,7 @@ import com.gemstone.gemfire.internal.Config;
 import com.gemstone.gemfire.internal.ConfigSource;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.logging.LogConfig;
+import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.tcp.Connection;
 import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
 
@@ -812,6 +813,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_ENABLED}
    * property.
    */
+  @Deprecated
   @ConfigAttributeGetter(name = CLUSTER_SSL_ENABLED)
   boolean getClusterSSLEnabled();
 
@@ -819,6 +821,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_ENABLED}
    * property.
    */
+  @Deprecated
   @ConfigAttributeSetter(name = CLUSTER_SSL_ENABLED)
   void setClusterSSLEnabled(boolean enabled);
 
@@ -826,10 +829,13 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default {@link ConfigurationProperties#CLUSTER_SSL_ENABLED} state.
    * <p> Actual value of this constant is <code>false</code>.
    */
-  boolean DEFAULT_CLUSTER_SSL_ENABLED = false;
+  @Deprecated
+  boolean DEFAULT_SSL_ENABLED = false;
+
   /**
    * The name of the {@link ConfigurationProperties#CLUSTER_SSL_ENABLED} property
    */
+  @Deprecated
   @ConfigAttribute(type = Boolean.class)
   String CLUSTER_SSL_ENABLED_NAME = CLUSTER_SSL_ENABLED;
 
@@ -837,6 +843,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
    * property.
    */
+  @Deprecated
   @ConfigAttributeGetter(name = CLUSTER_SSL_PROTOCOLS)
   String getClusterSSLProtocols();
 
@@ -844,6 +851,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
    * property.
    */
+  @Deprecated
   @ConfigAttributeSetter(name = CLUSTER_SSL_PROTOCOLS)
   void setClusterSSLProtocols(String protocols);
 
@@ -851,10 +859,12 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default {@link ConfigurationProperties#CLUSTER_SSL_PROTOCOLS} value.
    * <p> Actual value of this constant is <code>any</code>.
    */
-  String DEFAULT_CLUSTER_SSL_PROTOCOLS = "any";
+  String DEFAULT_SSL_PROTOCOLS = "any";
+
   /**
    * The name of the {@link ConfigurationProperties#CLUSTER_SSL_PROTOCOLS} property
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_PROTOCOLS_NAME = CLUSTER_SSL_PROTOCOLS;
 
@@ -862,6 +872,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_CIPHERS}
    * property.
    */
+  @Deprecated
   @ConfigAttributeGetter(name = CLUSTER_SSL_CIPHERS)
   String getClusterSSLCiphers();
 
@@ -869,6 +880,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_CIPHERS}
    * property.
    */
+  @Deprecated
   @ConfigAttributeSetter(name = CLUSTER_SSL_CIPHERS)
   void setClusterSSLCiphers(String ciphers);
 
@@ -876,10 +888,12 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default {@link ConfigurationProperties#CLUSTER_SSL_CIPHERS} value.
    * <p> Actual value of this constant is <code>any</code>.
    */
-  String DEFAULT_CLUSTER_SSL_CIPHERS = "any";
+  String DEFAULT_SSL_CIPHERS = "any";
+
   /**
    * The name of the {@link ConfigurationProperties#CLUSTER_SSL_CIPHERS} property
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_CIPHERS_NAME = CLUSTER_SSL_CIPHERS;
 
@@ -887,6 +901,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    * property.
    */
+  @Deprecated
   @ConfigAttributeGetter(name = CLUSTER_SSL_REQUIRE_AUTHENTICATION)
   boolean getClusterSSLRequireAuthentication();
 
@@ -894,6 +909,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    * property.
    */
+  @Deprecated
   @ConfigAttributeSetter(name = CLUSTER_SSL_REQUIRE_AUTHENTICATION)
   void setClusterSSLRequireAuthentication(boolean enabled);
 
@@ -901,10 +917,12 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default {@link ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION} value.
    * <p> Actual value of this constant is <code>true</code>.
    */
-  boolean DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION = true;
+  boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION = true;
+
   /**
    * The name of the {@link ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION} property
    */
+  @Deprecated
   @ConfigAttribute(type = Boolean.class)
   String CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME = CLUSTER_SSL_REQUIRE_AUTHENTICATION;
 
@@ -912,6 +930,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
    * property.
    */
+  @Deprecated
   @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE)
   String getClusterSSLKeyStore();
 
@@ -919,6 +938,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
    * property.
    */
+  @Deprecated
   @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE)
   void setClusterSSLKeyStore(String keyStore);
 
@@ -926,11 +946,12 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE} value.
    * <p> Actual value of this constant is "".
    */
-  String DEFAULT_CLUSTER_SSL_KEYSTORE = "";
+  String DEFAULT_SSL_KEYSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE} property
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_KEYSTORE_NAME = CLUSTER_SSL_KEYSTORE;
 
@@ -938,6 +959,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    * property.
    */
+  @Deprecated
   @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE_TYPE)
   String getClusterSSLKeyStoreType();
 
@@ -945,6 +967,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    * property.
    */
+  @Deprecated
   @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE_TYPE)
   void setClusterSSLKeyStoreType(String keyStoreType);
 
@@ -957,6 +980,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The name of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE} property
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_KEYSTORE_TYPE_NAME = CLUSTER_SSL_KEYSTORE_TYPE;
 
@@ -964,6 +988,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
    * property.
    */
+  @Deprecated
   @ConfigAttributeGetter(name = CLUSTER_SSL_KEYSTORE_PASSWORD)
   String getClusterSSLKeyStorePassword();
 
@@ -971,6 +996,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD}
    * property.
    */
+  @Deprecated
   @ConfigAttributeSetter(name = CLUSTER_SSL_KEYSTORE_PASSWORD)
   void setClusterSSLKeyStorePassword(String keyStorePassword);
 
@@ -978,11 +1004,12 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
    */
-  String DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD = "";
+  String DEFAULT_SSL_KEYSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#CLUSTER_SSL_KEYSTORE_PASSWORD} property
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_KEYSTORE_PASSWORD_NAME = CLUSTER_SSL_KEYSTORE_PASSWORD;
 
@@ -990,6 +1017,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
    * property.
    */
+  @Deprecated
   @ConfigAttributeGetter(name = CLUSTER_SSL_TRUSTSTORE)
   String getClusterSSLTrustStore();
 
@@ -997,6 +1025,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE}
    * property.
    */
+  @Deprecated
   @ConfigAttributeSetter(name = CLUSTER_SSL_TRUSTSTORE)
   void setClusterSSLTrustStore(String trustStore);
 
@@ -1004,11 +1033,12 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE} value.
    * <p> Actual value of this constant is "".
    */
-  String DEFAULT_CLUSTER_SSL_TRUSTSTORE = "";
+  String DEFAULT_SSL_TRUSTSTORE = "";
 
   /**
    * The name of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE} property
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_TRUSTSTORE_NAME = CLUSTER_SSL_TRUSTSTORE;
 
@@ -1016,6 +1046,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    * property.
    */
+  @Deprecated
   @ConfigAttributeGetter(name = CLUSTER_SSL_TRUSTSTORE_PASSWORD)
   String getClusterSSLTrustStorePassword();
 
@@ -1023,6 +1054,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Sets the value of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    * property.
    */
+  @Deprecated
   @ConfigAttributeSetter(name = CLUSTER_SSL_TRUSTSTORE_PASSWORD)
   void setClusterSSLTrustStorePassword(String trusStorePassword);
 
@@ -1030,11 +1062,12 @@ public interface DistributionConfig extends Config, LogConfig {
    * The default {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD} value.
    * <p> Actual value of this constant is "".
    */
-  String DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD = "";
+  String DEFAULT_SSL_TRUSTSTORE_PASSWORD = "";
 
   /**
    * The name of the {@link ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD} property
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME = CLUSTER_SSL_TRUSTSTORE_PASSWORD;
 
@@ -2240,6 +2273,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <a name="cluster-ssl"/a></p>
    * <U>Description</U>: The cluster-ssl property prefix
    */
+  @Deprecated
   String CLUSTER_SSL_PREFIX = "cluster-ssl";
 
   /**
@@ -2494,7 +2528,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_ENABLED}
    */
   @Deprecated
   boolean DEFAULT_JMX_MANAGER_SSL_ENABLED = false;
@@ -2566,7 +2600,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_PROTOCOLS}
    */
   @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_PROTOCOLS = "any";
@@ -2600,7 +2634,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_CIPHERS}
    */
   @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_CIPHERS = "any";
@@ -2634,7 +2668,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_REQUIRE_AUTHENTICATION}
    */
   @Deprecated
   boolean DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = true;
@@ -2668,7 +2702,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE}
    */
   @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_KEYSTORE = "";
@@ -2737,7 +2771,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
    */
   @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "";
@@ -2745,7 +2779,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
    */
   @Deprecated
   @ConfigAttribute(type = String.class)
@@ -2772,7 +2806,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE}
    */
   @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE = "";
@@ -2806,7 +2840,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE_PASSWORD}
    */
   @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "";
@@ -2964,8 +2998,8 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#REDIS_PORT} property
-   *
    * @return the port on which GeodeRedisServer should be started
+   *
    * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name = REDIS_PORT)
@@ -3113,7 +3147,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_ENABLED}
    */
   @Deprecated
   boolean DEFAULT_HTTP_SERVICE_SSL_ENABLED = false;
@@ -3148,7 +3182,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_REQUIRE_AUTHENTICATION}
    */
   @Deprecated
   boolean DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = false;
@@ -3183,7 +3217,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_PROTOCOLS}
    */
   @Deprecated
   String DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS = "any";
@@ -3218,7 +3252,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_CIPHERS}
    */
   @Deprecated
   String DEFAULT_HTTP_SERVICE_SSL_CIPHERS = "any";
@@ -3253,7 +3287,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE}
    */
   @Deprecated
   String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE = "";
@@ -3288,7 +3322,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
    */
   @Deprecated
   String DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "";
@@ -3357,7 +3391,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE}
    */
   @Deprecated
   String DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE = "";
@@ -3392,7 +3426,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE_PASSWORD}
    */
   @Deprecated
   String DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "";
@@ -3496,7 +3530,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_ENABLED}
    */
   @Deprecated
   boolean DEFAULT_SERVER_SSL_ENABLED = false;
@@ -3537,7 +3571,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_PROTOCOLS}
    */
   @Deprecated
   String DEFAULT_SERVER_SSL_PROTOCOLS = "any";
@@ -3571,7 +3605,7 @@ 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} 
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_CIPHERS} 
    */
   @Deprecated
   String DEFAULT_SERVER_SSL_CIPHERS = "any";
@@ -3605,7 +3639,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_REQUIRE_AUTHENTICATION}
    */
   @Deprecated
   boolean DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION = true;
@@ -3639,7 +3673,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE}
    */
   @Deprecated
   String DEFAULT_SERVER_SSL_KEYSTORE = "";
@@ -3709,7 +3743,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
    */
   @Deprecated
   String DEFAULT_SERVER_SSL_KEYSTORE_PASSWORD = "";
@@ -3744,7 +3778,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE}
    */
   String DEFAULT_SERVER_SSL_TRUSTSTORE = "";
 
@@ -3778,7 +3812,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE_PASSWORD}
    */
   @Deprecated
   String DEFAULT_SERVER_SSL_TRUSTSTORE_PASSWORD = "";
@@ -3804,7 +3838,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_ENABLED}
    */
   @Deprecated
   boolean DEFAULT_GATEWAY_SSL_ENABLED = false;
@@ -3847,7 +3881,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_PROTOCOLS}
    */
   String DEFAULT_GATEWAY_SSL_PROTOCOLS = "any";
   /**
@@ -3880,7 +3914,7 @@ 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} 
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_CIPHERS} 
    */
   String DEFAULT_GATEWAY_SSL_CIPHERS = "any";
   /**
@@ -3913,7 +3947,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_REQUIRE_AUTHENTICATION}
    */
   @Deprecated
   boolean DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION = true;
@@ -3947,7 +3981,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE}
    */
   @Deprecated
   String DEFAULT_GATEWAY_SSL_KEYSTORE = "";
@@ -4017,7 +4051,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_KEYSTORE_PASSWORD}
    */
   @Deprecated
   String DEFAULT_GATEWAY_SSL_KEYSTORE_PASSWORD = "";
@@ -4052,7 +4086,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE}
    */
   @Deprecated
   String DEFAULT_GATEWAY_SSL_TRUSTSTORE = "";
@@ -4087,7 +4121,7 @@ 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}
+   * @deprecated Geode 1.0 use {@link #DEFAULT_SSL_TRUSTSTORE_PASSWORD}
    */
   @Deprecated
   String DEFAULT_GATEWAY_SSL_TRUSTSTORE_PASSWORD = "";
@@ -4297,7 +4331,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * @since Geode 1.0
    */
   @ConfigAttributeGetter(name = SSL_ENABLED_COMPONENTS)
-  String[] getSSLEnabledComponents();
+  SSLEnabledComponent[] getSSLEnabledComponents();
 
   /**
    * Sets the value of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS}
@@ -4305,20 +4339,181 @@ public interface DistributionConfig extends Config, LogConfig {
    * @since Geode 1.0
    */
   @ConfigAttributeSetter(name = SSL_ENABLED_COMPONENTS)
-  void setSSLEnabledComponents(String[] sslEnabledComponents);
+  void setSSLEnabledComponents(SSLEnabledComponent[] sslEnabledComponents);
 
   /**
    * The name of the {@link ConfigurationProperties#SSL_ENABLED_COMPONENTS} property
    * @since Geode 1.0
    */
-  @ConfigAttribute(type = String[].class)
+  @ConfigAttribute(type = SSLEnabledComponent[].class)
   String SSL_ENABLED_COMPONENTS_NAME = SSL_ENABLED_COMPONENTS;
 
   /**
    * The default ssl enabled components
    * @since Geode 1.0
    */
-  String[] DEFAULT_SSL_ENABLED_COMPONENTS = new String[]{};
+  SSLEnabledComponent[] DEFAULT_SSL_ENABLED_COMPONENTS = new SSLEnabledComponent[] {};
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#SSL_PROTOCOLS}
+   * property.
+   */
+  @ConfigAttributeGetter(name = SSL_PROTOCOLS)
+  String getSSLProtocols();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#SSL_PROTOCOLS}
+   * property.
+   */
+  @ConfigAttributeSetter(name = SSL_PROTOCOLS)
+  void setSSLProtocols(String protocols);
+
+  /**
+   * The name of the {@link ConfigurationProperties#SSL_PROTOCOLS} property
+   */
+  @ConfigAttribute(type = String.class)
+  String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#SSL_CIPHERS}
+   * property.
+   */
+  @ConfigAttributeGetter(name = SSL_CIPHERS)
+  String getSSLCiphers();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#SSL_CIPHERS}
+   * property.
+   */
+  @ConfigAttributeSetter(name = SSL_CIPHERS)
+  void setSSLCiphers(String ciphers);
+
+  /**
+   * The name of the {@link ConfigurationProperties#SSL_CIPHERS} property
+   */
+  @ConfigAttribute(type = String.class)
+  String SSL_CIPHERS_NAME = SSL_CIPHERS;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION}
+   * property.
+   */
+  @ConfigAttributeGetter(name = SSL_REQUIRE_AUTHENTICATION)
+  boolean getSSLRequireAuthentication();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION}
+   * property.
+   */
+  @ConfigAttributeSetter(name = SSL_REQUIRE_AUTHENTICATION)
+  void setSSLRequireAuthentication(boolean enabled);
+
+  /**
+   * The name of the {@link ConfigurationProperties#SSL_REQUIRE_AUTHENTICATION} property
+   */
+  @ConfigAttribute(type = Boolean.class)
+  String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#SSL_KEYSTORE}
+   * property.
+   */
+  @ConfigAttributeGetter(name = SSL_KEYSTORE)
+  String getSSLKeyStore();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#SSL_KEYSTORE}
+   * property.
+   */
+  @ConfigAttributeSetter(name = SSL_KEYSTORE)
+  void setSSLKeyStore(String keyStore);
+
+  /**
+   * The name of the {@link ConfigurationProperties#SSL_KEYSTORE} property
+   */
+  @ConfigAttribute(type = String.class)
+  String SSL_KEYSTORE_NAME = SSL_KEYSTORE;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#SSL_KEYSTORE_TYPE}
+   * property.
+   */
+  @ConfigAttributeGetter(name = SSL_KEYSTORE_TYPE)
+  String getSSLKeyStoreType();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#SSL_KEYSTORE_TYPE}
+   * property.
+   */
+  @ConfigAttributeSetter(name = SSL_KEYSTORE_TYPE)
+  void setSSLKeyStoreType(String keyStoreType);
+
+  /**
+   * The name of the {@link ConfigurationProperties#SSL_KEYSTORE_TYPE} property
+   */
+  @ConfigAttribute(type = String.class)
+  String SSL_KEYSTORE_TYPE_NAME = SSL_KEYSTORE_TYPE;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#SSL_KEYSTORE_PASSWORD}
+   * property.
+   */
+  @ConfigAttributeGetter(name = SSL_KEYSTORE_PASSWORD)
+  String getSSLKeyStorePassword();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#SSL_KEYSTORE_PASSWORD}
+   * property.
+   */
+  @ConfigAttributeSetter(name = SSL_KEYSTORE_PASSWORD)
+  void setSSLKeyStorePassword(String keyStorePassword);
+
+  /**
+   * The name of the {@link ConfigurationProperties#SSL_KEYSTORE_PASSWORD} property
+   */
+  @ConfigAttribute(type = String.class)
+  String SSL_KEYSTORE_PASSWORD_NAME = SSL_KEYSTORE_PASSWORD;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#SSL_TRUSTSTORE}
+   * property.
+   */
+  @ConfigAttributeGetter(name = SSL_TRUSTSTORE)
+  String getSSLTrustStore();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#SSL_TRUSTSTORE}
+   * property.
+   */
+  @ConfigAttributeSetter(name = SSL_TRUSTSTORE)
+  void setSSLTrustStore(String trustStore);
+
+  /**
+   * The name of the {@link ConfigurationProperties#SSL_TRUSTSTORE} property
+   */
+  @ConfigAttribute(type = String.class)
+  String SSL_TRUSTSTORE_NAME = SSL_TRUSTSTORE;
+
+  /**
+   * Returns the value of the {@link ConfigurationProperties#SSL_TRUSTSTORE_PASSWORD}
+   * property.
+   */
+  @ConfigAttributeGetter(name = SSL_TRUSTSTORE_PASSWORD)
+  String getSSLTrustStorePassword();
+
+  /**
+   * Sets the value of the {@link ConfigurationProperties#SSL_TRUSTSTORE_PASSWORD}
+   * property.
+   */
+  @ConfigAttributeSetter(name = SSL_TRUSTSTORE_PASSWORD)
+  void setSSLTrustStorePassword(String trustStorePassword);
+
+  /**
+   * The name of the {@link ConfigurationProperties#SSL_TRUSTSTORE_PASSWORD} property
+   */
+  @ConfigAttribute(type = String.class)
+  String SSL_TRUSTSTORE_PASSWORD_NAME = SSL_TRUSTSTORE_PASSWORD;
+
 
   //*************** Initializers to gather all the annotations in this class ************************
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index 7720dbf..25b9b1e 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -43,6 +43,7 @@ import com.gemstone.gemfire.InternalGemFireException;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.internal.ConfigSource;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.net.SocketCreator;
 import com.gemstone.gemfire.internal.process.ProcessLauncherContext;
 import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
@@ -177,15 +178,25 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
   protected int logDiskSpaceLimit = DEFAULT_LOG_DISK_SPACE_LIMIT;
   protected int logFileSizeLimit = DEFAULT_LOG_FILE_SIZE_LIMIT;
 
-  private boolean clusterSSLEnabled = DEFAULT_CLUSTER_SSL_ENABLED;
-  private String clusterSSLProtocols = DEFAULT_CLUSTER_SSL_PROTOCOLS;
-  private String clusterSSLCiphers = DEFAULT_CLUSTER_SSL_CIPHERS;
-  private boolean clusterSSLRequireAuthentication = DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION;
-  private String clusterSSLKeyStore = DEFAULT_CLUSTER_SSL_KEYSTORE;
+  @Deprecated
+  private boolean clusterSSLEnabled = DEFAULT_SSL_ENABLED;
+  @Deprecated
+  private String clusterSSLProtocols = DEFAULT_SSL_PROTOCOLS;
+  @Deprecated
+  private String clusterSSLCiphers = DEFAULT_SSL_CIPHERS;
+  @Deprecated
+  private boolean clusterSSLRequireAuthentication = DEFAULT_SSL_REQUIRE_AUTHENTICATION;
+  @Deprecated
+  private String clusterSSLKeyStore = DEFAULT_SSL_KEYSTORE;
+  @Deprecated
   private String clusterSSLKeyStoreType = DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE;
-  private String clusterSSLKeyStorePassword = DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD;
-  private String clusterSSLTrustStore = DEFAULT_CLUSTER_SSL_TRUSTSTORE;
-  private String clusterSSLTrustStorePassword = DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD;
+  @Deprecated
+  private String clusterSSLKeyStorePassword = DEFAULT_SSL_KEYSTORE_PASSWORD;
+  @Deprecated
+  private String clusterSSLTrustStore = DEFAULT_SSL_TRUSTSTORE;
+  @Deprecated
+  private String clusterSSLTrustStorePassword = DEFAULT_SSL_TRUSTSTORE_PASSWORD;
+
   private String clusterSSLAlias = DEFAULT_CLUSTER_SSL_ALIAS;
 
   /**
@@ -432,7 +443,6 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
 
   private boolean jmxManager = Boolean.getBoolean(InternalLocator.FORCE_LOCATOR_DM_TYPE) ? true : DEFAULT_JMX_MANAGER;
   private boolean jmxManagerStart = DEFAULT_JMX_MANAGER_START;
-
   private int jmxManagerPort = DEFAULT_JMX_MANAGER_PORT;
   private String jmxManagerBindAddress = DEFAULT_JMX_MANAGER_BIND_ADDRESS;
   private String jmxManagerHostnameForClients = DEFAULT_JMX_MANAGER_HOSTNAME_FOR_CLIENTS;
@@ -441,65 +451,109 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
   private int jmxManagerHttpPort = DEFAULT_HTTP_SERVICE_PORT;
   private int jmxManagerUpdateRate = DEFAULT_JMX_MANAGER_UPDATE_RATE;
 
+  @Deprecated
   private boolean jmxManagerSSLEnabled = DEFAULT_JMX_MANAGER_SSL_ENABLED;
+  @Deprecated
   private boolean jmxManagerSslRequireAuthentication = DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION;
+  @Deprecated
   private String jmxManagerSslProtocols = DEFAULT_JMX_MANAGER_SSL_PROTOCOLS;
+  @Deprecated
   private String jmxManagerSslCiphers = DEFAULT_JMX_MANAGER_SSL_CIPHERS;
+  @Deprecated
   private Properties jmxManagerSslProperties = new Properties();
-
+  @Deprecated
   private String jmxManagerSSLKeyStore = DEFAULT_JMX_MANAGER_SSL_KEYSTORE;
+  @Deprecated
   private String jmxManagerSSLKeyStoreType = DEFAULT_JMX_MANAGER_SSL_KEYSTORE_TYPE;
+  @Deprecated
   private String jmxManagerSSLKeyStorePassword = DEFAULT_JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
+  @Deprecated
   private String jmxManagerSSLTrustStore = DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE;
+  @Deprecated
   private String jmxManagerSSLTrustStorePassword = DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
 
   private String jmxManagerSSLAlias = clusterSSLAlias;
 
+  @Deprecated
   private boolean serverSSLEnabled = DEFAULT_SERVER_SSL_ENABLED;
+  @Deprecated
   private boolean serverSslRequireAuthentication = DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION;
+  @Deprecated
   private String serverSslProtocols = DEFAULT_SERVER_SSL_PROTOCOLS;
+  @Deprecated
   private String serverSslCiphers = DEFAULT_SERVER_SSL_CIPHERS;
+  @Deprecated
   private Properties serverSslProperties = new Properties();
-
+  @Deprecated
   private String serverSSLKeyStore = DEFAULT_SERVER_SSL_KEYSTORE;
+  @Deprecated
   private String serverSSLKeyStoreType = DEFAULT_SERVER_SSL_KEYSTORE_TYPE;
+  @Deprecated
   private String serverSSLKeyStorePassword = DEFAULT_SERVER_SSL_KEYSTORE_PASSWORD;
+  @Deprecated
   private String serverSSLTrustStore = DEFAULT_SERVER_SSL_TRUSTSTORE;
+  @Deprecated
   private String serverSSLTrustStorePassword = DEFAULT_SERVER_SSL_TRUSTSTORE_PASSWORD;
 
   private String serverSSLAlias = clusterSSLAlias;
 
+  @Deprecated
   private boolean gatewaySSLEnabled = DEFAULT_GATEWAY_SSL_ENABLED;
+  @Deprecated
   private boolean gatewaySslRequireAuthentication = DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION;
+  @Deprecated
   private String gatewaySslProtocols = DEFAULT_GATEWAY_SSL_PROTOCOLS;
+  @Deprecated
   private String gatewaySslCiphers = DEFAULT_GATEWAY_SSL_CIPHERS;
+  @Deprecated
   private Properties gatewaySslProperties = new Properties();
-
+  @Deprecated
   private String gatewaySSLKeyStore = DEFAULT_GATEWAY_SSL_KEYSTORE;
+  @Deprecated
   private String gatewaySSLKeyStoreType = DEFAULT_GATEWAY_SSL_KEYSTORE_TYPE;
+  @Deprecated
   private String gatewaySSLKeyStorePassword = DEFAULT_GATEWAY_SSL_KEYSTORE_PASSWORD;
+  @Deprecated
   private String gatewaySSLTrustStore = DEFAULT_GATEWAY_SSL_TRUSTSTORE;
+  @Deprecated
   private String gatewaySSLTrustStorePassword = DEFAULT_GATEWAY_SSL_TRUSTSTORE_PASSWORD;
 
-  private String gatewaySSLAlias = clusterSSLAlias;
 
+  private String gatewaySSLAlias = clusterSSLAlias;
 
+  @Deprecated
   private boolean httpServiceSSLEnabled = DEFAULT_HTTP_SERVICE_SSL_ENABLED;
+  @Deprecated
   private boolean httpServiceSSLRequireAuthentication = DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION;
+  @Deprecated
   private String httpServiceSSLProtocols = DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS;
+  @Deprecated
   private String httpServiceSSLCiphers = DEFAULT_HTTP_SERVICE_SSL_CIPHERS;
+  @Deprecated
   private Properties httpServiceSSLProperties = new Properties();
-
+  @Deprecated
   private String httpServiceSSLKeyStore = DEFAULT_HTTP_SERVICE_SSL_KEYSTORE;
+  @Deprecated
   private String httpServiceSSLKeyStoreType = DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_TYPE;
+  @Deprecated
   private String httpServiceSSLKeyStorePassword = DEFAULT_HTTP_SERVICE_SSL_KEYSTORE_PASSWORD;
+  @Deprecated
   private String httpServiceSSLTrustStore = DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE;
+  @Deprecated
   private String httpServiceSSLTrustStorePassword = DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD;
 
   private String httpServiceSSLAlias = clusterSSLAlias;
 
-  //TODO UDO Clean this up. Move this to an SSLEnabledComponent[]
-  private String[] sslEnabledComponents = DEFAULT_SSL_ENABLED_COMPONENTS;
+  private SSLEnabledComponent[] sslEnabledComponents = DEFAULT_SSL_ENABLED_COMPONENTS;
+
+  private String sslProtocols = DEFAULT_SSL_PROTOCOLS;
+  private String sslCiphers = DEFAULT_SSL_CIPHERS;
+  private boolean sslRequireAuthentication = DEFAULT_SSL_REQUIRE_AUTHENTICATION;
+  private String sslKeyStore = DEFAULT_SSL_KEYSTORE;
+  private String sslKeyStoreType = DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE;
+  private String sslKeyStorePassword = DEFAULT_SSL_KEYSTORE_PASSWORD;
+  private String sslTrustStore = DEFAULT_SSL_TRUSTSTORE;
+  private String sslTrustStorePassword = DEFAULT_SSL_TRUSTSTORE_PASSWORD;
 
   private String locatorSSLAlias = clusterSSLAlias;
 
@@ -700,9 +754,21 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
     this.httpServiceSSLAlias = other.getHTTPServiceSSLAlias();
     this.jmxManagerSSLAlias = other.getJMXManagerSSLAlias();
     this.serverSSLAlias = other.getServerSSLAlias();
+    this.locatorSSLAlias = other.getLocatorSSLAlias();
+
     this.sslEnabledComponents = ((DistributionConfigImpl) other).sslEnabledComponents;
 
-    this.locatorSSLAlias = other.getLocatorSSLAlias();
+    this.sslCiphers = other.getSSLCiphers();
+    this.sslProtocols = other.getSSLProtocols();
+    this.sslRequireAuthentication = other.getSSLRequireAuthentication();
+    this.sslKeyStore = other.getSSLKeyStore();
+    this.sslKeyStorePassword = other.getSSLKeyStorePassword();
+    this.sslKeyStoreType = other.getSSLKeyStoreType();
+    this.sslTrustStore = other.getSSLTrustStore();
+    this.sslTrustStorePassword = other.getSSLTrustStorePassword();
+    this.sslProperties = other.getSSLProperties();
+
+
   }
 
   /**
@@ -1231,14 +1297,9 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
   }
 
   public static boolean specialPropName(String propName) {
-    return propName.equalsIgnoreCase(CLUSTER_SSL_ENABLED) ||
-           propName.equals(SECURITY_PEER_AUTH_INIT) ||
-           propName.equals(SECURITY_PEER_AUTHENTICATOR) ||
-           propName.equals(LOG_WRITER_NAME) ||
-           propName.equals(DS_CONFIG_NAME) ||
-           propName.equals(SECURITY_LOG_WRITER_NAME) ||
-           propName.equals(LOG_OUTPUTSTREAM_NAME) ||
-           propName.equals(SECURITY_LOG_OUTPUTSTREAM_NAME);
+    return propName.equalsIgnoreCase(CLUSTER_SSL_ENABLED) || propName.equals(SECURITY_PEER_AUTH_INIT) || propName.equals(SECURITY_PEER_AUTHENTICATOR) || propName
+      .equals(LOG_WRITER_NAME) || propName.equals(DS_CONFIG_NAME) || propName.equals(SECURITY_LOG_WRITER_NAME) || propName.equals(LOG_OUTPUTSTREAM_NAME) || propName
+             .equals(SECURITY_LOG_OUTPUTSTREAM_NAME);
   }
 
   @Override
@@ -2412,15 +2473,95 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
   }
 
   @Override
-  public String[] getSSLEnabledComponents() {
+  public SSLEnabledComponent[] getSSLEnabledComponents() {
     return sslEnabledComponents;
   }
 
   @Override
-  public void setSSLEnabledComponents(final String[] sslEnabledComponents) {
+  public void setSSLEnabledComponents(final SSLEnabledComponent[] sslEnabledComponents) {
     this.sslEnabledComponents = sslEnabledComponents;
   }
 
+  @Override
+  public String getSSLProtocols() {
+    return sslProtocols;
+  }
+
+  @Override
+  public void setSSLProtocols(final String sslProtocols) {
+    this.sslProtocols = sslProtocols;
+  }
+
+  @Override
+  public String getSSLCiphers() {
+    return sslCiphers;
+  }
+
+  @Override
+  public void setSSLCiphers(final String sslCiphers) {
+    this.sslCiphers = sslCiphers;
+  }
+
+  @Override
+  public boolean getSSLRequireAuthentication() {
+    return sslRequireAuthentication;
+  }
+
+  @Override
+  public void setSSLRequireAuthentication(final boolean sslRequireAuthentication) {
+    this.sslRequireAuthentication = sslRequireAuthentication;
+  }
+
+  @Override
+  public String getSSLKeyStore() {
+    return sslKeyStore;
+  }
+
+  @Override
+  public void setSSLKeyStore(final String sslKeyStore) {
+    this.sslKeyStore = sslKeyStore;
+  }
+
+  @Override
+  public String getSSLKeyStoreType() {
+    return sslKeyStoreType;
+  }
+
+  @Override
+  public void setSSLKeyStoreType(final String sslKeyStoreType) {
+    this.sslKeyStoreType = sslKeyStoreType;
+  }
+
+  @Override
+  public String getSSLKeyStorePassword() {
+    return sslKeyStorePassword;
+  }
+
+  @Override
+  public void setSSLKeyStorePassword(final String sslKeyStorePassword) {
+    this.sslKeyStorePassword = sslKeyStorePassword;
+  }
+
+  @Override
+  public String getSSLTrustStore() {
+    return sslTrustStore;
+  }
+
+  @Override
+  public void setSSLTrustStore(final String sslTrustStore) {
+    this.sslTrustStore = sslTrustStore;
+  }
+
+  @Override
+  public String getSSLTrustStorePassword() {
+    return sslTrustStorePassword;
+  }
+
+  @Override
+  public void setSSLTrustStorePassword(final String sslTrustStorePassword) {
+    this.sslTrustStorePassword = sslTrustStorePassword;
+  }
+
   ///////////////////////  Utility Methods  ///////////////////////
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index f78abe1..8499fbb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -64,6 +64,7 @@ import com.gemstone.gemfire.distributed.internal.membership.gms.messages.Heartbe
 import com.gemstone.gemfire.distributed.internal.membership.gms.messages.SuspectMembersMessage;
 import com.gemstone.gemfire.distributed.internal.membership.gms.messages.SuspectRequest;
 import com.gemstone.gemfire.internal.ConnectionWatcher;
+import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.net.SocketCreator;
 import com.gemstone.gemfire.internal.Version;
 import com.gemstone.gemfire.internal.net.SocketCreatorFactory;
@@ -494,7 +495,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
     InternalDistributedSystem internalDistributedSystem = InternalDistributedSystem.getConnectedInstance();
     try {
       logger.debug("Checking member {} with TCP socket connection {}:{}.", suspectMember, suspectMember.getInetAddress(), port);
-      clientSocket = SocketCreatorFactory.getClusterSSLSocketCreator().connect(suspectMember.getInetAddress(), port,
+      clientSocket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).connect(suspectMember.getInetAddress(), port,
           (int)memberTimeout, new ConnectTimeoutTask(services.getTimer(), memberTimeout), false, -1, false);
       clientSocket.setTcpNoDelay(true);
       return doTCPCheckMember(suspectMember, clientSocket);
@@ -643,7 +644,7 @@ public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
   ServerSocket createServerSocket(InetAddress socketAddress, int[] portRange) {
     ServerSocket serverSocket = null;
     try {
-      serverSocket = SocketCreatorFactory.getClusterSSLSocketCreator().createServerSocketUsingPortRange(socketAddress, 50/*backlog*/,
+      serverSocket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).createServerSocketUsingPortRange(socketAddress, 50/*backlog*/,
         true/*isBindAddress*/, false/*useNIO*/, 65536/*tcpBufferSize*/, portRange, false);
       socketPort = serverSocket.getLocalPort();
     } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
index 6743634..6508f1b 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
@@ -27,13 +27,6 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.URL;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.DoubleBuffer;
-import java.nio.FloatBuffer;
-import java.nio.IntBuffer;
-import java.nio.LongBuffer;
-import java.nio.ShortBuffer;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -68,7 +61,6 @@ import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.net.SocketCreator;
 import com.gemstone.gemfire.internal.net.SocketCreatorFactory;
-import com.gemstone.gemfire.internal.tcp.ByteBufferInputStream.ByteBufferByteSource;
 
 /**
  * TCP server which listens on a port and delegates requests to a request
@@ -176,7 +168,11 @@ public class TcpServer {
 
     //TODO Udo: How would I handle this case where the cfg is empty???
 
-    this.socketCreator = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.LOCATOR);
+    if (this.socketCreator == null) {
+      this.socketCreator = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.LOCATOR);
+    } else {
+      throw new RuntimeException("The socket Creator already exists");
+    }
   }
 
   private static PooledExecutorWithDMStats createExecutor(PoolStatHelper poolHelper, final ThreadGroup threadGroup) {
@@ -209,6 +205,13 @@ public class TcpServer {
   }
 
   private void startServerThread() throws IOException {
+    //TODO Udo: clean this up
+    if(srv_sock != null){
+      throw new RuntimeException("TcpServer.startServerThread + SrvSocket not null");
+    }
+    if(srv_sock != null && !srv_sock.isClosed()){
+      throw new RuntimeException("TcpServer.startServerThread + SrvSocket not closed");
+    }
     if (srv_sock == null || srv_sock.isClosed()) {
       if (bind_address == null) {
         srv_sock = socketCreator.createServerSocket(port, BACKLOG);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
index 812e307..d046643 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
@@ -43,6 +43,7 @@ import com.gemstone.gemfire.UnmodifiableException;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.FlowControlParams;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.net.SocketCreator;
 
 /**
@@ -305,8 +306,7 @@ public abstract class AbstractConfig implements Config {
     String[] validAttNames = getAttributeNames();
     if (!Arrays.asList(validAttNames).contains(attName.toLowerCase())) {
       throw new IllegalArgumentException(LocalizedStrings.AbstractConfig_UNKNOWN_CONFIGURATION_ATTRIBUTE_NAME_0_VALID_ATTRIBUTE_NAMES_ARE_1.toLocalizedString(new Object[] {
-        attName,
-        SystemAdmin.join(validAttNames)
+        attName, SystemAdmin.join(validAttNames)
       }));
     }
   }
@@ -352,7 +352,7 @@ public abstract class AbstractConfig implements Config {
         attObjectValue = attValue;
       } else if (valueType.equals(String[].class)) {
         attObjectValue = commaDelimitedStringToStringArray(attValue);
-      } else if (valueType.equals(Integer.class)) {
+      }  else if (valueType.equals(Integer.class)) {
         attObjectValue = Integer.valueOf(attValue);
       } else if (valueType.equals(Long.class)) {
         attObjectValue = Long.valueOf(attValue);
@@ -374,9 +374,7 @@ public abstract class AbstractConfig implements Config {
           attObjectValue = InetAddress.getByName(attValue);
         } catch (UnknownHostException ex) {
           throw new IllegalArgumentException(LocalizedStrings.AbstractConfig_0_VALUE_1_MUST_BE_A_VALID_HOST_NAME_2.toLocalizedString(new Object[] {
-            attName,
-            attValue,
-            ex.toString()
+            attName, attValue, ex.toString()
           }));
         }
       } else if (valueType.equals(String[].class)) {
@@ -391,8 +389,7 @@ public abstract class AbstractConfig implements Config {
         String values[] = attValue.split(",");
         if (values.length != 3) {
           throw new IllegalArgumentException(LocalizedStrings.AbstractConfig_0_VALUE_1_MUST_HAVE_THREE_ELEMENTS_SEPARATED_BY_COMMAS.toLocalizedString(new Object[] {
-            attName,
-            attValue
+            attName, attValue
           }));
         }
         int credits = 0;
@@ -404,21 +401,25 @@ public abstract class AbstractConfig implements Config {
           waittime = Integer.parseInt(values[2].trim());
         } catch (NumberFormatException e) {
           throw new IllegalArgumentException(LocalizedStrings.AbstractConfig_0_VALUE_1_MUST_BE_COMPOSED_OF_AN_INTEGER_A_FLOAT_AND_AN_INTEGER.toLocalizedString(new Object[] {
-            attName,
-            attValue
+            attName, attValue
           }));
         }
         attObjectValue = new FlowControlParams(credits, thresh, waittime);
-      } else {
+      } else if (valueType.isArray() && SSLEnabledComponent.class.equals(valueType.getComponentType())) {
+        attObjectValue = commaDelimitedStringToSSLEnabledComponents(attValue);
+      }else {
         throw new InternalGemFireException(LocalizedStrings.AbstractConfig_UNHANDLED_ATTRIBUTE_TYPE_0_FOR_1.toLocalizedString(new Object[] {
-          valueType,
-          attName
+          valueType, attName
         }));
       }
-    } catch (NumberFormatException ex) {
+    } catch (NumberFormatException ex)
+
+    {
       throw new IllegalArgumentException(LocalizedStrings.AbstractConfig_0_VALUE_1_MUST_BE_A_NUMBER.toLocalizedString(new Object[] { attName, attValue }));
     }
+
     setAttributeObject(attName, attObjectValue, source);
+
   }
 
   private String[] commaDelimitedStringToStringArray(final String tokenizeString) {
@@ -430,6 +431,16 @@ public abstract class AbstractConfig implements Config {
     return strings;
   }
 
+  private SSLEnabledComponent[] commaDelimitedStringToSSLEnabledComponents(final String tokenizeString) {
+    StringTokenizer stringTokenizer = new StringTokenizer(tokenizeString, ",");
+    SSLEnabledComponent[] returnArray = new SSLEnabledComponent[stringTokenizer.countTokens()];
+    for (int i = 0; i < returnArray.length; i++) {
+      String name = stringTokenizer.nextToken();
+      returnArray[i] = SSLEnabledComponent.getEnum(name);
+    }
+    return returnArray;
+  }
+
   /**
    * Removes the last character of the input string and returns the trimmed name
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
index bb8638c..977d44d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
@@ -32,15 +32,15 @@ public class SSLConfig {
 
   //private static final String PREFIX = "javax.net.ssl.";
 
-  private boolean enabled = DistributionConfig.DEFAULT_CLUSTER_SSL_ENABLED;
-  private String protocols = DistributionConfig.DEFAULT_CLUSTER_SSL_PROTOCOLS;
-  private String ciphers = DistributionConfig.DEFAULT_CLUSTER_SSL_CIPHERS;
-  private boolean requireAuth = DistributionConfig.DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION;
-  private String keystore = DistributionConfig.DEFAULT_CLUSTER_SSL_KEYSTORE;
+  private boolean enabled = DistributionConfig.DEFAULT_SSL_ENABLED;
+  private String protocols = DistributionConfig.DEFAULT_SSL_PROTOCOLS;
+  private String ciphers = DistributionConfig.DEFAULT_SSL_CIPHERS;
+  private boolean requireAuth = DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION;
+  private String keystore = DistributionConfig.DEFAULT_SSL_KEYSTORE;
   private String keystoreType = DistributionConfig.DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE;
-  private String keystorePassword = DistributionConfig.DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD;
-  private String truststore = DistributionConfig.DEFAULT_CLUSTER_SSL_TRUSTSTORE;
-  private String truststorePassword = DistributionConfig.DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD;
+  private String keystorePassword = DistributionConfig.DEFAULT_SSL_KEYSTORE_PASSWORD;
+  private String truststore = DistributionConfig.DEFAULT_SSL_TRUSTSTORE;
+  private String truststorePassword = DistributionConfig.DEFAULT_SSL_TRUSTSTORE_PASSWORD;
   private String truststoreType = DistributionConfig.DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE;
   private String alias = null;
   private SSLEnabledComponent sslEnabledComponent = null;
@@ -171,20 +171,9 @@ public class SSLConfig {
     this.sslEnabledComponent = sslEnabledComponent;
   }
 
-  /**
-   * Returns a string representation of the object.
-   * @return a string representation of the object
-   */
   @Override
   public String toString() {
-    final StringBuffer sb = new StringBuffer("[SSLConfig: ");
-    sb.append("enabled=").append(this.enabled);
-    sb.append(", protocols=").append(this.protocols);
-    sb.append(", ciphers=").append(this.ciphers);
-    sb.append(", requireAuth=").append(this.requireAuth);
-    sb.append(", properties=").append(this.properties);
-    sb.append("]");
-    return sb.toString();
+    return "SSLConfig{" + "enabled=" + enabled + ", protocols='" + protocols + '\'' + ", ciphers='" + ciphers + '\'' + ", requireAuth=" + requireAuth + ", keystore='" + keystore + '\'' + ", keystoreType='" + keystoreType + '\'' + ", keystorePassword='" + keystorePassword + '\'' + ", truststore='" + truststore + '\'' + ", truststorePassword='" + truststorePassword + '\'' + ", truststoreType='" + truststoreType + '\'' + ", alias='" + alias + '\'' + ", sslEnabledComponent=" + sslEnabledComponent + ", properties=" + properties + '}';
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
index ba04933..4d032a3 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
@@ -70,6 +70,7 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
 import com.gemstone.gemfire.distributed.internal.*;
+import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.net.SocketCreator;
 import com.gemstone.gemfire.internal.SystemTimer;
 import com.gemstone.gemfire.internal.cache.BucketAdvisor;
@@ -383,9 +384,9 @@ public class AcceptorImpl extends Acceptor implements Runnable
     {
       if(!isGatewayReceiver) {
         //If configured use SSL properties for cache-server
-        this.socketCreator = SocketCreatorFactory.getServerSSLSocketCreator();
+        this.socketCreator = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.SERVER);
       } else {
-        this.socketCreator = SocketCreatorFactory.getGatewaySSLSocketCreator();
+        this.socketCreator = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.GATEWAY);
       }
       
       final GemFireCacheImpl gc;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java
index 04241c9..9873d03 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactory.java
@@ -64,16 +64,23 @@ public class SSLConfigurationFactory {
   private SSLConfig createSSLConfigForComponent(final SSLEnabledComponent sslEnabledComponent) {
     SSLConfig sslConfig = new SSLConfig();
     configureClusterSSL(sslConfig, sslEnabledComponent);
-    String[] sslEnabledComponents = distributionConfig.getSSLEnabledComponents();
+    SSLEnabledComponent[] sslEnabledComponents = distributionConfig.getSSLEnabledComponents();
+    if(sslEnabledComponents.length == 0)
+    {
+      sslConfig = configureLegacyClusterSSL(sslConfig);
+    }
     sslConfig.setSslEnabledComponent(sslEnabledComponent);
     switch (sslEnabledComponent) {
       case ALL: {
 
       }
       case CLUSTER: {
+        if (sslEnabledComponents.length > 0) {
+          sslConfig.setAlias(distributionConfig.getClusterSSLAlias());
+        }
         break;
       }
-      case LOCATOR:{
+      case LOCATOR: {
         if (sslEnabledComponents.length > 0) {
           sslConfig.setAlias(distributionConfig.getLocatorSSLAlias());
         }
@@ -117,8 +124,36 @@ public class SSLConfigurationFactory {
   }
 
   private void configureClusterSSL(final SSLConfig sslConfig, final SSLEnabledComponent sslEnabledComponent) {
-    sslConfig.setCiphers(distributionConfig.getClusterSSLCiphers());
+    sslConfig.setCiphers(distributionConfig.getSSLCiphers());
     sslConfig.setEnabled(determineIfSSLEnabledForSSLComponent(sslEnabledComponent));
+    sslConfig.setKeystore(distributionConfig.getSSLKeyStore());
+    sslConfig.setKeystorePassword(distributionConfig.getSSLKeyStorePassword());
+    sslConfig.setKeystoreType(distributionConfig.getSSLKeyStoreType());
+    sslConfig.setTruststore(distributionConfig.getSSLTrustStore());
+    sslConfig.setTruststorePassword(distributionConfig.getSSLTrustStorePassword());
+    sslConfig.setProtocols(distributionConfig.getSSLProtocols());
+    sslConfig.setRequireAuth(distributionConfig.getSSLRequireAuthentication());
+  }
+
+  private boolean determineIfSSLEnabledForSSLComponent(final SSLEnabledComponent sslEnabledComponent) {
+    if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), SSLEnabledComponent.NONE)) {
+      return false;
+    }
+    if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), SSLEnabledComponent.ALL)) {
+      return true;
+    }
+    return ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), sslEnabledComponent) ? true : false;
+  }
+
+  /**
+   * Configure a sslConfig for the cluster using the legacy configuration
+   * @return A sslConfig object describing the ssl config for the server component
+   *
+   * @deprecated as of Geode 1.0
+   */
+  private SSLConfig configureLegacyClusterSSL(SSLConfig sslConfig) {
+    sslConfig.setCiphers(distributionConfig.getClusterSSLCiphers());
+    sslConfig.setEnabled(distributionConfig.getClusterSSLEnabled());
     sslConfig.setKeystore(distributionConfig.getClusterSSLKeyStore());
     sslConfig.setKeystorePassword(distributionConfig.getClusterSSLKeyStorePassword());
     sslConfig.setKeystoreType(distributionConfig.getClusterSSLKeyStoreType());
@@ -126,17 +161,7 @@ public class SSLConfigurationFactory {
     sslConfig.setTruststorePassword(distributionConfig.getClusterSSLTrustStorePassword());
     sslConfig.setProtocols(distributionConfig.getClusterSSLProtocols());
     sslConfig.setRequireAuth(distributionConfig.getClusterSSLRequireAuthentication());
-    sslConfig.setAlias(distributionConfig.getClusterSSLAlias());
-  }
-
-  private boolean determineIfSSLEnabledForSSLComponent(final SSLEnabledComponent sslEnabledComponent) {
-    if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), SSLEnabledComponent.ALL.getConstant().toLowerCase())) {
-      return true;
-    }
-    if (distributionConfig.getSSLEnabledComponents().length == 0 && distributionConfig.getClusterSSLEnabled()) {
-      return true;
-    }
-    return ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), sslEnabledComponent.getConstant().toLowerCase()) ? true : false;
+    return sslConfig;
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java
index 88d8acd..fb9c776 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java
@@ -29,7 +29,7 @@ public enum SSLEnabledComponent {
   HTTP_SERVICE(SSLEnabledComponents.HTTP_SERVICE),
   GATEWAY(SSLEnabledComponents.GATEWAY),
   LOCATOR(SSLEnabledComponents.LOCATOR),
-  NONE("NO_COMPONENT");
+  NONE(SSLEnabledComponents.NONE);
 
   private String constant;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java
index ab398bb..507f162 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SocketCreatorFactory.java
@@ -32,7 +32,6 @@ import com.gemstone.gemfire.internal.admin.SSLConfig;
 public class SocketCreatorFactory {
 
   private static SocketCreatorFactory instance = null;
-  private static final String NON_SSL = "Non_SSL";
   private Map<SSLEnabledComponent, SocketCreator> socketCreators = new HashMap<>();
   private DistributionConfig distributionConfig;
 
@@ -46,7 +45,6 @@ public class SocketCreatorFactory {
       this.distributionConfig = distributionConfig;
     }
     SSLConfigurationFactory.setDistributionConfig(this.distributionConfig);
-    initialize();
   }
 
   private synchronized static SocketCreatorFactory getInstance(boolean closing) {
@@ -60,46 +58,18 @@ public class SocketCreatorFactory {
     return getInstance(false);
   }
 
-  private void initialize() {
-    //Hack... get a default cluster socket creator initialized
-    getClusterSSLSocketCreator();
-  }
-
   public static SocketCreator getSSLSocketCreatorForComponent(SSLEnabledComponent sslEnabledComponent) {
     SSLConfig sslConfigForComponent = SSLConfigurationFactory.getSSLConfigForComponent(sslEnabledComponent);
+    System.out.println("SocketCreatorFactory.getSSLSocketCreatorForComponent SSLEnabledComponent:"+sslEnabledComponent);
+    System.out.println("SocketCreatorFactory.getSSLSocketCreatorForComponent SSLEnabledComponent:"+sslConfigForComponent);
     return getInstance().getOrCreateSocketCreatorForSSLEnabledComponent(sslEnabledComponent, sslConfigForComponent);
   }
 
-  public static SocketCreator getClusterSSLSocketCreator() {
-    SSLConfig sslConfigForComponent = SSLConfigurationFactory.getSSLConfigForComponent(SSLEnabledComponent.CLUSTER);
-    return getInstance().getOrCreateSocketCreatorForSSLEnabledComponent(SSLEnabledComponent.CLUSTER, sslConfigForComponent);
-  }
-
-  public static SocketCreator getServerSSLSocketCreator() {
-    SSLConfig sslConfigForComponent = SSLConfigurationFactory.getSSLConfigForComponent(SSLEnabledComponent.SERVER);
-    return getInstance().getOrCreateSocketCreatorForSSLEnabledComponent(SSLEnabledComponent.SERVER, sslConfigForComponent);
-  }
-
-  public static SocketCreator getGatewaySSLSocketCreator() {
-    SSLConfig sslConfigForComponent = SSLConfigurationFactory.getSSLConfigForComponent(SSLEnabledComponent.GATEWAY);
-    return getInstance().getOrCreateSocketCreatorForSSLEnabledComponent(SSLEnabledComponent.GATEWAY, sslConfigForComponent);
-  }
-
-  public static SocketCreator getJMXManagerSSLSocketCreator() {
-    SSLConfig sslConfigForComponent = SSLConfigurationFactory.getSSLConfigForComponent(SSLEnabledComponent.JMX);
-    return getInstance().getOrCreateSocketCreatorForSSLEnabledComponent(SSLEnabledComponent.JMX, sslConfigForComponent);
-  }
-
-  public static SocketCreator getHTTPServiceSSLSocketCreator() {
-    SSLConfig sslConfigForComponent = SSLConfigurationFactory.getSSLConfigForComponent(SSLEnabledComponent.HTTP_SERVICE);
-    return getInstance().getOrCreateSocketCreatorForSSLEnabledComponent(SSLEnabledComponent.HTTP_SERVICE, sslConfigForComponent);
-  }
-
   private SocketCreator getSSLSocketCreator(final SSLEnabledComponent sslComponent, final DistributionConfig distributionConfig, final SSLConfig sslConfig) {
     if (sslConfig.isEnabled()) {
       if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), SSLEnabledComponents.ALL)) {
         return createSSLSocketCreator(SSLEnabledComponent.ALL, sslConfig);
-      } else if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), sslComponent.getConstant())) {
+      } else if (ArrayUtils.contains(distributionConfig.getSSLEnabledComponents(), sslComponent)) {
         return createSSLSocketCreator(sslComponent, sslConfig);
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
index 5307306..b473945 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
@@ -33,6 +33,7 @@ import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
 import com.gemstone.gemfire.internal.logging.log4j.AlertAppender;
 import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.net.SocketCreator;
 import com.gemstone.gemfire.internal.net.SocketCreatorFactory;
 import com.gemstone.gemfire.internal.tcp.MsgReader.Header;
@@ -1288,7 +1289,7 @@ public class Connection implements Runnable {
         // socket = javax.net.ssl.SSLSocketFactory.getDefault()
         //  .createSocket(remoteAddr.getInetAddress(), remoteAddr.getPort());
         int socketBufferSize = sharedResource ? SMALL_BUFFER_SIZE : this.owner.getConduit().tcpBufferSize;
-        this.socket = SocketCreatorFactory.getClusterSSLSocketCreator().connectForServer( remoteAddr.getInetAddress(), remoteAddr.getDirectChannelPort(), socketBufferSize );
+        this.socket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).connectForServer( remoteAddr.getInetAddress(), remoteAddr.getDirectChannelPort(), socketBufferSize );
         // Set the receive buffer size local fields. It has already been set in the socket.
         setSocketBufferSize(this.socket, false, socketBufferSize, true);
         setSendBufferSize(this.socket);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
index 243a2cb..d5e2c16 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/TCPConduit.java
@@ -60,6 +60,7 @@ import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
 import com.gemstone.gemfire.internal.logging.log4j.AlertAppender;
 import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.net.SocketCreator;
 import com.gemstone.gemfire.internal.net.SocketCreatorFactory;
 
@@ -422,19 +423,19 @@ public class TCPConduit implements Runnable {
   private void createServerSocket() {
     int p = this.port;
     int b = BACKLOG;
-    InetAddress ba = this.address;
+    InetAddress bindAddress = this.address;
 
     try {
       if (this.useNIO) {
         if (p <= 0) {
 
-          socket = SocketCreatorFactory.getClusterSSLSocketCreator().createServerSocketUsingPortRange(ba, b, isBindAddress, this.useNIO, 0, tcpPortRange);
+          socket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).createServerSocketUsingPortRange(bindAddress, b, isBindAddress, this.useNIO, 0, tcpPortRange);
         } else {
-          ServerSocketChannel channl = ServerSocketChannel.open();
-          socket = channl.socket();
+          ServerSocketChannel channel = ServerSocketChannel.open();
+          socket = channel.socket();
 
-          InetSocketAddress addr = new InetSocketAddress(isBindAddress ? ba : null, p);
-          socket.bind(addr, b);
+          InetSocketAddress inetSocketAddress = new InetSocketAddress(isBindAddress ? bindAddress : null, p);
+          socket.bind(inetSocketAddress, b);
         }
 
         if (useNIO) {
@@ -458,10 +459,10 @@ public class TCPConduit implements Runnable {
       } else {
         try {
           if (p <= 0) {
-            socket = SocketCreatorFactory.getClusterSSLSocketCreator()
-                                         .createServerSocketUsingPortRange(ba, b, isBindAddress, this.useNIO, this.tcpBufferSize, tcpPortRange);
+            socket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER)
+                                         .createServerSocketUsingPortRange(bindAddress, b, isBindAddress, this.useNIO, this.tcpBufferSize, tcpPortRange);
           } else {
-            socket = SocketCreatorFactory.getClusterSSLSocketCreator().createServerSocket(p, b, isBindAddress ? ba : null, this.tcpBufferSize);
+            socket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).createServerSocket(p, b, isBindAddress ? bindAddress : null, this.tcpBufferSize);
           }
           int newSize = socket.getReceiveBufferSize();
           if (newSize != this.tcpBufferSize) {
@@ -478,7 +479,7 @@ public class TCPConduit implements Runnable {
       }
       port = socket.getLocalPort();
     } catch (IOException io) {
-      throw new ConnectionException(LocalizedStrings.TCPConduit_EXCEPTION_CREATING_SERVERSOCKET.toLocalizedString(new Object[] { Integer.valueOf(p), ba }), io);
+      throw new ConnectionException(LocalizedStrings.TCPConduit_EXCEPTION_CREATING_SERVERSOCKET.toLocalizedString(new Object[] { Integer.valueOf(p), bindAddress }), io);
     }
   }
 
@@ -655,7 +656,7 @@ public class TCPConduit implements Runnable {
             logger.warn(LocalizedMessage.create(LocalizedStrings.TCPConduit_STOPPING_P2P_LISTENER_DUE_TO_SSL_CONFIGURATION_PROBLEM), ex);
             break;
           }
-          SocketCreatorFactory.getClusterSSLSocketCreator().configureServerSSLSocket(othersock);
+          SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).configureServerSSLSocket(othersock);
         }
         if (stopped) {
           try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
index 7ed5cc2..89d3074 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
@@ -351,7 +351,7 @@ public class ManagementAgent {
       bindAddr = InetAddress.getByName(hostname);
     }
 
-    final SocketCreator socketCreator = SocketCreatorFactory.getJMXManagerSSLSocketCreator();
+    final SocketCreator socketCreator = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.JMX);
 
     final boolean ssl = socketCreator.useSSL();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
index 3131dd4..6d524ef 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/CacheServerSSLConnectionDUnitTest.java
@@ -110,20 +110,33 @@ public class CacheServerSSLConnectionDUnitTest extends JUnit4DistributedTestCase
     String cacheServerSslprotocols = "any";
     String cacheServerSslciphers = "any";
     boolean cacheServerSslRequireAuth = true;
-    gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(cacheServerSslenabled));
-    gemFireProps.put(CLUSTER_SSL_PROTOCOLS, cacheServerSslprotocols);
-    gemFireProps.put(CLUSTER_SSL_CIPHERS, cacheServerSslciphers);
-    gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(cacheServerSslRequireAuth));
-
-    String keyStore = TestUtil.getResourcePath(CacheServerSSLConnectionDUnitTest.class, SERVER_KEY_STORE);
-    String trustStore = TestUtil.getResourcePath(CacheServerSSLConnectionDUnitTest.class, SERVER_TRUST_STORE);
-    gemFireProps.put(CLUSTER_SSL_KEYSTORE_TYPE, "jks");
-    gemFireProps.put(CLUSTER_SSL_KEYSTORE, keyStore);
-    gemFireProps.put(CLUSTER_SSL_KEYSTORE_PASSWORD, "password");
-    gemFireProps.put(CLUSTER_SSL_TRUSTSTORE, trustStore);
-    gemFireProps.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "password");
     if (!legacy) {
       gemFireProps.put(SSL_ENABLED_COMPONENTS, SSLEnabledComponent.CLUSTER+","+SSLEnabledComponent.SERVER);
+      gemFireProps.put(SSL_PROTOCOLS, cacheServerSslprotocols);
+      gemFireProps.put(SSL_CIPHERS, cacheServerSslciphers);
+      gemFireProps.put(SSL_REQUIRE_AUTHENTICATION, String.valueOf(cacheServerSslRequireAuth));
+
+      String keyStore = TestUtil.getResourcePath(CacheServerSSLConnectionDUnitTest.class, SERVER_KEY_STORE);
+      String trustStore = TestUtil.getResourcePath(CacheServerSSLConnectionDUnitTest.class, SERVER_TRUST_STORE);
+      gemFireProps.put(SSL_KEYSTORE_TYPE, "jks");
+      gemFireProps.put(SSL_KEYSTORE, keyStore);
+      gemFireProps.put(SSL_KEYSTORE_PASSWORD, "password");
+      gemFireProps.put(SSL_TRUSTSTORE, trustStore);
+      gemFireProps.put(SSL_TRUSTSTORE_PASSWORD, "password");
+    }
+    else{
+      gemFireProps.put(CLUSTER_SSL_ENABLED, String.valueOf(cacheServerSslenabled));
+      gemFireProps.put(CLUSTER_SSL_PROTOCOLS, cacheServerSslprotocols);
+      gemFireProps.put(CLUSTER_SSL_CIPHERS, cacheServerSslciphers);
+      gemFireProps.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(cacheServerSslRequireAuth));
+
+      String keyStore = TestUtil.getResourcePath(CacheServerSSLConnectionDUnitTest.class, SERVER_KEY_STORE);
+      String trustStore = TestUtil.getResourcePath(CacheServerSSLConnectionDUnitTest.class, SERVER_TRUST_STORE);
+      gemFireProps.put(CLUSTER_SSL_KEYSTORE_TYPE, "jks");
+      gemFireProps.put(CLUSTER_SSL_KEYSTORE, keyStore);
+      gemFireProps.put(CLUSTER_SSL_KEYSTORE_PASSWORD, "password");
+      gemFireProps.put(CLUSTER_SSL_TRUSTSTORE, trustStore);
+      gemFireProps.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "password");
     }
     StringWriter sw = new StringWriter();
     PrintWriter writer = new PrintWriter(sw);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
index 37b8f2f..e30a017 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorDUnitTest.java
@@ -659,6 +659,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
     try {
       loc1.invoke("start Locator1", () -> startLocator(port1, properties));
+      loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(1));
       properties.put(CLUSTER_SSL_ENABLED, "false");
       properties.remove(SSL_ENABLED_COMPONENTS);
 
@@ -784,6 +785,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
     try {
       loc1.invoke("start Locator1", () -> startLocator(port1, properties));
+      loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(1));
 
       properties.put(CLUSTER_SSL_KEYSTORE, getMultiKeyKeystore());
       properties.put(CLUSTER_SSL_TRUSTSTORE, getMultiKeyTruststore());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
index 01c76f0..48778f3 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java
@@ -21,6 +21,7 @@ import com.gemstone.gemfire.distributed.LocatorLauncher.Builder;
 import com.gemstone.gemfire.distributed.LocatorLauncher.LocatorState;
 import com.gemstone.gemfire.distributed.internal.InternalLocator;
 import com.gemstone.gemfire.internal.*;
+import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.net.SocketCreator;
 import com.gemstone.gemfire.internal.net.SocketCreatorFactory;
 import com.gemstone.gemfire.internal.process.ProcessControllerFactory;
@@ -327,7 +328,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
       return;
     }
 
-    this.socket = SocketCreatorFactory.getClusterSSLSocketCreator().createServerSocket(this.locatorPort, 50, null, -1);
+    this.socket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).createServerSocket(this.locatorPort, 50, null, -1);
     assertTrue(this.socket.isBound());
     assertFalse(this.socket.isClosed());
     assertFalse(AvailablePort.isPortAvailable(this.locatorPort, AvailablePort.SOCKET));
@@ -544,7 +545,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher
     }
 
     // generate one free port and then use it instead of default
-    this.socket = SocketCreatorFactory.getClusterSSLSocketCreator().createServerSocket(this.locatorPort, 50, null, -1);
+    this.socket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).createServerSocket(this.locatorPort, 50, null, -1);
     
     this.launcher = new Builder()
         .setMemberName(getUniqueName())

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f7424db6/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
index a2ae73d..a94f6bd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteIntegrationTest.java
@@ -24,6 +24,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.DistributionLocator;
 import com.gemstone.gemfire.internal.GemFireVersion;
+import com.gemstone.gemfire.internal.net.SSLEnabledComponent;
 import com.gemstone.gemfire.internal.net.SocketCreator;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.logging.LocalLogWriter;
@@ -400,7 +401,7 @@ public class LocatorLauncherRemoteIntegrationTest extends AbstractLocatorLaunche
 
   @Test
   public void testStartUsingPortInUseFails() throws Throwable {
-    this.socket = SocketCreatorFactory.getClusterSSLSocketCreator().createServerSocket(this.locatorPort, 50, null, -1);
+    this.socket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).createServerSocket(this.locatorPort, 50, null, -1);
     this.locatorPort = this.socket.getLocalPort();
 
     final List<String> jvmArguments = getJvmArguments();
@@ -472,7 +473,7 @@ public class LocatorLauncherRemoteIntegrationTest extends AbstractLocatorLaunche
     String expectedString = "java.net.BindException";
     AtomicBoolean outputContainedExpectedString = new AtomicBoolean();
 
-    this.socket = SocketCreatorFactory.getClusterSSLSocketCreator().createServerSocket(this.locatorPort, 50, null, -1);
+    this.socket = SocketCreatorFactory.getSSLSocketCreatorForComponent(SSLEnabledComponent.CLUSTER).createServerSocket(this.locatorPort, 50, null, -1);
     this.locatorPort = this.socket.getLocalPort();
 
     assertFalse(AvailablePort.isPortAvailable(this.locatorPort, AvailablePort.SOCKET));



Mime
View raw message