You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/06/15 16:18:05 UTC
[32/33] incubator-geode git commit: GEODE-420: Initial Alias
defintion and removal of deprecated SSL-ENABLED properties
GEODE-420: Initial Alias defintion and removal of deprecated SSL-ENABLED properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f71350a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f71350a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f71350a1
Branch: refs/heads/feature/GEODE-420
Commit: f71350a150f7ac90a6f3706bbcda97f5cecb23b1
Parents: 0f2bb8f
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue Jun 14 08:41:09 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 16 02:17:16 2016 +1000
----------------------------------------------------------------------
.../gemfire/admin/DistributedSystemConfig.java | 28 -
.../internal/DistributedSystemConfigImpl.java | 24 +-
.../EnabledManagedEntityController.java | 8 +-
.../admin/jmx/internal/AgentConfigImpl.java | 501 ++--
.../jmx/internal/MX4JServerSocketFactory.java | 4 +-
.../distributed/ConfigurationProperties.java | 170 +-
.../internal/AbstractDistributionConfig.java | 39 +-
.../internal/DistributionConfig.java | 553 ++--
.../internal/DistributionConfigImpl.java | 2596 +++++++++---------
.../gemfire/internal/AbstractConfig.java | 15 +-
.../gemfire/internal/admin/SSLConfig.java | 16 +-
.../gemfire/management/GemFireProperties.java | 108 +-
.../internal/beans/BeanUtilFuncs.java | 125 +-
.../internal/cli/commands/ShellCommands.java | 6 +-
.../internal/cli/shell/JmxOperationInvoker.java | 156 +-
.../InternalDistributedSystemJUnitTest.java | 6 +-
.../internal/AbstractConfigJUnitTest.java | 1 -
.../gemfire/internal/JSSESocketJUnitTest.java | 10 +-
.../gemfire/internal/SSLConfigJUnitTest.java | 240 +-
.../management/CacheManagementDUnitTest.java | 386 +--
...ersalMembershipListenerAdapterDUnitTest.java | 16 +-
.../HTTPServiceSSLSupportJUnitTest.java | 12 +-
.../generator/SSLCredentialGenerator.java | 8 +-
23 files changed, 2405 insertions(+), 2623 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
index 5ef389f..17600bc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
@@ -189,34 +189,6 @@ public interface DistributedSystemConfig extends Cloneable {
String DEFAULT_REMOTE_COMMAND =
"rsh -n {HOST} {CMD}";
- /** The name of the "SSLEnabled" property */
- String SSL_ENABLED_NAME = SSL_ENABLED;
-
- /** The default ssl-enabled state (<code>false</code>) */
- boolean DEFAULT_SSL_ENABLED =
- DistributionConfig.DEFAULT_SSL_ENABLED;
-
- /** The name of the "SSLProtocols" property */
- String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS;
-
- /** The default ssl-protocols value (<code>any</code>) */
- String DEFAULT_SSL_PROTOCOLS =
- DistributionConfig.DEFAULT_SSL_PROTOCOLS;
-
- /** The name of the "SSLCiphers" property */
- String SSL_CIPHERS_NAME = SSL_CIPHERS;
-
- /** The default ssl-ciphers value. (<code>any</code>) */
- String DEFAULT_SSL_CIPHERS =
- DistributionConfig.DEFAULT_SSL_CIPHERS;
-
- /** The name of the "SSLRequireAuthentication" property */
- String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION;
-
- /** The default ssl-require-authentication value (<code>true</code>) */
- boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION =
- DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION;
-
/** The default disable-tcp value (<code>false</code>) */
boolean DEFAULT_DISABLE_TCP = DistributionConfig.DEFAULT_DISABLE_TCP;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
index 517f5a6..8f65506 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
@@ -160,10 +160,10 @@ public class DistributedSystemConfigImpl
this.systemName = distConfig.getName();
- this.sslEnabled = distConfig.getSSLEnabled();
- this.sslCiphers = distConfig.getSSLCiphers();
- this.sslProtocols = distConfig.getSSLProtocols();
- this.sslAuthenticationRequired = distConfig.getSSLRequireAuthentication();
+ this.sslEnabled = distConfig.getClusterSSLEnabled();
+ this.sslCiphers = distConfig.getClusterSSLCiphers();
+ this.sslProtocols = distConfig.getClusterSSLProtocols();
+ this.sslAuthenticationRequired = distConfig.getClusterSSLRequireAuthentication();
this.logFile = distConfig.getLogFile().getPath();
this.logLevel =
@@ -857,13 +857,13 @@ public class DistributedSystemConfigImpl
// SSL support...
// -------------------------------------------------------------------------
private boolean sslEnabled =
- DistributionConfig.DEFAULT_SSL_ENABLED;
+ DistributionConfig.DEFAULT_CLUSTER_SSL_ENABLED;
private String sslProtocols =
- DistributionConfig.DEFAULT_SSL_PROTOCOLS;
+ DistributionConfig.DEFAULT_CLUSTER_SSL_PROTOCOLS;
private String sslCiphers =
- DistributionConfig.DEFAULT_SSL_CIPHERS;
+ DistributionConfig.DEFAULT_CLUSTER_SSL_CIPHERS;
private boolean sslAuthenticationRequired =
- DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION;
+ DistributionConfig.DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION;
private Properties sslProperties = new Properties();
public boolean isSSLEnabled() {
@@ -1097,16 +1097,16 @@ public class DistributedSystemConfigImpl
buf.append(" " + REMOTE_COMMAND_NAME + "=");
buf.append(String.valueOf(this.remoteCommand));
buf.append(lf);
- buf.append(" " + SSL_ENABLED + "=");
+ buf.append(" " + CLUSTER_SSL_ENABLED + "=");
buf.append(String.valueOf(this.sslEnabled));
buf.append(lf);
- buf.append(" " + SSL_CIPHERS_NAME + "=");
+ buf.append(" " + CLUSTER_SSL_CIPHERS + "=");
buf.append(String.valueOf(this.sslCiphers));
buf.append(lf);
- buf.append(" " + SSL_PROTOCOLS_NAME + "=");
+ buf.append(" " + CLUSTER_SSL_PROTOCOLS + "=");
buf.append(String.valueOf(this.sslProtocols));
buf.append(lf);
- buf.append(" " + SSL_REQUIRE_AUTHENTICATION_NAME + "=");
+ buf.append(" " + CLUSTER_SSL_REQUIRE_AUTHENTICATION + "=");
buf.append(String.valueOf(this.sslAuthenticationRequired));
buf.append(lf);
buf.append(" " + LOG_FILE_NAME + "=");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
index ff139c5..465d7ae 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java
@@ -318,16 +318,16 @@ class EnabledManagedEntityController implements ManagedEntityController {
MCAST_PORT,
"0");
sslProps.setProperty(prefix +
- SSL_ENABLED,
+ CLUSTER_SSL_ENABLED,
String.valueOf(config.isSSLEnabled()));
sslProps.setProperty(prefix +
- SSL_CIPHERS,
+ CLUSTER_SSL_CIPHERS,
config.getSSLCiphers());
sslProps.setProperty(prefix +
- SSL_PROTOCOLS,
+ CLUSTER_SSL_PROTOCOLS,
config.getSSLProtocols());
sslProps.setProperty(prefix +
- SSL_REQUIRE_AUTHENTICATION,
+ CLUSTER_SSL_REQUIRE_AUTHENTICATION,
String.valueOf(config.isSSLAuthenticationRequired()));
return sslProps;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
index 6c24816..665a78b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java
@@ -16,6 +16,22 @@
*/
package com.gemstone.gemfire.admin.jmx.internal;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.InetAddress;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
import com.gemstone.gemfire.GemFireIOException;
import com.gemstone.gemfire.admin.DistributedSystemConfig;
import com.gemstone.gemfire.admin.DistributionLocatorConfig;
@@ -27,16 +43,6 @@ import com.gemstone.gemfire.internal.ClassPathLoader;
import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.util.IOUtils;
-import java.io.*;
-import java.net.InetAddress;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.StringTokenizer;
-
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-
/**
* Provides the JMX Agent configuration properties.
* <p>
@@ -47,11 +53,9 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
* remarks on individual properties for further information.
* <p>
* Extends and implements DistributedSystemConfig.
- *
* @since GemFire 3.5 (in which it was named AgentConfig)
*/
-public class AgentConfigImpl extends DistributedSystemConfigImpl
- implements AgentConfig {
+public class AgentConfigImpl extends DistributedSystemConfigImpl implements AgentConfig {
// -------------------------------------------------------------------------
// Static class variable(s)
@@ -79,38 +83,31 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* The name of the "locator.host-" property
*/
- public static final String LOCATOR_HOST_NAME =
- "locator.host-";
+ public static final String LOCATOR_HOST_NAME = "locator.host-";
/**
* The name of the "locator.port-" property
*/
- public static final String LOCATOR_PORT_NAME =
- "locator.port-";
+ public static final String LOCATOR_PORT_NAME = "locator.port-";
/**
* The name of the "locator.product-directory-" property
*/
- public static final String LOCATOR_PRODUCT_DIRECTORY_NAME =
- "locator.product-directory-";
+ public static final String LOCATOR_PRODUCT_DIRECTORY_NAME = "locator.product-directory-";
/**
* The name of the "locator.working-directory-" property
*/
- public static final String LOCATOR_WORKING_DIRECTORY_NAME =
- "locator.working-directory-";
+ public static final String LOCATOR_WORKING_DIRECTORY_NAME = "locator.working-directory-";
/**
* The name of the "locator.remote-command-" property
*/
- public static final String LOCATOR_REMOTE_COMMAND =
- "locator.remote-command-";
+ public static final String LOCATOR_REMOTE_COMMAND = "locator.remote-command-";
/**
* The name of the "locator.bind-address-" property
*/
- public static final String LOCATOR_BIND_ADDRESS =
- "locator.bind-address-";
+ public static final String LOCATOR_BIND_ADDRESS = "locator.bind-address-";
/**
* the properties used in configuring a locator's distributed system
*/
- public static final String LOCATOR_DS_PROPERTIES =
- "locator.ds-properties";
+ public static final String LOCATOR_DS_PROPERTIES = "locator.ds-properties";
/**
* The default log file for stand-alone JMX agents
@@ -157,48 +154,29 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
private static Properties getDefaultProperties() {
Properties props = new Properties();
- props.setProperty(AUTO_CONNECT_NAME,
- String.valueOf(DEFAULT_AUTO_CONNECT));
-
- props.setProperty(HTTP_ENABLED_NAME,
- String.valueOf(DEFAULT_HTTP_ENABLED));
- props.setProperty(HTTP_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_HTTP_BIND_ADDRESS));
- props.setProperty(HTTP_PORT_NAME,
- String.valueOf(DEFAULT_HTTP_PORT));
- props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
- props.setProperty(HTTP_AUTHENTICATION_USER_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
- props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
-
- props.setProperty(RMI_ENABLED_NAME,
- String.valueOf(DEFAULT_RMI_ENABLED));
- props.setProperty(RMI_REGISTRY_ENABLED_NAME,
- String.valueOf(DEFAULT_RMI_REGISTRY_ENABLED));
- props.setProperty(RMI_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_RMI_BIND_ADDRESS));
- props.setProperty(RMI_PORT_NAME,
- String.valueOf(DEFAULT_RMI_PORT));
- props.setProperty(RMI_SERVER_PORT_NAME,
- String.valueOf(DEFAULT_RMI_SERVER_PORT));
-
- props.setProperty(SNMP_ENABLED_NAME,
- String.valueOf(DEFAULT_SNMP_ENABLED));
- props.setProperty(SNMP_DIRECTORY_NAME,
- String.valueOf(DEFAULT_SNMP_DIRECTORY));
-
- props.setProperty(AGENT_SSL_ENABLED_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_ENABLED));
- props.setProperty(AGENT_SSL_PROTOCOLS_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_PROTOCOLS));
- props.setProperty(AGENT_SSL_CIPHERS_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
- props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(AUTO_CONNECT_NAME, String.valueOf(DEFAULT_AUTO_CONNECT));
+
+ props.setProperty(HTTP_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_ENABLED));
+ props.setProperty(HTTP_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_HTTP_BIND_ADDRESS));
+ props.setProperty(HTTP_PORT_NAME, String.valueOf(DEFAULT_HTTP_PORT));
+ props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
+ props.setProperty(HTTP_AUTHENTICATION_USER_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
+ props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
+
+ props.setProperty(RMI_ENABLED_NAME, String.valueOf(DEFAULT_RMI_ENABLED));
+ props.setProperty(RMI_REGISTRY_ENABLED_NAME, String.valueOf(DEFAULT_RMI_REGISTRY_ENABLED));
+ props.setProperty(RMI_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_RMI_BIND_ADDRESS));
+ props.setProperty(RMI_PORT_NAME, String.valueOf(DEFAULT_RMI_PORT));
+ props.setProperty(RMI_SERVER_PORT_NAME, String.valueOf(DEFAULT_RMI_SERVER_PORT));
+
+ props.setProperty(SNMP_ENABLED_NAME, String.valueOf(DEFAULT_SNMP_ENABLED));
+ props.setProperty(SNMP_DIRECTORY_NAME, String.valueOf(DEFAULT_SNMP_DIRECTORY));
+
+ props.setProperty(AGENT_SSL_ENABLED_NAME, String.valueOf(DEFAULT_AGENT_SSL_ENABLED));
+ props.setProperty(AGENT_SSL_PROTOCOLS_NAME, String.valueOf(DEFAULT_AGENT_SSL_PROTOCOLS));
+ props.setProperty(AGENT_SSL_CIPHERS_NAME, String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
+ props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
return props;
}
@@ -206,131 +184,90 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Returns default values for all valid agent properties as a Properties
* object.
- *
* @return default values for all valid agent properties
*/
static Properties getDefaultValuesForAllProperties() {
Properties props = new Properties();
- props.setProperty(AUTO_CONNECT_NAME,
- String.valueOf(DEFAULT_AUTO_CONNECT));
+ props.setProperty(AUTO_CONNECT_NAME, String.valueOf(DEFAULT_AUTO_CONNECT));
- props.setProperty(HTTP_ENABLED_NAME,
- String.valueOf(DEFAULT_HTTP_ENABLED));
+ props.setProperty(HTTP_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_ENABLED));
- props.setProperty(HTTP_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_HTTP_BIND_ADDRESS));
+ props.setProperty(HTTP_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_HTTP_BIND_ADDRESS));
- props.setProperty(HTTP_PORT_NAME,
- String.valueOf(DEFAULT_HTTP_PORT));
+ props.setProperty(HTTP_PORT_NAME, String.valueOf(DEFAULT_HTTP_PORT));
- props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
+ props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
- props.setProperty(HTTP_AUTHENTICATION_USER_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
+ props.setProperty(HTTP_AUTHENTICATION_USER_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
- props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME,
- String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
+ props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
- props.setProperty(RMI_ENABLED_NAME,
- String.valueOf(DEFAULT_RMI_ENABLED));
+ props.setProperty(RMI_ENABLED_NAME, String.valueOf(DEFAULT_RMI_ENABLED));
- props.setProperty(RMI_REGISTRY_ENABLED_NAME,
- String.valueOf(DEFAULT_RMI_REGISTRY_ENABLED));
+ props.setProperty(RMI_REGISTRY_ENABLED_NAME, String.valueOf(DEFAULT_RMI_REGISTRY_ENABLED));
- props.setProperty(RMI_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_RMI_BIND_ADDRESS));
+ props.setProperty(RMI_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_RMI_BIND_ADDRESS));
- props.setProperty(RMI_PORT_NAME,
- String.valueOf(DEFAULT_RMI_PORT));
+ props.setProperty(RMI_PORT_NAME, String.valueOf(DEFAULT_RMI_PORT));
- props.setProperty(RMI_SERVER_PORT_NAME,
- String.valueOf(DEFAULT_RMI_SERVER_PORT));
+ props.setProperty(RMI_SERVER_PORT_NAME, String.valueOf(DEFAULT_RMI_SERVER_PORT));
- props.setProperty(SNMP_ENABLED_NAME,
- String.valueOf(DEFAULT_SNMP_ENABLED));
+ props.setProperty(SNMP_ENABLED_NAME, String.valueOf(DEFAULT_SNMP_ENABLED));
- props.setProperty(SNMP_DIRECTORY_NAME,
- String.valueOf(DEFAULT_SNMP_DIRECTORY));
+ props.setProperty(SNMP_DIRECTORY_NAME, String.valueOf(DEFAULT_SNMP_DIRECTORY));
- props.setProperty(AGENT_SSL_ENABLED_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_ENABLED));
+ props.setProperty(AGENT_SSL_ENABLED_NAME, String.valueOf(DEFAULT_AGENT_SSL_ENABLED));
- props.setProperty(AGENT_SSL_PROTOCOLS_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_PROTOCOLS));
+ props.setProperty(AGENT_SSL_PROTOCOLS_NAME, String.valueOf(DEFAULT_AGENT_SSL_PROTOCOLS));
- props.setProperty(AGENT_SSL_CIPHERS_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
+ props.setProperty(AGENT_SSL_CIPHERS_NAME, String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
- props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(SNMP_BIND_ADDRESS_NAME,
- String.valueOf(DEFAULT_SNMP_BIND_ADDRESS));
+ props.setProperty(SNMP_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_SNMP_BIND_ADDRESS));
- props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME,
- String.valueOf(DEFAULT_EMAIL_NOTIFICATIONS_ENABLED));
+ props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME, String.valueOf(DEFAULT_EMAIL_NOTIFICATIONS_ENABLED));
- props.setProperty(EMAIL_NOTIFICATIONS_HOST_NAME,
- String.valueOf(DEFAULT_EMAIL_HOST));
+ props.setProperty(EMAIL_NOTIFICATIONS_HOST_NAME, String.valueOf(DEFAULT_EMAIL_HOST));
- props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME,
- String.valueOf(DEFAULT_EMAIL_FROM));
+ props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME, String.valueOf(DEFAULT_EMAIL_FROM));
- props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME,
- String.valueOf(DEFAULT_EMAIL_TO_LIST));
+ props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME, String.valueOf(DEFAULT_EMAIL_TO_LIST));
- props.setProperty(STATE_SAVE_FILE_NAME,
- String.valueOf(DEFAULT_STATE_SAVE_FILE));
+ props.setProperty(STATE_SAVE_FILE_NAME, String.valueOf(DEFAULT_STATE_SAVE_FILE));
- props.setProperty(SSL_ENABLED,
- String.valueOf(DEFAULT_SSL_ENABLED));
+ props.setProperty(CLUSTER_SSL_ENABLED, String.valueOf(DEFAULT_CLUSTER_SSL_ENABLED));
- props.setProperty(SSL_PROTOCOLS_NAME,
- String.valueOf(DEFAULT_SSL_PROTOCOLS));
+ props.setProperty(CLUSTER_SSL_PROTOCOLS, String.valueOf(DEFAULT_CLUSTER_SSL_PROTOCOLS));
- props.setProperty(SSL_CIPHERS_NAME,
- String.valueOf(DEFAULT_SSL_CIPHERS));
+ props.setProperty(CLUSTER_SSL_CIPHERS, String.valueOf(DEFAULT_CLUSTER_SSL_CIPHERS));
- props.setProperty(SSL_REQUIRE_AUTHENTICATION_NAME,
- String.valueOf(DEFAULT_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(ENTITY_CONFIG_XML_FILE_NAME,
- String.valueOf(DEFAULT_ENTITY_CONFIG_XML_FILE));
+ props.setProperty(ENTITY_CONFIG_XML_FILE_NAME, String.valueOf(DEFAULT_ENTITY_CONFIG_XML_FILE));
- props.setProperty(MCAST_PORT,
- String.valueOf(DEFAULT_MCAST_PORT));
+ props.setProperty(MCAST_PORT, String.valueOf(DEFAULT_MCAST_PORT));
- props.setProperty(MCAST_ADDRESS,
- String.valueOf(DEFAULT_MCAST_ADDRESS));
+ props.setProperty(MCAST_ADDRESS, String.valueOf(DEFAULT_MCAST_ADDRESS));
- props.setProperty(LOCATORS,
- String.valueOf(DEFAULT_LOCATORS));
+ props.setProperty(LOCATORS, String.valueOf(DEFAULT_LOCATORS));
- props.setProperty(BIND_ADDRESS,
- String.valueOf(DEFAULT_BIND_ADDRESS));
+ props.setProperty(BIND_ADDRESS, String.valueOf(DEFAULT_BIND_ADDRESS));
- props.setProperty(REMOTE_COMMAND_NAME,
- String.valueOf(DEFAULT_REMOTE_COMMAND));
+ props.setProperty(REMOTE_COMMAND_NAME, String.valueOf(DEFAULT_REMOTE_COMMAND));
- props.setProperty(LOG_FILE_NAME,
- String.valueOf(DEFAULT_LOG_FILE));
+ props.setProperty(LOG_FILE_NAME, String.valueOf(DEFAULT_LOG_FILE));
- props.setProperty(LOG_LEVEL_NAME,
- String.valueOf(DEFAULT_LOG_LEVEL));
+ props.setProperty(LOG_LEVEL_NAME, String.valueOf(DEFAULT_LOG_LEVEL));
- props.setProperty(LOG_DISK_SPACE_LIMIT_NAME,
- String.valueOf(DEFAULT_LOG_DISK_SPACE_LIMIT));
+ props.setProperty(LOG_DISK_SPACE_LIMIT_NAME, String.valueOf(DEFAULT_LOG_DISK_SPACE_LIMIT));
- props.setProperty(LOG_FILE_SIZE_LIMIT_NAME,
- String.valueOf(DEFAULT_LOG_FILE_SIZE_LIMIT));
+ props.setProperty(LOG_FILE_SIZE_LIMIT_NAME, String.valueOf(DEFAULT_LOG_FILE_SIZE_LIMIT));
- props.setProperty(REFRESH_INTERVAL_NAME,
- String.valueOf(DEFAULT_REFRESH_INTERVAL));
+ props.setProperty(REFRESH_INTERVAL_NAME, String.valueOf(DEFAULT_REFRESH_INTERVAL));
return props;
@@ -500,7 +437,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Constructs new instance of AgentConfig. Supplied command-line arguments
* are used to create a set of non-default properties for initializing this
* AgentConfig.
- *
* @param args array of non-default configuration arguments
*/
public AgentConfigImpl(String[] args) {
@@ -511,7 +447,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Creates a new <code>AgentConfig</code> with the given non-default
* configuration properties.
- *
* @param props overriding non-default configuration properties
*/
public AgentConfigImpl(Properties props) {
@@ -526,7 +461,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Constructs new instance of AgentConfig using the specified property file.
- *
* @param propFile the file to load configuration properties from
*/
public AgentConfigImpl(File propFile) {
@@ -562,14 +496,12 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Checks to see if this config object is "read only". If it is,
* then an {@link IllegalStateException} is thrown.
- *
* @since GemFire 4.0
*/
@Override
protected void checkReadOnly() {
if (this.agent != null) {
- throw new IllegalStateException(
- LocalizedStrings.AgentConfigImpl_AN_AGENTCONFIG_OBJECT_CANNOT_BE_MODIFIED_AFTER_IT_HAS_BEEN_USED_TO_CREATE_AN_AGENT.toLocalizedString());
+ throw new IllegalStateException(LocalizedStrings.AgentConfigImpl_AN_AGENTCONFIG_OBJECT_CANNOT_BE_MODIFIED_AFTER_IT_HAS_BEEN_USED_TO_CREATE_AN_AGENT.toLocalizedString());
}
super.checkReadOnly();
@@ -591,8 +523,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
if (this.url == null) {
return LocalizedStrings.AgentConfigImpl_USING_DEFAULT_CONFIGURATION_BECAUSE_PROPERTY_FILE_WAS_FOUND.toLocalizedString();
} else {
- return LocalizedStrings.AgentConfigImpl_CONFIGURATION_LOADED_FROM_0
- .toLocalizedString(this.url);
+ return LocalizedStrings.AgentConfigImpl_CONFIGURATION_LOADED_FROM_0.toLocalizedString(this.url);
}
}
@@ -606,8 +537,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
f = new File(retrievePropertyFile());
if (!f.isAbsolute()) {
// save to <cwd>/propertyFile
- f = new File(System.getProperty("user.dir"),
- retrievePropertyFile());
+ f = new File(System.getProperty("user.dir"), retrievePropertyFile());
}
} else {
f = new File(this.url.getFile());
@@ -618,7 +548,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Converts the contents of this config to a property instance and Stringifies
* it
- *
* @return contents of this config as String
*/
public String toPropertiesAsString() {
@@ -640,7 +569,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Converts the contents of this config to a property instance.
- *
* @return contents of this config as java.util.Properties
*/
public Properties toProperties() {
@@ -649,9 +577,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Converts the contents of this config to a property instance.
- *
* @param includeDSProperties Should distributed system properties be included in the
- * <code>Properties</code> object? See bug 32682.
+ * <code>Properties</code> object? See bug 32682.
+ *
* @return contents of this config as java.util.Properties
*/
public Properties toProperties(boolean includeDSProperties) {
@@ -695,10 +623,10 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME, toString(EMAIL_NOTIFICATIONS_FROM_NAME, getEmailNotificationFrom()));
props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME, toString(EMAIL_NOTIFICATIONS_TO_LIST_NAME, getEmailNotificationToList()));
- props.setProperty(SSL_ENABLED, toString(SSL_ENABLED, isSSLEnabled()));
- props.setProperty(SSL_PROTOCOLS_NAME, toString(SSL_PROTOCOLS_NAME, getSSLProtocols()));
- props.setProperty(SSL_CIPHERS_NAME, toString(SSL_CIPHERS_NAME, getSSLCiphers()));
- props.setProperty(SSL_REQUIRE_AUTHENTICATION_NAME, toString(SSL_REQUIRE_AUTHENTICATION_NAME, isSSLAuthenticationRequired()));
+ props.setProperty(CLUSTER_SSL_ENABLED, toString(CLUSTER_SSL_ENABLED, isSSLEnabled()));
+ props.setProperty(CLUSTER_SSL_PROTOCOLS, toString(CLUSTER_SSL_PROTOCOLS, getSSLProtocols()));
+ props.setProperty(CLUSTER_SSL_CIPHERS, toString(CLUSTER_SSL_CIPHERS, getSSLCiphers()));
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, toString(CLUSTER_SSL_REQUIRE_AUTHENTICATION, isSSLAuthenticationRequired()));
Properties sslProps = getSSLProperties();
if (sslProps.size() > 0) {
@@ -712,8 +640,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
}
if (this.getDistributionLocatorConfigs().length > 0) {
- DistributionLocatorConfig[] configs =
- this.getDistributionLocatorConfigs();
+ DistributionLocatorConfig[] configs = this.getDistributionLocatorConfigs();
for (int i = 0; i < configs.length; i++) {
DistributionLocatorConfig locator = configs[i];
props.setProperty(LOCATOR_HOST_NAME + i, toString(LOCATOR_HOST_NAME, locator.getHost()));
@@ -936,8 +863,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Returns the port of the RMI Connector Server.
* <p>
* See <a href="#rmi-server-port">description</a> above.
- *
* @return the value set for rmi-server-port
+ *
* @since GemFire 6.5
*/
public int getRmiServerPort() {
@@ -946,8 +873,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Sets the port of the RMI Connector Server.
- *
* @param port rmi-server-port to set.
+ *
* @since GemFire 6.5
*/
public void setRmiServerPort(int port) {
@@ -1008,132 +935,79 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Initialize the values of this AgentConfig.
- *
* @param props the configuration values to use
*/
private void initialize(Properties props) {
- this.autoConnect = validateBoolean(props.getProperty(
- AUTO_CONNECT_NAME),
- DEFAULT_AUTO_CONNECT);
-
- this.httpEnabled = validateBoolean(props.getProperty(
- HTTP_ENABLED_NAME),
- DEFAULT_HTTP_ENABLED);
- this.httpBindAddress = validateHttpBindAddress(props.getProperty(
- HTTP_BIND_ADDRESS_NAME));
- this.httpPort = validateHttpPort(props.getProperty(
- HTTP_PORT_NAME));
-
- this.rmiEnabled = validateBoolean(props.getProperty(
- RMI_ENABLED_NAME),
- DEFAULT_RMI_ENABLED);
- this.rmiRegistryEnabled = validateBoolean(props.getProperty(
- RMI_REGISTRY_ENABLED_NAME),
- DEFAULT_RMI_REGISTRY_ENABLED);
-
- this.rmiBindAddress = validateRmiBindAddress(props.getProperty(
- RMI_BIND_ADDRESS_NAME));
- this.rmiPort = validateRmiPort(props.getProperty(
- RMI_PORT_NAME));
- this.rmiServerPort = validateRmiServerPort(props.getProperty(
- RMI_SERVER_PORT_NAME));
-
- this.snmpEnabled = validateBoolean(props.getProperty(
- SNMP_ENABLED_NAME),
- DEFAULT_SNMP_ENABLED);
- this.snmpDirectory = validateSnmpDirectory(props.getProperty(
- SNMP_DIRECTORY_NAME));
-
- this.agentSSLEnabled = validateBoolean(props.getProperty(
- AGENT_SSL_ENABLED_NAME),
- DEFAULT_AGENT_SSL_ENABLED);
- this.agentSSLProtocols = validateNonEmptyString(props.getProperty(
- AGENT_SSL_PROTOCOLS_NAME),
- DEFAULT_AGENT_SSL_PROTOCOLS);
- this.agentSSLCiphers = validateNonEmptyString(props.getProperty(
- AGENT_SSL_CIPHERS_NAME),
- DEFAULT_AGENT_SSL_CIPHERS);
- this.agentSSLRequireAuth = validateBoolean(props.getProperty(
- AGENT_SSL_REQUIRE_AUTHENTICATION_NAME),
- DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION);
- this.httpSSLRequireAuth = validateBoolean(props.getProperty(
- HTTP_SSL_REQUIRE_AUTHENTICATION_NAME),
- DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION);
-
- this.httpAuthEnabled = validateBoolean(props.getProperty(
- HTTP_AUTHENTICATION_ENABLED_NAME),
- DEFAULT_HTTP_AUTHENTICATION_ENABLED);
- this.httpAuthUser = validateNonEmptyString(props.getProperty(
- HTTP_AUTHENTICATION_USER_NAME),
- DEFAULT_HTTP_AUTHENTICATION_USER);
- this.httpAuthPassword = validateNonEmptyString(props.getProperty(
- HTTP_AUTHENTICATION_PASSWORD_NAME),
- DEFAULT_HTTP_AUTHENTICATION_PASSWORD);
-
- this.sslEnabled = validateBoolean(props.getProperty(
- SSL_ENABLED),
- DEFAULT_SSL_ENABLED);
- this.sslProtocols = validateNonEmptyString(props.getProperty(
- SSL_PROTOCOLS_NAME),
- DEFAULT_SSL_PROTOCOLS);
- this.sslCiphers = validateNonEmptyString(props.getProperty(
- SSL_CIPHERS_NAME),
- DEFAULT_SSL_CIPHERS);
- this.sslAuthenticationRequired = validateBoolean(props.getProperty(
- SSL_REQUIRE_AUTHENTICATION_NAME),
- DEFAULT_SSL_REQUIRE_AUTHENTICATION);
+ this.autoConnect = validateBoolean(props.getProperty(AUTO_CONNECT_NAME), DEFAULT_AUTO_CONNECT);
+
+ this.httpEnabled = validateBoolean(props.getProperty(HTTP_ENABLED_NAME), DEFAULT_HTTP_ENABLED);
+ this.httpBindAddress = validateHttpBindAddress(props.getProperty(HTTP_BIND_ADDRESS_NAME));
+ this.httpPort = validateHttpPort(props.getProperty(HTTP_PORT_NAME));
+
+ this.rmiEnabled = validateBoolean(props.getProperty(RMI_ENABLED_NAME), DEFAULT_RMI_ENABLED);
+ this.rmiRegistryEnabled = validateBoolean(props.getProperty(RMI_REGISTRY_ENABLED_NAME), DEFAULT_RMI_REGISTRY_ENABLED);
+
+ this.rmiBindAddress = validateRmiBindAddress(props.getProperty(RMI_BIND_ADDRESS_NAME));
+ this.rmiPort = validateRmiPort(props.getProperty(RMI_PORT_NAME));
+ this.rmiServerPort = validateRmiServerPort(props.getProperty(RMI_SERVER_PORT_NAME));
+
+ this.snmpEnabled = validateBoolean(props.getProperty(SNMP_ENABLED_NAME), DEFAULT_SNMP_ENABLED);
+ this.snmpDirectory = validateSnmpDirectory(props.getProperty(SNMP_DIRECTORY_NAME));
+
+ this.agentSSLEnabled = validateBoolean(props.getProperty(AGENT_SSL_ENABLED_NAME), DEFAULT_AGENT_SSL_ENABLED);
+ this.agentSSLProtocols = validateNonEmptyString(props.getProperty(AGENT_SSL_PROTOCOLS_NAME), DEFAULT_AGENT_SSL_PROTOCOLS);
+ this.agentSSLCiphers = validateNonEmptyString(props.getProperty(AGENT_SSL_CIPHERS_NAME), DEFAULT_AGENT_SSL_CIPHERS);
+ this.agentSSLRequireAuth = validateBoolean(props.getProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME), DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION);
+ this.httpSSLRequireAuth = validateBoolean(props.getProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME), DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION);
+
+ this.httpAuthEnabled = validateBoolean(props.getProperty(HTTP_AUTHENTICATION_ENABLED_NAME), DEFAULT_HTTP_AUTHENTICATION_ENABLED);
+ this.httpAuthUser = validateNonEmptyString(props.getProperty(HTTP_AUTHENTICATION_USER_NAME), DEFAULT_HTTP_AUTHENTICATION_USER);
+ this.httpAuthPassword = validateNonEmptyString(props.getProperty(HTTP_AUTHENTICATION_PASSWORD_NAME), DEFAULT_HTTP_AUTHENTICATION_PASSWORD);
+
+ this.sslEnabled = validateBoolean(props.getProperty(CLUSTER_SSL_ENABLED), DEFAULT_CLUSTER_SSL_ENABLED);
+ this.sslProtocols = validateNonEmptyString(props.getProperty(CLUSTER_SSL_PROTOCOLS), DEFAULT_CLUSTER_SSL_PROTOCOLS);
+ this.sslCiphers = validateNonEmptyString(props.getProperty(CLUSTER_SSL_CIPHERS), DEFAULT_CLUSTER_SSL_CIPHERS);
+ this.sslAuthenticationRequired = validateBoolean(props.getProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION), DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION);
this.sslProperties = new Properties();
for (int i = 0; true; i++) {
String key = "ssl-property-" + i;
String value = props.getProperty(key);
- if (value == null)
+ if (value == null) {
break;
+ }
StringTokenizer st = new StringTokenizer(value, "=");
- if (!st.hasMoreTokens())
+ if (!st.hasMoreTokens()) {
break;
+ }
String propKey = st.nextToken();
- if (!st.hasMoreTokens())
+ if (!st.hasMoreTokens()) {
break;
+ }
String propValue = st.nextToken();
this.sslProperties.put(propKey, propValue);
}
- this.isEmailNotificationEnabled = validateBoolean(props.getProperty(
- AgentConfig.EMAIL_NOTIFICATIONS_ENABLED_NAME),
- DEFAULT_EMAIL_NOTIFICATIONS_ENABLED);
- this.emailNotificationHostName = validateNonEmptyString(props.getProperty(
- AgentConfig.EMAIL_NOTIFICATIONS_HOST_NAME),
- DEFAULT_EMAIL_HOST);
- this.emailNotificationFrom = validateNonEmptyString(props.getProperty(
- AgentConfig.EMAIL_NOTIFICATIONS_FROM_NAME),
- DEFAULT_EMAIL_FROM);
- this.emailNotificationToList = validateNonEmptyString(props.getProperty(
- AgentConfig.EMAIL_NOTIFICATIONS_TO_LIST_NAME),
- DEFAULT_EMAIL_TO_LIST);
-
- this.stateSaveFile = validateNonEmptyString(props.getProperty(
- AgentConfig.STATE_SAVE_FILE_NAME),
- DEFAULT_STATE_SAVE_FILE);
+ this.isEmailNotificationEnabled = validateBoolean(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_ENABLED_NAME), DEFAULT_EMAIL_NOTIFICATIONS_ENABLED);
+ this.emailNotificationHostName = validateNonEmptyString(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_HOST_NAME), DEFAULT_EMAIL_HOST);
+ this.emailNotificationFrom = validateNonEmptyString(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_FROM_NAME), DEFAULT_EMAIL_FROM);
+ this.emailNotificationToList = validateNonEmptyString(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_TO_LIST_NAME), DEFAULT_EMAIL_TO_LIST);
+
+ this.stateSaveFile = validateNonEmptyString(props.getProperty(AgentConfig.STATE_SAVE_FILE_NAME), DEFAULT_STATE_SAVE_FILE);
try {
for (int i = 0; true; i++) {
String hostProp = props.getProperty(LOCATOR_HOST_NAME + i);
- if (isEmpty(hostProp))
+ if (isEmpty(hostProp)) {
break;
+ }
String host = hostProp;
- int port = Integer.parseInt(
- props.getProperty(LOCATOR_PORT_NAME + i));
- File workDir = validateWorkingDirectory(
- props.getProperty(LOCATOR_WORKING_DIRECTORY_NAME + i));
- File prodDir = new File(validateProductDirectory(
- props.getProperty(LOCATOR_PRODUCT_DIRECTORY_NAME + i)));
- String remoteCmd =
- props.getProperty(LOCATOR_REMOTE_COMMAND + i);
- String bindAddr =
- props.getProperty(LOCATOR_BIND_ADDRESS + i);
-
- DistributionLocatorConfig config =
- this.createDistributionLocatorConfig();
+ int port = Integer.parseInt(props.getProperty(LOCATOR_PORT_NAME + i));
+ File workDir = validateWorkingDirectory(props.getProperty(LOCATOR_WORKING_DIRECTORY_NAME + i));
+ File prodDir = new File(validateProductDirectory(props.getProperty(LOCATOR_PRODUCT_DIRECTORY_NAME + i)));
+ String remoteCmd = props.getProperty(LOCATOR_REMOTE_COMMAND + i);
+ String bindAddr = props.getProperty(LOCATOR_BIND_ADDRESS + i);
+
+ DistributionLocatorConfig config = this.createDistributionLocatorConfig();
config.setHost(host);
config.setPort(port);
config.setBindAddress(bindAddr);
@@ -1154,8 +1028,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Filter all agent configuration attributes out of the given <code>Properties</code> object.
* <p/>
- *
* @param props the <code>Properties</code> object of filter agent configuration attributes out of.
+ *
* @see AgentConfigImpl#_getPropertyDescription(String)
*/
private static Properties filterOutAgentProperties(final Properties props) {
@@ -1179,12 +1053,10 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Appends the log-file property to the Properties object if set of properties does not already define the
* log-file property or the gemfire.agent.log-file property.
* <p/>
- *
* @param props the <code>Properties</code> to append the log-file property to if the property does not exist.
*/
private static void appendLogFileProperty(final Properties props) {
- if (!(props.containsKey(DistributedSystemConfig.LOG_FILE_NAME)
- || props.containsKey(SYSTEM_PROPERTY_PREFIX + DistributedSystemConfig.LOG_FILE_NAME))) {
+ if (!(props.containsKey(DistributedSystemConfig.LOG_FILE_NAME) || props.containsKey(SYSTEM_PROPERTY_PREFIX + DistributedSystemConfig.LOG_FILE_NAME))) {
props.put(DistributedSystemConfig.LOG_FILE_NAME, DEFAULT_LOG_FILE);
}
}
@@ -1194,7 +1066,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Properties. If the supplied property overrides the property in the
* property-file, then property-file value is ignored. System Properties always
* override the supplied properties
- *
* @return appendedProps Properties appened to from the property-file if any
*/
private static Properties appendOptionalPropertyFileProperties(final Properties props) {
@@ -1221,8 +1092,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
}
}
} catch (IOException e) {
- throw new GemFireIOException(LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(
- url.toString()), e);
+ throw new GemFireIOException(LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(url.toString()), e);
} finally {
IOUtils.close(in);
}
@@ -1244,9 +1114,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Returns a description of the given agent config property
- *
* @throws IllegalArgumentException If <code>prop</code> is not a recognized agent
- * configuration property
+ * configuration property
*/
public static String getPropertyDescription(String prop) {
if (prop.equals(LOG_FILE_NAME)) {
@@ -1259,7 +1128,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
return LocalizedStrings.AgentConfigImpl_LIMIT_IN_MEGABYTES_OF_HOW_MUCH_DISK_SPACE_CAN_BE_CONSUMED_BY_OLD_INACTIVE_LOG_FILES.toLocalizedString();
} else if (prop.equals(LOG_FILE_SIZE_LIMIT_NAME)) {
return LocalizedStrings.AgentConfigImpl_LIMIT_IN_MEGABYTES_OF_HOW_LARGE_THE_CURRENT_STATISTIC_ARCHIVE_FILE_CAN_GROW_BEFORE_IT_IS_CLOSED_AND_ARCHIVAL_ROLLS_ON_TO_A_NEW_FILE
- .toLocalizedString();
+ .toLocalizedString();
} else if (prop.equals(MCAST_PORT)) {
return LocalizedStrings.AgentConfigImpl_MULTICAST_PORT_USED_TO_CONNECT_TO_DISTRIBUTED_SYSTEM.toLocalizedString();
} else if (prop.equals(MCAST_ADDRESS)) {
@@ -1280,13 +1149,13 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
return LocalizedStrings.AgentConfigImpl_REFRESH_INTERVAL_IN_SECONDS_FOR_AUTOREFRESH_OF_MEMBERS_AND_STATISTIC_RESOURCES.toLocalizedString();
} else if (prop.equals(REMOTE_COMMAND_NAME)) {
return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_FOR_LAUNCHING_MEMBERS_OF_THE_DISTRIBUTED_SYSTEM.toLocalizedString();
- } else if (prop.equals(SSL_ENABLED)) {
+ } else if (prop.equals(CLUSTER_SSL_ENABLED)) {
return LocalizedStrings.AgentConfigImpl_DOES_THE_DISTRIBUTED_SYSTEM_COMMUNICATE_USING_SSL.toLocalizedString();
- } else if (prop.equals(SSL_PROTOCOLS_NAME)) {
+ } else if (prop.equals(CLUSTER_SSL_PROTOCOLS)) {
return LocalizedStrings.AgentConfigImpl_SSL_PROTOCOLS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM.toLocalizedString();
- } else if (prop.equals(SSL_CIPHERS_NAME)) {
+ } else if (prop.equals(CLUSTER_SSL_CIPHERS)) {
return LocalizedStrings.AgentConfigImpl_SSL_CIPHERS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM.toLocalizedString();
- } else if (prop.equals(SSL_REQUIRE_AUTHENTICATION_NAME)) {
+ } else if (prop.equals(CLUSTER_SSL_REQUIRE_AUTHENTICATION)) {
return LocalizedStrings.AgentConfigImpl_DOES_CONNECTING_TO_THE_DISTRIBUTED_SYSTEM_REQUIRE_SSL_AUTHENTICATION.toLocalizedString();
} else {
String description = _getPropertyDescription(prop);
@@ -1415,7 +1284,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Parses the array of command-line arguments (format: key=value) into an
* instance of Properties.
- *
* @param args the command-line arguments to convert into a Properties
*/
private static Properties toProperties(String[] args) {
@@ -1461,7 +1329,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Makes sure that the mcast port and locators are correct and
* consistent.
- *
* @throws IllegalArgumentException If configuration is not valid
*/
@Override
@@ -1469,18 +1336,21 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
super.validate();
if (this.httpPort < 0 || this.httpPort > MAX_HTTP_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT)
+ }));
}
if (this.rmiPort < 0 || this.rmiPort > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
+ }));
}
if (this.rmiServerPort < 0 || this.rmiServerPort > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
+ }));
}
}
@@ -1488,8 +1358,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Returns defaultValue if value is empty.
*/
- private String validateNonEmptyString(String value,
- String defaultValue) {
+ private String validateNonEmptyString(String value, String defaultValue) {
return isEmpty(value) ? defaultValue : value;
}
@@ -1514,8 +1383,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* Returns true if value parses as true; null value returns defaultValue.
*/
private boolean validateBoolean(String value, boolean defaultValue) {
- if (isEmpty(value))
+ if (isEmpty(value)) {
return defaultValue;
+ }
return Boolean.valueOf(value).booleanValue();
}
@@ -1542,8 +1412,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
*/
private int validateHttpPort(int val) {
if (val < 0 || val > MAX_HTTP_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT)
+ }));
}
return val;
}
@@ -1639,8 +1510,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
*/
private int validateRmiPort(int val) {
if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
+ }));
}
return val;
}
@@ -1666,8 +1538,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
*/
private int validateRmiServerPort(int val) {
if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
- .toLocalizedString(new Object[] { RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT) }));
+ throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
+ RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
+ }));
}
return val;
}
@@ -1722,7 +1595,6 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
* <li> the class path
* </ol>
* Only the first file found will be used.
- *
* @return a <code>URL</code> that names the property file;
* otherwise Null if no property file was found.
*/
@@ -1782,14 +1654,15 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
/**
* Returns string representation of the specified object with special
* handling for InetAddress.
- *
* @param obj the object to convert to string
+ *
* @return string representation of the specified object
*/
private static String toString(String attName, java.lang.Object obj) {
if (okToDisplayPropertyValue(attName)) {
- if (obj == null)
+ if (obj == null) {
return "";
+ }
if (obj instanceof InetAddress) {
return InetAddressUtil.toString(obj);
}
@@ -1831,10 +1704,10 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl
// -------------------------------------------------------------------------
// SSL support...
// -------------------------------------------------------------------------
- private boolean sslEnabled = DEFAULT_SSL_ENABLED;
- private String sslProtocols = DEFAULT_SSL_PROTOCOLS;
- private String sslCiphers = DEFAULT_SSL_CIPHERS;
- private boolean sslAuthenticationRequired = DEFAULT_SSL_REQUIRE_AUTHENTICATION;
+ private boolean sslEnabled = DEFAULT_CLUSTER_SSL_ENABLED;
+ private String sslProtocols = DEFAULT_CLUSTER_SSL_PROTOCOLS;
+ private String sslCiphers = DEFAULT_CLUSTER_SSL_CIPHERS;
+ private boolean sslAuthenticationRequired = DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION;
private Properties sslProperties = new Properties();
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
index 649038e..ac79657 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MX4JServerSocketFactory.java
@@ -78,10 +78,10 @@ implements mx4j.tools.adaptor.AdaptorServerSocketFactory,
String ciphers,
Properties gfsecurityProps) {
if (protocols == null || protocols.length() == 0) {
- protocols = DistributionConfig.DEFAULT_SSL_PROTOCOLS;
+ protocols = DistributionConfig.DEFAULT_CLUSTER_SSL_PROTOCOLS;
}
if (ciphers == null || ciphers.length() == 0) {
- ciphers = DistributionConfig.DEFAULT_SSL_CIPHERS;
+ ciphers = DistributionConfig.DEFAULT_CLUSTER_SSL_CIPHERS;
}
this.socketCreator = SocketCreator.createNonDefaultInstance(
useSSL, needClientAuth, protocols, ciphers, gfsecurityProps);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
index e74ae05..207ca0d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
@@ -157,6 +157,25 @@ public interface ConfigurationProperties {
* <U>Since</U>: GemFire 8.1
*/
String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
+
+ /**
+ * 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";
+
+ /**
+ * The static String definition of the <i>"cluster-ssl-alias"</i> property
+ * <a name="cluster-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used out of a keystore with multiple keys in it.
+ * This alias will be used for all other SSL communication (HTTP Service,JMX,SERVER,GATEWAY) unless specifically overridden by their
+ * corresponding aliases {@link #GATEWAY_SSL_ALIAS}, {@link #HTTP_SERVICE_SSL_ALIAS}, {@link #JMX_MANAGER_SSL_ALIAS}, {@link #SERVER_SSL_ALIAS}
+ * </p>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String CLUSTER_SSL_ALIAS = "cluster-ssl-alias";
/**
* The static String definition of the <i>"cluster-ssl-ciphers"</i> property
* <a name="cluster-ssl-ciphers"/a></p>
@@ -172,8 +191,7 @@ public interface ConfigurationProperties {
* The static String definition of the <i>"cluster-ssl-enabled"</i> property
* <a name="cluster-ssl-enabled"/a></p>
* <U>Description</U>: If true, all gemfire socket communication is
- * configured to use SSL through JSSE. Preferably Use cluster-ssl-* properties
- * rather than ssl-* properties.
+ * configured to use SSL through JSSE.
* </p>
* <U>Default</U>: "false"</p>
* <U>Since</U>: GemFire 8.0
@@ -212,8 +230,7 @@ public interface ConfigurationProperties {
* The static String definition of the <i>"cluster-ssl-protocols"</i> property
* <a name="cluster-ssl-protocols"/a></p>
* <U>Description</U>: A space separated list of the SSL protocols to
- * enable. Those listed must be supported by the available providers.Preferably
- * use cluster-ssl-* properties rather than ssl-* properties.
+ * enable. Those listed must be supported by the available providers.
* </p>
* <U>Default</U>: "any"</p>
* <U>Since</U>: GemFire 8.0
@@ -223,8 +240,7 @@ public interface ConfigurationProperties {
* The static String definition of the <i>"cluster-ssl-require-authentication"</i> property
* <a name="cluster-ssl-require-authentication"/a></p>
* <U>Description</U>: If false, allow ciphers that do not require the
- * client side of the connection to be authenticated.Preferably use
- * cluster-ssl-* properties rather than ssl-* properties.
+ * client side of the connection to be authenticated.
* </p>
* <U>Default</U>: "true"</p>
* <U>Since</U>: GemFire 8.0
@@ -420,6 +436,16 @@ public interface ConfigurationProperties {
*/
String ENFORCE_UNIQUE_HOST = "enforce-unique-host";
/**
+ * The static String definition of the <i>"gateway-ssl-alias"</i> property
+ * <a name="gateway-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used for the SSL communications for the Gateways.
+ * </p>
+ * <U><i>Optional</i></U>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String GATEWAY_SSL_ALIAS = "gateway-ssl-alias";
+ /**
* The static String definition of the <i>"gateway-ssl-ciphers"</i> property
* <a name="gateway-ssl-ciphers"/a></p>
* <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
@@ -427,6 +453,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_CIPHERS}
*/
String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers";
/**
@@ -438,6 +465,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>false</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_ENABLED} with the optional {@link #GATEWAY_SSL_ALIAS}
*/
String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled";
/**
@@ -448,6 +476,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE}
*/
String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore";
/**
@@ -458,6 +487,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password";
/**
@@ -468,6 +498,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_TYPE}
*/
String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type";
/**
@@ -478,6 +509,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_PROTOCOLS}
*/
String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols";
/**
@@ -488,6 +520,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication";
/**
@@ -498,6 +531,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE}
*/
String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore";
/**
@@ -508,6 +542,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password";
/**
@@ -547,6 +582,16 @@ public interface ConfigurationProperties {
*/
String HTTP_SERVICE_PORT = "http-service-port";
/**
+ * The static String definition of the <i>"http-service-ssl-alias"</i> property
+ * <a name="http-service-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used for the SSL communications for the HTTP service.
+ * </p>
+ * <U><i>Optional</i></U>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String HTTP_SERVICE_SSL_ALIAS = "http-service-ssl-alias";
+ /**
* The static String definition of the <i>"http-service-ssl-ciphers"</i> property
* <a name="http-service-ssl-ciphers"/a></p>
* <U>Description</U>: A space separated list of the SSL cipher suites to enable.
@@ -554,6 +599,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_CIPHERS}
*/
String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers";
/**
@@ -566,6 +612,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>false</code></p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_ENABLED} with optional {@link #HTTP_SERVICE_SSL_ALIAS}
*/
String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled";
/**
@@ -576,6 +623,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE}
*/
String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore";
/**
@@ -586,6 +634,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password";
/**
@@ -596,6 +645,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_TYPE}
*/
String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type";
/**
@@ -606,6 +656,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_PROTOCOLS}
*/
String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols";
/**
@@ -616,6 +667,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>false</code></p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication";
/**
@@ -626,6 +678,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE}
*/
String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore";
/**
@@ -636,9 +689,18 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.1
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password";
/**
+ * The static String definition of the jmx-manager-ssl prefix "jmx-manager-ssl-" used in conjunction with other jmx-manager-ssl-* properties</i> property
+ * <a name="jmx-manager-ssl-"/a></p>
+ * <U>Description</U>: The jmx-manager-ssl prefix for.
+ * </p>
+ * <U>Default</U>: Optional</p>
+ */
+ String JMX_MANAGER_SSL_PREFIX = "jmx-manager-ssl-";
+ /**
* The static String definition of the <i>"jmx-manager"</i> property
* <a name="jmx-manager"/a></p>
* <U>Description</U>: If true then this member is willing to be a jmx-manager.
@@ -728,20 +790,6 @@ public interface ConfigurationProperties {
*/
String JMX_MANAGER_PORT = "jmx-manager-port";
/**
- * The static String definition of the <i>"jmx-manager-ssl"</i> property
- * <a name="jmx-manager-ssl"/a></p>
- * <U>Description</U>: If true and jmx-manager-port is not zero then the jmx-manager
- * will only accept ssl connections. Note that the ssl-enabled property does not apply to the jmx-manager
- * but the other ssl properties do. This allows ssl to be configured for just the jmx-manager
- * without needing to configure it for the other GemFire connections.
- * Ignored if jmx-manager is false.
- * </p>
- * <U>Default</U>: "false"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#jmx-manager-ssl-enabled"><code>jmx-manager-ssl-enabled</code></a> instead.
- * @deprecated as of GemFire 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead.
- */
- String JMX_MANAGER_SSL = "jmx-manager-ssl";
- /**
* The static String definition of the <i>"jmx-manager-start"</i> property
* <a name="jmx-manager-start"/a></p>
* <U>Description</U>: If true then this member will start a jmx manager when
@@ -765,12 +813,23 @@ public interface ConfigurationProperties {
*/
String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate";
/**
+ * The static String definition of the <i>"jmx-manager-ssl-alias"</i> property
+ * <a name="jmx-manager-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used for the SSL communications for the jmx manager.
+ * </p>
+ * <U><i>Optional</i></U>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String JMX_MANAGER_SSL_ALIAS = "jmx-manager-ssl-alias";
+ /**
* The static String definition of the <i>"jmx-manager-ssl-ciphers"</i> property
* <a name="jmx-manager-ssl-ciphers"/a></p>
* <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
* Those listed must be supported by the available providers.
* </p>
* <U>Default</U>: "any"
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_CIPHERS}
*/
String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers";
/**
@@ -783,6 +842,7 @@ public interface ConfigurationProperties {
* Ignored if jmx-manager is false.
* </p>
* <U>Default</U>: "false"
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_ENABLED} with optional {@link #JMX_MANAGER_SSL_ALIAS}
*/
String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
/**
@@ -793,6 +853,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE}
*/
String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore";
/**
@@ -803,6 +864,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password";
/**
@@ -813,6 +875,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_TYPE}
*/
String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type";
/**
@@ -822,6 +885,7 @@ public interface ConfigurationProperties {
* Those listed must be supported by the available providers.
* </p>
* <U>Default</U>: "any"
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_PROTOCOLS}
*/
String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols";
/**
@@ -831,6 +895,7 @@ public interface ConfigurationProperties {
* side of the connection to be authenticated.
* </p>
* <U>Default</U>: "true"
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication";
/**
@@ -841,6 +906,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE}
*/
String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore";
/**
@@ -851,6 +917,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password";
/**
@@ -1221,6 +1288,16 @@ public interface ConfigurationProperties {
*/
String SERVER_BIND_ADDRESS = "server-bind-address";
/**
+ * The static String definition of the <i>"server-ssl-alias"</i> property
+ * <a name="server-ssl-alias"/a></p>
+ * <U>Description</U>: This property is to be used if a specific key is to be used for the SSL communications for client-server.
+ * </p>
+ * <U><i>Optional</i></U>
+ * <U>Default</U>: "" </p>
+ * <U>Since</U>: Geode 1.0
+ */
+ String SERVER_SSL_ALIAS = "server-ssl-alias";
+ /**
* The static String definition of the <i>"server-ssl-ciphers"</i> property
* <a name="server-ssl-ciphers"/a></p>
* <U>Description</U>: A space seperated list of the SSL cipher suites to enable.
@@ -1228,6 +1305,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_CIPHERS}
*/
String SERVER_SSL_CIPHERS = "server-ssl-ciphers";
/**
@@ -1239,6 +1317,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>false</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_ENABLED} with optional {@link #SERVER_SSL_ALIAS}
*/
String SERVER_SSL_ENABLED = "server-ssl-enabled";
/**
@@ -1249,6 +1328,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE}
*/
String SERVER_SSL_KEYSTORE = "server-ssl-keystore";
/**
@@ -1259,6 +1339,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_PASSWORD}
*/
String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password";
/**
@@ -1269,6 +1350,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_KEYSTORE_TYPE}
*/
String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type";
/**
@@ -1279,6 +1361,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_PROTOCOLS}
*/
String SERVER_SSL_PROTOCOLS = "server-ssl-protocols";
/**
@@ -1289,6 +1372,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: <code>any</code></p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION}
*/
String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication";
/**
@@ -1299,6 +1383,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE}
*/
String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore";
/**
@@ -1309,6 +1394,7 @@ public interface ConfigurationProperties {
* </p>
* <U>Default</U>: ""</p>
* <U>Since</U>: GemFire 8.0
+ * @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_TRUSTSTORE_PASSWORD}
*/
String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password";
/**
@@ -1536,48 +1622,4 @@ public interface ConfigurationProperties {
* The static String definition of the <i>"distributed-transactions"</i> property
*/
String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
- /**
- * The static String definition of the <i>"ssl-enabled"</i> property
- * <a name="ssl-enabled"/a></p>
- * <U>Description</U>: If true, all gemfire socket communication is
- * configured to use SSL through JSSE.
- * </p>
- * <U>Default</U>: "false"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-enabled"><code>cluster-ssl-enabled</code></a> instead.
- * @deprecated as of Gemfire 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
- */
- String SSL_ENABLED = "ssl-enabled";
- /**
- * The static String definition of the <i>"ssl-protocols"</i> property
- * <a name="ssl-protocols"/a></p>
- * <U>Description</U>: A space separated list of the SSL protocols to enable.
- * Those listed must be supported by the available providers.
- * </p>
- * <U>Default</U>: "any"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-protocols"><code>cluster-ssl-protocols</code></a> instead.
- * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
- */
- String SSL_PROTOCOLS = "ssl-protocols";
- /**
- * The static String definition of the <i>"ssl-ciphers"</i> property
- * <a name="ssl-ciphers"/a></p>
- * <U>Description</U>: A space separated list of the SSL cipher suites to enable.
- * Those listed must be supported by the available providers.
- * </p>
- * <U>Default</U>: "any"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-ciphers"><code>cluster-ssl-ciphers</code></a> instead.
- * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
- */
- String SSL_CIPHERS = "ssl-ciphers";
- /**
- * The static String definition of the <i>"ssl-require-authentication"</i> property
- * <a name="ssl-require-authentication"/a></p>
- * <U>Description</U>: If false, allow ciphers that do not require the client
- * side of the connection to be authenticated.
- * </p>
- * <U>Default</U>: "true"</p>
- * <U>Deprecated</U>: as of GemFire 8.0 use <a href="#cluster-ssl-require-authentication"><code>cluster-ssl-require-authentication</code></a> instead.
- * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
- */
- String SSL_REQUIRE_AUTHENTICATION = "ssl-require-authentication";
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f71350a1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index c7eca0f..83508c2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -46,9 +46,7 @@ import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
*
*/
@SuppressWarnings("deprecation")
-public abstract class AbstractDistributionConfig
- extends AbstractConfig
- implements DistributionConfig
+public abstract class AbstractDistributionConfig extends AbstractConfig implements DistributionConfig
{
protected Object checkAttribute(String attName, Object value){
@@ -108,10 +106,6 @@ public abstract class AbstractDistributionConfig
@ConfigAttributeChecker(name = TCP_PORT)
protected int checkTcpPort(int value) {
- if ( getSSLEnabled() && value != 0 ) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), SSL_ENABLED }));
- }
if ( getClusterSSLEnabled() && value != 0 ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
.toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
@@ -121,10 +115,6 @@ public abstract class AbstractDistributionConfig
@ConfigAttributeChecker(name = MCAST_PORT)
protected int checkMcastPort(int value) {
- if ( getSSLEnabled() && value != 0 ) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
- .toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), SSL_ENABLED }));
- }
if ( getClusterSSLEnabled() && value != 0 ) {
throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_0_WHEN_2_IS_TRUE
.toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
@@ -165,15 +155,6 @@ public abstract class AbstractDistributionConfig
return value;
}
- @ConfigAttributeChecker(name=SSL_ENABLED)
- protected Boolean checkSSLEnabled(Boolean value) {
- if ( value.booleanValue() && (getMcastPort() != 0) ) {
- throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_MUST_BE_FALSE_WHEN_2_IS_NOT_0
- .toLocalizedString(new Object[] { SSL_ENABLED, value, MCAST_PORT }));
- }
- return value;
- }
-
@ConfigAttributeChecker(name=CLUSTER_SSL_ENABLED)
protected Boolean checkClusterSSLEnabled(Boolean value) {
if ( value.booleanValue() && (getMcastPort() != 0) ) {
@@ -830,23 +811,6 @@ public abstract class AbstractDistributionConfig
.toLocalizedString(
Boolean.valueOf(DEFAULT_STATISTIC_SAMPLING_ENABLED)));
- m.put(SSL_ENABLED,
- LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0
- .toLocalizedString(
- Boolean.valueOf(DEFAULT_SSL_ENABLED)));
-
- m.put(SSL_PROTOCOLS,
- LocalizedStrings.AbstractDistributionConfig_SSL_PROTOCOLS_NAME_0
- .toLocalizedString(DEFAULT_SSL_PROTOCOLS));
-
- m.put(SSL_CIPHERS,
- LocalizedStrings.AbstractDistributionConfig_SSL_CIPHERS_NAME_0
- .toLocalizedString(DEFAULT_SSL_CIPHERS));
-
- m.put(SSL_REQUIRE_AUTHENTICATION,
- LocalizedStrings.AbstractDistributionConfig_SSL_REQUIRE_AUTHENTICATION_NAME
- .toLocalizedString(Boolean.valueOf(DEFAULT_SSL_REQUIRE_AUTHENTICATION)));
-
m.put(CLUSTER_SSL_ENABLED,
LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0
.toLocalizedString(
@@ -1001,7 +965,6 @@ public abstract class AbstractDistributionConfig
m.put(JMX_MANAGER, "If true then this member is willing to be a jmx manager. Defaults to false except on a locator.");
m.put(JMX_MANAGER_START, "If true then the jmx manager will be started when the cache is created. Defaults to false.");
- m.put(JMX_MANAGER_SSL, "If true then the jmx manager will only allow SSL clients to connect. Defaults to false. This property is ignored if jmx-manager-port is \"0\".");
m.put(JMX_MANAGER_SSL_ENABLED, "If true then the jmx manager will only allow SSL clients to connect. Defaults to false. This property is ignored if jmx-manager-port is \"0\".");
m.put(JMX_MANAGER_SSL_CIPHERS, "List of available SSL cipher suites that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_CIPHERS+"\" meaning your provider''s defaults.");
m.put(JMX_MANAGER_SSL_PROTOCOLS, "List of available SSL protocols that are to be enabled for JMX Manager. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_PROTOCOLS+"\" meaning defaults of your provider.");