geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [53/67] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public
Date Thu, 02 Jun 2016 00:08:39 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/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 3b08779..864c93b 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
@@ -109,11 +109,11 @@ public abstract class AbstractDistributionConfig
   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_NAME }));
+          .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_NAME }));
+          .toLocalizedString(new Object[] { TCP_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
     }
     return value;
   }
@@ -122,11 +122,11 @@ public abstract class AbstractDistributionConfig
   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_NAME }));
+          .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_NAME }));
+          .toLocalizedString(new Object[] { MCAST_PORT, Integer.valueOf(value), CLUSTER_SSL_ENABLED }));
     }
     return value;
   }
@@ -164,25 +164,25 @@ public abstract class AbstractDistributionConfig
     return value;
   }
 
-  @ConfigAttributeChecker(name=SSL_ENABLED_NAME)
+  @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_NAME, value, MCAST_PORT }));
+          .toLocalizedString(new Object[] { SSL_ENABLED, value, MCAST_PORT }));
     }
     return value;
   }
 
-  @ConfigAttributeChecker(name=CLUSTER_SSL_ENABLED_NAME)
+  @ConfigAttributeChecker(name=CLUSTER_SSL_ENABLED)
   protected Boolean checkClusterSSLEnabled(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[] { CLUSTER_SSL_ENABLED_NAME, value, MCAST_PORT }));
+          .toLocalizedString(new Object[] { CLUSTER_SSL_ENABLED, value, MCAST_PORT }));
     }
     return value;
   }
 
-  @ConfigAttributeChecker(name=HTTP_SERVICE_BIND_ADDRESS_NAME)
+  @ConfigAttributeChecker(name=HTTP_SERVICE_BIND_ADDRESS)
   protected String checkHttpServiceBindAddress(String value) {
     if (value != null && value.length() > 0 &&
         !SocketCreator.isLocalHost(value)) {
@@ -195,7 +195,7 @@ public abstract class AbstractDistributionConfig
   }
 
 
-  @ConfigAttributeChecker(name=DISTRIBUTED_SYSTEM_ID_NAME)
+  @ConfigAttributeChecker(name=DISTRIBUTED_SYSTEM_ID)
   protected int checkDistributedSystemId(int value) {
     String distributedSystemListener = System
         .getProperty(DistributionConfig.GEMFIRE_PREFIX + "DistributedSystemListener");
@@ -204,13 +204,13 @@ public abstract class AbstractDistributionConfig
       if (value < MIN_DISTRIBUTED_SYSTEM_ID) {
         throw new IllegalArgumentException(
             LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2
-                .toLocalizedString(new Object[] { DISTRIBUTED_SYSTEM_ID_NAME,
+                .toLocalizedString(new Object[] { DISTRIBUTED_SYSTEM_ID,
                     Integer.valueOf(value),
                     Integer.valueOf(MIN_DISTRIBUTED_SYSTEM_ID) }));
       }
     }
     if (value > MAX_DISTRIBUTED_SYSTEM_ID) {
-      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {DISTRIBUTED_SYSTEM_ID_NAME, Integer.valueOf(value), Integer.valueOf(MAX_DISTRIBUTED_SYSTEM_ID)}));
+      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {DISTRIBUTED_SYSTEM_ID, Integer.valueOf(value), Integer.valueOf(MAX_DISTRIBUTED_SYSTEM_ID)}));
     }
     return value;
   }
@@ -344,36 +344,36 @@ public abstract class AbstractDistributionConfig
   }
 
   /** check a new mcast flow-control setting */
-  @ConfigAttributeChecker(name=MCAST_FLOW_CONTROL_NAME)
+  @ConfigAttributeChecker(name=MCAST_FLOW_CONTROL)
   protected FlowControlParams checkMcastFlowControl(FlowControlParams params) {
     int value = params.getByteAllowance();
     if (value < MIN_FC_BYTE_ALLOWANCE) {
-      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_BYTEALLOWANCE_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, Integer.valueOf(value), Integer.valueOf(MIN_FC_BYTE_ALLOWANCE)}));
+      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_BYTEALLOWANCE_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MIN_FC_BYTE_ALLOWANCE)}));
     }
     float fvalue = params.getRechargeThreshold();
     if (fvalue < MIN_FC_RECHARGE_THRESHOLD) {
-      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, new Float(fvalue), new Float(MIN_FC_RECHARGE_THRESHOLD)}));
+      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, new Float(fvalue), new Float(MIN_FC_RECHARGE_THRESHOLD)}));
     }
     else if (fvalue > MAX_FC_RECHARGE_THRESHOLD) {
-      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, new Float(fvalue), new Float(MAX_FC_RECHARGE_THRESHOLD)}));
+      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGETHRESHOLD_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, new Float(fvalue), new Float(MAX_FC_RECHARGE_THRESHOLD)}));
     }
     value = params.getRechargeBlockMs();
     if (value < MIN_FC_RECHARGE_BLOCK_MS) {
-      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, Integer.valueOf(value), Integer.valueOf(MIN_FC_RECHARGE_BLOCK_MS)}));
+      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MIN_FC_RECHARGE_BLOCK_MS)}));
     }
     else if (value > MAX_FC_RECHARGE_BLOCK_MS) {
-      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL_NAME, Integer.valueOf(value), Integer.valueOf(MAX_FC_RECHARGE_BLOCK_MS)}));
+      throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_RECHARGEBLOCKMS_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(new Object[] {MCAST_FLOW_CONTROL, Integer.valueOf(value), Integer.valueOf(MAX_FC_RECHARGE_BLOCK_MS)}));
     }
     return params;
   }
 
 
-  @ConfigAttributeChecker(name=MEMBERSHIP_PORT_RANGE_NAME)
+  @ConfigAttributeChecker(name=MEMBERSHIP_PORT_RANGE)
   protected int[] checkMembershipPortRange(int[] value) {
-    minMaxCheck(MEMBERSHIP_PORT_RANGE_NAME, value[0],
+    minMaxCheck(MEMBERSHIP_PORT_RANGE, value[0],
         DEFAULT_MEMBERSHIP_PORT_RANGE[0],
         value[1]);
-    minMaxCheck(MEMBERSHIP_PORT_RANGE_NAME, value[1],
+    minMaxCheck(MEMBERSHIP_PORT_RANGE, value[1],
         value[0],
         DEFAULT_MEMBERSHIP_PORT_RANGE[1]);
 
@@ -381,7 +381,7 @@ public abstract class AbstractDistributionConfig
     // One for each, UDP, FD_SOCk protocols and Cache Server.
     if (value[1] - value[0] < 2) {
       throw new IllegalArgumentException(LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.
-          toLocalizedString(new Object[] {MEMBERSHIP_PORT_RANGE_NAME, value[0]+"-"+value[1], Integer.valueOf(3)}));
+          toLocalizedString(new Object[] {MEMBERSHIP_PORT_RANGE, value[0]+"-"+value[1], Integer.valueOf(3)}));
     }
     return value;
   }
@@ -393,25 +393,25 @@ public abstract class AbstractDistributionConfig
     if (! (value.equals(CLIENT_CONFLATION_PROP_VALUE_DEFAULT) ||
             value.equals(CLIENT_CONFLATION_PROP_VALUE_ON) ||
               value.equals(CLIENT_CONFLATION_PROP_VALUE_OFF)) ) {
-      throw new IllegalArgumentException("Could not set \"" + CLIENT_CONFLATION_PROP_NAME + "\" to \"" + value + "\" because its value is not recognized");
+      throw new IllegalArgumentException("Could not set \"" + CONFLATE_EVENTS + "\" to \"" + value + "\" because its value is not recognized");
     }
     return value;
   }
 
-  @ConfigAttributeChecker(name=SECURITY_PEER_AUTH_INIT_NAME)
+  @ConfigAttributeChecker(name=SECURITY_PEER_AUTH_INIT)
   protected String checkSecurityPeerAuthInit(String value) {
     if (value != null && value.length() > 0 && getMcastPort() != 0) {
       String mcastInfo = MCAST_PORT + "[" + getMcastPort() + "]";
       throw new IllegalArgumentException(
         LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_2_MUST_BE_0_WHEN_SECURITY_IS_ENABLED
           .toLocalizedString(new Object[] {
-             SECURITY_PEER_AUTH_INIT_NAME, value, mcastInfo }));
+             SECURITY_PEER_AUTH_INIT, value, mcastInfo }));
     }
     return value;
   }
 
 
-  @ConfigAttributeChecker(name=SECURITY_PEER_AUTHENTICATOR_NAME)
+  @ConfigAttributeChecker(name=SECURITY_PEER_AUTHENTICATOR)
   protected String checkSecurityPeerAuthenticator(String value) {
     if (value != null && value.length() > 0 && getMcastPort() != 0) {
       String mcastInfo = MCAST_PORT + "[" + getMcastPort() + "]";
@@ -419,7 +419,7 @@ public abstract class AbstractDistributionConfig
         LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_2_MUST_BE_0_WHEN_SECURITY_IS_ENABLED
         .toLocalizedString(
           new Object[] {
-            SECURITY_PEER_AUTHENTICATOR_NAME,
+            SECURITY_PEER_AUTHENTICATOR,
             value,
             mcastInfo}));
     }
@@ -427,13 +427,13 @@ public abstract class AbstractDistributionConfig
   }
 
 
-  @ConfigAttributeChecker(name=SECURITY_LOG_LEVEL_NAME)
+  @ConfigAttributeChecker(name=SECURITY_LOG_LEVEL)
   protected int checkSecurityLogLevel(int value) {
     if (value < MIN_LOG_LEVEL) {
       throw new IllegalArgumentException(
         LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_LESS_THAN_2.toLocalizedString(
           new Object[] {
-              SECURITY_LOG_LEVEL_NAME,
+              SECURITY_LOG_LEVEL,
               LogWriterImpl.levelToString(value),
               LogWriterImpl.levelToString(MIN_LOG_LEVEL)}));
     }
@@ -441,7 +441,7 @@ public abstract class AbstractDistributionConfig
       throw new IllegalArgumentException(
         LocalizedStrings.AbstractDistributionConfig_COULD_NOT_SET_0_TO_1_BECAUSE_ITS_VALUE_CAN_NOT_BE_GREATER_THAN_2.toLocalizedString(
         new Object[] {
-            SECURITY_LOG_LEVEL_NAME,
+            SECURITY_LOG_LEVEL,
             LogWriterImpl.levelToString(value),
             LogWriterImpl.levelToString(MAX_LOG_LEVEL)}));
     }
@@ -449,7 +449,7 @@ public abstract class AbstractDistributionConfig
   }
 
 
-  @ConfigAttributeChecker(name=MEMCACHED_PROTOCOL_NAME)
+  @ConfigAttributeChecker(name=MEMCACHED_PROTOCOL)
   protected String checkMemcachedProtocol(String protocol) {
     if (protocol == null
         || (!protocol.equalsIgnoreCase(GemFireMemcachedServer.Protocol.ASCII.name()) &&
@@ -464,7 +464,7 @@ public abstract class AbstractDistributionConfig
     return false;
   }
 
-  @ConfigAttributeChecker(name=MEMCACHED_BIND_ADDRESS_NAME)
+  @ConfigAttributeChecker(name=MEMCACHED_BIND_ADDRESS)
   protected String checkMemcachedBindAddress(String value) {
     if (value != null && value.length() > 0 &&
         !SocketCreator.isLocalHost(value)) {
@@ -476,7 +476,7 @@ public abstract class AbstractDistributionConfig
     return value;
   }
 
-  @ConfigAttributeChecker(name=REDIS_BIND_ADDRESS_NAME)
+  @ConfigAttributeChecker(name=REDIS_BIND_ADDRESS)
   protected String checkRedisBindAddress(String value) {
     if (value != null && value.length() > 0 &&
             !SocketCreator.isLocalHost(value)) {
@@ -492,7 +492,7 @@ public abstract class AbstractDistributionConfig
 
   @Override
   protected void checkAttributeName(String attName) {
-    if(!attName.startsWith(SECURITY_PREFIX_NAME) && !attName.startsWith(USERDEFINED_PREFIX_NAME)
+    if(!attName.startsWith(SECURITY_PREFIX) && !attName.startsWith(USERDEFINED_PREFIX_NAME)
         && !attName.startsWith(SSL_SYSTEM_PROPS_NAME) && !attName.startsWith(SYS_PROP_NAME)) {
       super.checkAttributeName(attName);
     }
@@ -518,13 +518,13 @@ public abstract class AbstractDistributionConfig
     }
 
     // special case: log-level and security-log-level attributes are String type, but the setter accepts int
-    if(attName.equalsIgnoreCase(LOG_LEVEL_NAME) || attName.equalsIgnoreCase(SECURITY_LOG_LEVEL_NAME)){
+    if(attName.equalsIgnoreCase(LOG_LEVEL) || attName.equalsIgnoreCase(SECURITY_LOG_LEVEL)){
       if(attValue instanceof String) {
         attValue = LogWriterImpl.levelNameToCode((String) attValue);
       }
     }
 
-    if (attName.startsWith(SECURITY_PREFIX_NAME)) {
+    if (attName.startsWith(SECURITY_PREFIX)) {
       this.setSecurity(attName,attValue.toString());
     }
 
@@ -536,7 +536,7 @@ public abstract class AbstractDistributionConfig
     if (setter == null) {
       // if we cann't find the defined setter, but the attributeName starts with these special characters
       // since we already set it in the respecitive properties above, we need to set the source then return
-      if (attName.startsWith(SECURITY_PREFIX_NAME) ||
+      if (attName.startsWith(SECURITY_PREFIX) ||
         attName.startsWith(SSL_SYSTEM_PROPS_NAME) ||
         attName.startsWith(SYS_PROP_NAME)) {
         getAttSourceMap().put(attName, source);
@@ -570,17 +570,17 @@ public abstract class AbstractDistributionConfig
     checkAttributeName(attName);
 
     // special case:
-    if (attName.equalsIgnoreCase(LOG_LEVEL_NAME)) {
+    if (attName.equalsIgnoreCase(LOG_LEVEL)) {
       return LogWriterImpl.levelToString(this.getLogLevel());
     }
 
-    if (attName.equalsIgnoreCase(SECURITY_LOG_LEVEL_NAME)) {
+    if (attName.equalsIgnoreCase(SECURITY_LOG_LEVEL)) {
       return LogWriterImpl.levelToString(this.getSecurityLogLevel());
     }
 
     Method getter = getters.get(attName);
     if(getter==null) {
-      if (attName.startsWith(SECURITY_PREFIX_NAME)) {
+      if (attName.startsWith(SECURITY_PREFIX)) {
         return this.getSecurity(attName);
       }
       throw new InternalGemFireException(LocalizedStrings.AbstractDistributionConfig_UNHANDLED_ATTRIBUTE_NAME_0.toLocalizedString(attName));
@@ -619,7 +619,7 @@ public abstract class AbstractDistributionConfig
    * @return an empty list
      */
   public List<String> getModifiableAttributes(){
-    String[] modifiables = {HTTP_SERVICE_PORT_NAME,JMX_MANAGER_HTTP_PORT_NAME};
+    String[] modifiables = {HTTP_SERVICE_PORT,JMX_MANAGER_HTTP_PORT_NAME};
     return Arrays.asList(modifiables);
   };
 
@@ -641,7 +641,7 @@ public abstract class AbstractDistributionConfig
   public static Class _getAttributeType(String attName) {
     ConfigAttribute ca = attributes.get(attName);
     if(ca==null){
-      if(attName.startsWith(SECURITY_PREFIX_NAME) || attName.startsWith(SSL_SYSTEM_PROPS_NAME) || attName.startsWith(SYS_PROP_NAME) ){
+      if(attName.startsWith(SECURITY_PREFIX) || attName.startsWith(SSL_SYSTEM_PROPS_NAME) || attName.startsWith(SYS_PROP_NAME) ){
         return String.class;
       }
       throw new InternalGemFireException(LocalizedStrings.AbstractDistributionConfig_UNHANDLED_ATTRIBUTE_NAME_0.toLocalizedString(attName));
@@ -653,58 +653,58 @@ public abstract class AbstractDistributionConfig
   static {
     Map<String, String> m =  new HashMap<String, String>();
 
-    m.put(ACK_WAIT_THRESHOLD_NAME, 
+    m.put(ACK_WAIT_THRESHOLD,
       LocalizedStrings.AbstractDistributionConfig_DEFAULT_ACK_WAIT_THRESHOLD_0_1_2
       .toLocalizedString( new Object[] { 
           Integer.valueOf(DEFAULT_ACK_WAIT_THRESHOLD),
           Integer.valueOf(MIN_ACK_WAIT_THRESHOLD),
           Integer.valueOf(MIN_ACK_WAIT_THRESHOLD)}));
 
-    m.put(ARCHIVE_FILE_SIZE_LIMIT_NAME, 
+    m.put(ARCHIVE_FILE_SIZE_LIMIT,
       LocalizedStrings.AbstractDistributionConfig_ARCHIVE_FILE_SIZE_LIMIT_NAME
         .toLocalizedString());
 
-    m.put(ACK_SEVERE_ALERT_THRESHOLD_NAME, 
+    m.put(ACK_SEVERE_ALERT_THRESHOLD,
       LocalizedStrings.AbstractDistributionConfig_ACK_SEVERE_ALERT_THRESHOLD_NAME
         .toLocalizedString( 
-           new Object[] { ACK_WAIT_THRESHOLD_NAME, 
+           new Object[] { ACK_WAIT_THRESHOLD,
                           Integer.valueOf(DEFAULT_ACK_SEVERE_ALERT_THRESHOLD),
                           Integer.valueOf(MIN_ACK_SEVERE_ALERT_THRESHOLD),
                           Integer.valueOf(MAX_ACK_SEVERE_ALERT_THRESHOLD)}));
 
-    m.put(ARCHIVE_DISK_SPACE_LIMIT_NAME,
+    m.put(ARCHIVE_DISK_SPACE_LIMIT,
       LocalizedStrings.AbstractDistributionConfig_ARCHIVE_DISK_SPACE_LIMIT_NAME
         .toLocalizedString());
 
-    m.put(CACHE_XML_FILE_NAME, 
+    m.put(CACHE_XML_FILE,
       LocalizedStrings.AbstractDistributionConfig_CACHE_XML_FILE_NAME_0
         .toLocalizedString( DEFAULT_CACHE_XML_FILE ));
 
-    m.put(DISABLE_TCP_NAME, 
+    m.put(DISABLE_TCP,
       LocalizedStrings.AbstractDistributionConfig_DISABLE_TCP_NAME_0
         .toLocalizedString(Boolean.valueOf(DEFAULT_DISABLE_TCP)));
 
-    m.put(ENABLE_TIME_STATISTICS_NAME, 
+    m.put(ENABLE_TIME_STATISTICS,
       LocalizedStrings.AbstractDistributionConfig_ENABLE_TIME_STATISTICS_NAME
         .toLocalizedString());
 
-    m.put(DEPLOY_WORKING_DIR, 
+    m.put(SystemConfigurationProperties.DEPLOY_WORKING_DIR,
         LocalizedStrings.AbstractDistributionConfig_DEPLOY_WORKING_DIR_0 
           .toLocalizedString(DEFAULT_DEPLOY_WORKING_DIR));
 
-    m.put(LOG_FILE_NAME, 
+    m.put(LOG_FILE,
       LocalizedStrings.AbstractDistributionConfig_LOG_FILE_NAME_0
         .toLocalizedString(DEFAULT_LOG_FILE));
 
-    m.put(LOG_LEVEL_NAME,
+    m.put(LOG_LEVEL,
       LocalizedStrings.AbstractDistributionConfig_LOG_LEVEL_NAME_0_1 
         .toLocalizedString(new Object[] { LogWriterImpl.levelToString(DEFAULT_LOG_LEVEL), LogWriterImpl.allowedLogLevels()}));
 
-    m.put(LOG_FILE_SIZE_LIMIT_NAME,
+    m.put(LOG_FILE_SIZE_LIMIT,
       LocalizedStrings.AbstractDistributionConfig_LOG_FILE_SIZE_LIMIT_NAME
         .toLocalizedString());
 
-    m.put(LOG_DISK_SPACE_LIMIT_NAME, 
+    m.put(LOG_DISK_SPACE_LIMIT,
       LocalizedStrings.AbstractDistributionConfig_LOG_DISK_SPACE_LIMIT_NAME
         .toLocalizedString());
 
@@ -743,20 +743,20 @@ public abstract class AbstractDistributionConfig
           Integer.valueOf(MIN_MCAST_TTL),
           Integer.valueOf(MAX_MCAST_TTL)}));
 
-    m.put(MCAST_SEND_BUFFER_SIZE_NAME, 
+    m.put(MCAST_SEND_BUFFER_SIZE,
       LocalizedStrings.AbstractDistributionConfig_MCAST_SEND_BUFFER_SIZE_NAME_0
        .toLocalizedString(Integer.valueOf(DEFAULT_MCAST_SEND_BUFFER_SIZE)));
 
-    m.put(MCAST_RECV_BUFFER_SIZE_NAME, 
+    m.put(MCAST_RECV_BUFFER_SIZE,
       LocalizedStrings.AbstractDistributionConfig_MCAST_RECV_BUFFER_SIZE_NAME_0
        .toLocalizedString(Integer.valueOf(DEFAULT_MCAST_RECV_BUFFER_SIZE)));
 
-    m.put(MCAST_FLOW_CONTROL_NAME, 
+    m.put(MCAST_FLOW_CONTROL,
       LocalizedStrings.AbstractDistributionConfig_MCAST_FLOW_CONTROL_NAME_0
        .toLocalizedString(DEFAULT_MCAST_FLOW_CONTROL));
 
-    m.put(MEMBER_TIMEOUT_NAME, 
-      LocalizedStrings.AbstractDistributionConfig_MEMBER_TIMEOUT_NAME_0
+    m.put(MEMBER_TIMEOUT,
+        LocalizedStrings.AbstractDistributionConfig_MEMBER_TIMEOUT_NAME_0
         .toLocalizedString(Integer.valueOf(DEFAULT_MEMBER_TIMEOUT)));
     
     // for some reason the default port range is null under some circumstances
@@ -764,40 +764,40 @@ public abstract class AbstractDistributionConfig
     String srange = range==null? "not available" : "" + range[0] + "-" + range[1];
     String msg = LocalizedStrings.AbstractDistributionConfig_MEMBERSHIP_PORT_RANGE_NAME_0
                           .toLocalizedString(srange); 
-    m.put(MEMBERSHIP_PORT_RANGE_NAME,
+    m.put(MEMBERSHIP_PORT_RANGE,
         msg);
 
-    m.put(UDP_SEND_BUFFER_SIZE_NAME, 
+    m.put(UDP_SEND_BUFFER_SIZE,
       LocalizedStrings.AbstractDistributionConfig_UDP_SEND_BUFFER_SIZE_NAME_0
        .toLocalizedString(Integer.valueOf(DEFAULT_UDP_SEND_BUFFER_SIZE)));
 
-    m.put(UDP_RECV_BUFFER_SIZE_NAME, 
+    m.put(UDP_RECV_BUFFER_SIZE,
       LocalizedStrings.AbstractDistributionConfig_UDP_RECV_BUFFER_SIZE_NAME_0
        .toLocalizedString(Integer.valueOf(DEFAULT_UDP_RECV_BUFFER_SIZE)));
 
-    m.put(UDP_FRAGMENT_SIZE_NAME, 
+    m.put(UDP_FRAGMENT_SIZE,
       LocalizedStrings.AbstractDistributionConfig_UDP_FRAGMENT_SIZE_NAME_0
        .toLocalizedString(Integer.valueOf(DEFAULT_UDP_FRAGMENT_SIZE)));
 
-    m.put(SOCKET_LEASE_TIME_NAME, 
+    m.put(SOCKET_LEASE_TIME,
       LocalizedStrings.AbstractDistributionConfig_SOCKET_LEASE_TIME_NAME_0_1_2
        .toLocalizedString(new Object[] { 
            Integer.valueOf(DEFAULT_SOCKET_LEASE_TIME),
            Integer.valueOf(MIN_SOCKET_LEASE_TIME), 
            Integer.valueOf(MAX_SOCKET_LEASE_TIME)}));
  
-    m.put(SOCKET_BUFFER_SIZE_NAME, 
+    m.put(SOCKET_BUFFER_SIZE,
       LocalizedStrings.AbstractDistributionConfig_SOCKET_BUFFER_SIZE_NAME_0_1_2
         .toLocalizedString(new Object[] {
            Integer.valueOf(DEFAULT_SOCKET_BUFFER_SIZE),
            Integer.valueOf(MIN_SOCKET_BUFFER_SIZE),
            Integer.valueOf(MAX_SOCKET_BUFFER_SIZE)}));
 
-    m.put(CONSERVE_SOCKETS_NAME, 
+    m.put(CONSERVE_SOCKETS,
       LocalizedStrings.AbstractDistributionConfig_CONSERVE_SOCKETS_NAME_0
         .toLocalizedString(Boolean.valueOf(DEFAULT_CONSERVE_SOCKETS)));
 
-    m.put(ROLES_NAME,
+    m.put(ROLES,
       LocalizedStrings.AbstractDistributionConfig_ROLES_NAME_0
         .toLocalizedString(DEFAULT_ROLES));
 
@@ -813,76 +813,76 @@ public abstract class AbstractDistributionConfig
         " Multiple members in the same distributed system can not have the same name." +
         " Defaults to \"\".");
 
-    m.put(STATISTIC_ARCHIVE_FILE_NAME, 
+    m.put(STATISTIC_ARCHIVE_FILE,
       LocalizedStrings.AbstractDistributionConfig_STATISTIC_ARCHIVE_FILE_NAME_0
         .toLocalizedString(DEFAULT_STATISTIC_ARCHIVE_FILE));
    
-    m.put(STATISTIC_SAMPLE_RATE_NAME, 
+    m.put(STATISTIC_SAMPLE_RATE,
       LocalizedStrings.AbstractDistributionConfig_STATISTIC_SAMPLE_RATE_NAME_0_1_2
         .toLocalizedString(new Object[] {
            Integer.valueOf(DEFAULT_STATISTIC_SAMPLE_RATE),
            Integer.valueOf(MIN_STATISTIC_SAMPLE_RATE),
            Integer.valueOf(MAX_STATISTIC_SAMPLE_RATE)}));
  
-    m.put(STATISTIC_SAMPLING_ENABLED_NAME, 
+    m.put(STATISTIC_SAMPLING_ENABLED,
       LocalizedStrings.AbstractDistributionConfig_STATISTIC_SAMPLING_ENABLED_NAME_0
         .toLocalizedString(
            Boolean.valueOf(DEFAULT_STATISTIC_SAMPLING_ENABLED)));
 
-    m.put(SSL_ENABLED_NAME, 
+    m.put(SSL_ENABLED,
       LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0
         .toLocalizedString(
            Boolean.valueOf(DEFAULT_SSL_ENABLED)));
 
-    m.put(SSL_PROTOCOLS_NAME, 
+    m.put(SSL_PROTOCOLS,
       LocalizedStrings.AbstractDistributionConfig_SSL_PROTOCOLS_NAME_0
         .toLocalizedString(DEFAULT_SSL_PROTOCOLS));
 
-    m.put(SSL_CIPHERS_NAME, 
+    m.put(SSL_CIPHERS,
       LocalizedStrings.AbstractDistributionConfig_SSL_CIPHERS_NAME_0
         .toLocalizedString(DEFAULT_SSL_CIPHERS));
 
-    m.put(SSL_REQUIRE_AUTHENTICATION_NAME, 
+    m.put(SSL_REQUIRE_AUTHENTICATION,
       LocalizedStrings.AbstractDistributionConfig_SSL_REQUIRE_AUTHENTICATION_NAME
         .toLocalizedString(Boolean.valueOf(DEFAULT_SSL_REQUIRE_AUTHENTICATION)));
     
-    m.put(CLUSTER_SSL_ENABLED_NAME, 
+    m.put(CLUSTER_SSL_ENABLED,
         LocalizedStrings.AbstractDistributionConfig_SSL_ENABLED_NAME_0
           .toLocalizedString(
              Boolean.valueOf(DEFAULT_CLUSTER_SSL_ENABLED)));
 
-    m.put(CLUSTER_SSL_PROTOCOLS_NAME, 
+    m.put(CLUSTER_SSL_PROTOCOLS,
         LocalizedStrings.AbstractDistributionConfig_SSL_PROTOCOLS_NAME_0
           .toLocalizedString(DEFAULT_CLUSTER_SSL_PROTOCOLS));
 
-    m.put(CLUSTER_SSL_CIPHERS_NAME, 
+    m.put(CLUSTER_SSL_CIPHERS,
         LocalizedStrings.AbstractDistributionConfig_SSL_CIPHERS_NAME_0
           .toLocalizedString(DEFAULT_CLUSTER_SSL_CIPHERS));
 
-    m.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, 
+    m.put(CLUSTER_SSL_REQUIRE_AUTHENTICATION,
         LocalizedStrings.AbstractDistributionConfig_SSL_REQUIRE_AUTHENTICATION_NAME
           .toLocalizedString(Boolean.valueOf(DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION)));
     
-    m.put(CLUSTER_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing an distributed member's own certificate and private key.");
+    m.put(CLUSTER_SSL_KEYSTORE,"Location of the Java keystore file containing an distributed member's own certificate and private key.");
 
-    m.put(CLUSTER_SSL_KEYSTORE_TYPE_NAME, 
+    m.put(CLUSTER_SSL_KEYSTORE_TYPE,
         "For Java keystore file format, this property has the value jks (or JKS).");
 
-    m.put(CLUSTER_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
+    m.put(CLUSTER_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
 
-    m.put(CLUSTER_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by distributed member (trust store).");
+    m.put(CLUSTER_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by distributed member (trust store).");
     
-    m.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
+    m.put(CLUSTER_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
     
-    m.put(MAX_WAIT_TIME_FOR_RECONNECT_NAME, 
+    m.put(MAX_WAIT_TIME_RECONNECT,
       LocalizedStrings.AbstractDistributionConfig_MAX_WAIT_TIME_FOR_RECONNECT
         .toLocalizedString());
 
-    m.put(MAX_NUM_RECONNECT_TRIES, 
+    m.put(MAX_NUM_RECONNECT_TRIES,
       LocalizedStrings.AbstractDistributionConfig_MAX_NUM_RECONNECT_TRIES
         .toLocalizedString());
 
-    m.put(ASYNC_DISTRIBUTION_TIMEOUT_NAME,
+    m.put(ASYNC_DISTRIBUTION_TIMEOUT,
       LocalizedStrings.AbstractDistributionConfig_ASYNC_DISTRIBUTION_TIMEOUT_NAME_0_1_2
         .toLocalizedString( new Object[] {
             Integer.valueOf(DEFAULT_ASYNC_DISTRIBUTION_TIMEOUT),
@@ -890,14 +890,14 @@ public abstract class AbstractDistributionConfig
             Integer.valueOf(MAX_ASYNC_DISTRIBUTION_TIMEOUT)}));
         
 
-    m.put(ASYNC_QUEUE_TIMEOUT_NAME,
+    m.put(ASYNC_QUEUE_TIMEOUT,
       LocalizedStrings.AbstractDistributionConfig_ASYNC_QUEUE_TIMEOUT_NAME_0_1_2   
         .toLocalizedString( new Object[] {
           Integer.valueOf(DEFAULT_ASYNC_QUEUE_TIMEOUT),
           Integer.valueOf(MIN_ASYNC_QUEUE_TIMEOUT),
           Integer.valueOf(MAX_ASYNC_QUEUE_TIMEOUT)}));
     
-    m.put(ASYNC_MAX_QUEUE_SIZE_NAME,
+    m.put(ASYNC_MAX_QUEUE_SIZE,
       LocalizedStrings.AbstractDistributionConfig_ASYNC_MAX_QUEUE_SIZE_NAME_0_1_2   
         .toLocalizedString( new Object[] {
           Integer.valueOf(DEFAULT_ASYNC_MAX_QUEUE_SIZE),
@@ -908,65 +908,65 @@ public abstract class AbstractDistributionConfig
       LocalizedStrings.AbstractDistributionConfig_START_LOCATOR_NAME
         .toLocalizedString());
 
-    m.put(DURABLE_CLIENT_ID_NAME, 
+    m.put(DURABLE_CLIENT_ID,
       LocalizedStrings.AbstractDistributionConfig_DURABLE_CLIENT_ID_NAME_0
         .toLocalizedString(DEFAULT_DURABLE_CLIENT_ID));
 
-    m.put(CLIENT_CONFLATION_PROP_NAME, 
+    m.put(CONFLATE_EVENTS,
       LocalizedStrings.AbstractDistributionConfig_CLIENT_CONFLATION_PROP_NAME
         .toLocalizedString());
     
-    m.put(DURABLE_CLIENT_TIMEOUT_NAME, 
+    m.put(DURABLE_CLIENT_TIMEOUT,
       LocalizedStrings.AbstractDistributionConfig_DURABLE_CLIENT_TIMEOUT_NAME_0
         .toLocalizedString(Integer.valueOf(DEFAULT_DURABLE_CLIENT_TIMEOUT)));
 
-    m.put(SECURITY_CLIENT_AUTH_INIT_NAME, 
+    m.put(SECURITY_CLIENT_AUTH_INIT,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_AUTH_INIT_NAME_0
         .toLocalizedString(DEFAULT_SECURITY_CLIENT_AUTH_INIT));
     
-    m.put(ENABLE_NETWORK_PARTITION_DETECTION_NAME, "Whether network partitioning detection is enabled");
+    m.put(ENABLE_NETWORK_PARTITION_DETECTION, "Whether network partitioning detection is enabled");
     
-    m.put(DISABLE_AUTO_RECONNECT_NAME, "Whether auto reconnect is attempted after a network partition");
+    m.put(DISABLE_AUTO_RECONNECT, "Whether auto reconnect is attempted after a network partition");
 
-    m.put(SECURITY_CLIENT_AUTHENTICATOR_NAME, 
+    m.put(SECURITY_CLIENT_AUTHENTICATOR,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_AUTHENTICATOR_NAME_0
         .toLocalizedString(DEFAULT_SECURITY_CLIENT_AUTHENTICATOR));
 
-    m.put(SECURITY_CLIENT_DHALGO_NAME, 
+    m.put(SECURITY_CLIENT_DHALGO,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_DHALGO_NAME_0
         .toLocalizedString(DEFAULT_SECURITY_CLIENT_DHALGO));
 
-    m.put(SECURITY_PEER_AUTH_INIT_NAME, 
+    m.put(SECURITY_PEER_AUTH_INIT,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_AUTH_INIT_NAME_0
         .toLocalizedString(DEFAULT_SECURITY_PEER_AUTH_INIT));
 
-    m.put(SECURITY_PEER_AUTHENTICATOR_NAME, 
+    m.put(SECURITY_PEER_AUTHENTICATOR,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_AUTHENTICATOR_NAME_0
         .toLocalizedString(DEFAULT_SECURITY_PEER_AUTHENTICATOR));
 
-    m.put(SECURITY_CLIENT_ACCESSOR_NAME,
+    m.put(SECURITY_CLIENT_ACCESSOR,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_ACCESSOR_NAME_0
         .toLocalizedString(DEFAULT_SECURITY_CLIENT_ACCESSOR));
 
-    m.put(SECURITY_CLIENT_ACCESSOR_PP_NAME, 
+    m.put(SECURITY_CLIENT_ACCESSOR_PP,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_CLIENT_ACCESSOR_PP_NAME_0
         .toLocalizedString(DEFAULT_SECURITY_CLIENT_ACCESSOR_PP));
 
-    m.put(SECURITY_LOG_LEVEL_NAME, 
+    m.put(SECURITY_LOG_LEVEL,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_LOG_LEVEL_NAME_0_1
         .toLocalizedString( new Object[] {
            LogWriterImpl.levelToString(DEFAULT_LOG_LEVEL), 
            LogWriterImpl.allowedLogLevels()}));
 
-    m.put(SECURITY_LOG_FILE_NAME, 
+    m.put(SECURITY_LOG_FILE,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_LOG_FILE_NAME_0
         .toLocalizedString(DEFAULT_SECURITY_LOG_FILE));
 
-    m.put(SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME, 
+    m.put(SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME_0
 	.toLocalizedString(Integer.valueOf(DEFAULT_SECURITY_PEER_VERIFYMEMBER_TIMEOUT)));
 
-    m.put(SECURITY_PREFIX_NAME,
+    m.put(SECURITY_PREFIX,
       LocalizedStrings.AbstractDistributionConfig_SECURITY_PREFIX_NAME
         .toLocalizedString());
 
@@ -974,156 +974,156 @@ public abstract class AbstractDistributionConfig
         LocalizedStrings.AbstractDistributionConfig_USERDEFINED_PREFIX_NAME
           .toLocalizedString());
 
-    m.put(REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME, 
+    m.put(REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME,
         LocalizedStrings.AbstractDistributionConfig_REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME_0
           .toLocalizedString(DEFAULT_REMOVE_UNRESPONSIVE_CLIENT));
 
     m.put(DELTA_PROPAGATION_PROP_NAME, "Whether delta propagation is enabled");
     
-    m.put(REMOTE_LOCATORS_NAME, 
+    m.put(REMOTE_LOCATORS,
         LocalizedStrings.AbstractDistributionConfig_REMOTE_DISTRIBUTED_SYSTEMS_NAME_0
           .toLocalizedString(DEFAULT_REMOTE_LOCATORS));
 
-    m.put(DISTRIBUTED_SYSTEM_ID_NAME, "An id that uniquely idenitifies this distributed system. " +
+    m.put(DISTRIBUTED_SYSTEM_ID, "An id that uniquely idenitifies this distributed system. " +
         "Required when using portable data exchange objects and the WAN." +
     		"Must be the same on each member in this distributed system if set.");
     m.put(ENFORCE_UNIQUE_HOST_NAME, "Whether to require partitioned regions to put " +
     		"redundant copies of data on different physical machines");
     
-    m.put(REDUNDANCY_ZONE_NAME, "The zone that this member is in. When this is set, " +
+    m.put(REDUNDANCY_ZONE, "The zone that this member is in. When this is set, " +
     		"partitioned regions will not put two copies of the same data in the same zone.");
 
-    m.put(GROUPS_NAME, "A comma separated list of all the groups this member belongs to." +
+    m.put(GROUPS, "A comma separated list of all the groups this member belongs to." +
         " Defaults to \"\".");
     
-    m.put(USER_COMMAND_PACKAGES, "A comma separated list of the names of the packages containing classes that implement user commands.");
+    m.put(SystemConfigurationProperties.USER_COMMAND_PACKAGES, "A comma separated list of the names of the packages containing classes that implement user commands.");
     
-    m.put(JMX_MANAGER_NAME, "If true then this member is willing to be a jmx manager. Defaults to false except on a locator.");
-    m.put(JMX_MANAGER_START_NAME, "If true then the jmx manager will be started when the cache is created. Defaults to false.");
-    m.put(JMX_MANAGER_SSL_NAME, "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_NAME, "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_NAME, "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_NAME, "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.");
-    m.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME, "If set to false, ciphers and protocols that permit anonymous JMX Clients are allowed. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION+"\".");
-    m.put(JMX_MANAGER_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing jmx manager's own certificate and private key.");
-    m.put(JMX_MANAGER_SSL_KEYSTORE_TYPE_NAME, "For Java keystore file format, this property has the value jks (or JKS).");
-    m.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
-    m.put(JMX_MANAGER_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by jmx manager.");
-    m.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
+    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.");
+    m.put(JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION, "If set to false, ciphers and protocols that permit anonymous JMX Clients are allowed. Defaults to \""+DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION+"\".");
+    m.put(JMX_MANAGER_SSL_KEYSTORE,"Location of the Java keystore file containing jmx manager's own certificate and private key.");
+    m.put(JMX_MANAGER_SSL_KEYSTORE_TYPE, "For Java keystore file format, this property has the value jks (or JKS).");
+    m.put(JMX_MANAGER_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
+    m.put(JMX_MANAGER_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by jmx manager.");
+    m.put(JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
     
-    m.put(JMX_MANAGER_PORT_NAME, "The port the jmx manager will listen on. Default is \"" + DEFAULT_JMX_MANAGER_PORT + "\". Set to zero to disable GemFire's creation of a jmx listening port.");
-    m.put(JMX_MANAGER_BIND_ADDRESS_NAME, "The address the jmx manager will listen on for remote connections. Default is \"\" which causes the jmx manager to listen on the host's default address. This property is ignored if jmx-manager-port is \"0\".");
-    m.put(JMX_MANAGER_HOSTNAME_FOR_CLIENTS_NAME, "The hostname that will be given to clients when they ask a locator for the location of this jmx manager. Default is \"\" which causes the locator to report the jmx manager's actual ip address as its location. This property is ignored if jmx-manager-port is \"0\".");
-    m.put(JMX_MANAGER_PASSWORD_FILE_NAME, "The name of the file the jmx manager will use to only allow authenticated clients to connect. Default is \"\" which causes the jmx manager to allow all clients to connect. This property is ignored if jmx-manager-port is \"0\".");
-    m.put(JMX_MANAGER_ACCESS_FILE_NAME, "The name of the file the jmx manager will use to define the access level of authenticated clients. Default is \"\" which causes the jmx manager to allow all clients all access. This property is ignored if jmx-manager-port is \"0\".");
-    m.put(JMX_MANAGER_HTTP_PORT_NAME, "By default when a jmx-manager is started it will also start an http server on this port. This server is used by the GemFire Pulse application. Setting this property to zero disables the http server. It defaults to 8080. Ignored if jmx-manager is false.");
-    m.put(JMX_MANAGER_UPDATE_RATE_NAME, "The rate in milliseconds at which this member will send updates to each jmx manager. Default is " + DEFAULT_JMX_MANAGER_UPDATE_RATE + ". Values must be in the range " + MIN_JMX_MANAGER_UPDATE_RATE + ".." + MAX_JMX_MANAGER_UPDATE_RATE + ".");
-    m.put(MEMCACHED_PORT_NAME, "The port GemFireMemcachedServer will listen on. Default is 0. Set to zero to disable GemFireMemcachedServer.");
-    m.put(MEMCACHED_PROTOCOL_NAME, "The protocol that GemFireMemcachedServer understands. Default is ASCII. Values may be ASCII or BINARY");
-    m.put(MEMCACHED_BIND_ADDRESS_NAME, "The address the GemFireMemcachedServer will listen on for remote connections. Default is \"\" which causes the GemFireMemcachedServer to listen on the host's default address. This property is ignored if memcached-port is \"0\".");
-    m.put(REDIS_PORT_NAME, "The port GemFireRedisServer will listen on. Default is 0. Set to zero to disable GemFireRedisServer.");
-    m.put(REDIS_BIND_ADDRESS_NAME, "The address the GemFireRedisServer will listen on for remote connections. Default is \"\" which causes the GemFireRedisServer to listen on the host's default address. This property is ignored if redis-port is \"0\".");
-    m.put(REDIS_PASSWORD_NAME, "The password which client of GemFireRedisServer must use to authenticate themselves. The default is none and no authentication will be required.");
-    m.put(ENABLE_CLUSTER_CONFIGURATION_NAME, LocalizedStrings.AbstractDistributionConfig_ENABLE_SHARED_CONFIGURATION.toLocalizedString());
-    m.put(USE_CLUSTER_CONFIGURATION_NAME, LocalizedStrings.AbstractDistributionConfig_USE_SHARED_CONFIGURATION.toLocalizedString());
-    m.put(LOAD_CLUSTER_CONFIG_FROM_DIR_NAME, LocalizedStrings.AbstractDistributionConfig_LOAD_SHARED_CONFIGURATION_FROM_DIR.toLocalizedString(SharedConfiguration.CLUSTER_CONFIG_ARTIFACTS_DIR_NAME));
+    m.put(JMX_MANAGER_PORT, "The port the jmx manager will listen on. Default is \"" + DEFAULT_JMX_MANAGER_PORT + "\". Set to zero to disable GemFire's creation of a jmx listening port.");
+    m.put(JMX_MANAGER_BIND_ADDRESS, "The address the jmx manager will listen on for remote connections. Default is \"\" which causes the jmx manager to listen on the host's default address. This property is ignored if jmx-manager-port is \"0\".");
+    m.put(JMX_MANAGER_HOSTNAME_FOR_CLIENTS, "The hostname that will be given to clients when they ask a locator for the location of this jmx manager. Default is \"\" which causes the locator to report the jmx manager's actual ip address as its location. This property is ignored if jmx-manager-port is \"0\".");
+    m.put(JMX_MANAGER_PASSWORD_FILE, "The name of the file the jmx manager will use to only allow authenticated clients to connect. Default is \"\" which causes the jmx manager to allow all clients to connect. This property is ignored if jmx-manager-port is \"0\".");
+    m.put(JMX_MANAGER_ACCESS_FILE, "The name of the file the jmx manager will use to define the access level of authenticated clients. Default is \"\" which causes the jmx manager to allow all clients all access. This property is ignored if jmx-manager-port is \"0\".");
+    m.put(JMX_MANAGER_HTTP_PORT, "By default when a jmx-manager is started it will also start an http server on this port. This server is used by the GemFire Pulse application. Setting this property to zero disables the http server. It defaults to 8080. Ignored if jmx-manager is false.");
+    m.put(JMX_MANAGER_UPDATE_RATE, "The rate in milliseconds at which this member will send updates to each jmx manager. Default is " + DEFAULT_JMX_MANAGER_UPDATE_RATE + ". Values must be in the range " + MIN_JMX_MANAGER_UPDATE_RATE + ".." + MAX_JMX_MANAGER_UPDATE_RATE + ".");
+    m.put(MEMCACHED_PORT, "The port GemFireMemcachedServer will listen on. Default is 0. Set to zero to disable GemFireMemcachedServer.");
+    m.put(MEMCACHED_PROTOCOL, "The protocol that GemFireMemcachedServer understands. Default is ASCII. Values may be ASCII or BINARY");
+    m.put(MEMCACHED_BIND_ADDRESS, "The address the GemFireMemcachedServer will listen on for remote connections. Default is \"\" which causes the GemFireMemcachedServer to listen on the host's default address. This property is ignored if memcached-port is \"0\".");
+    m.put(REDIS_PORT, "The port GemFireRedisServer will listen on. Default is 0. Set to zero to disable GemFireRedisServer.");
+    m.put(REDIS_BIND_ADDRESS, "The address the GemFireRedisServer will listen on for remote connections. Default is \"\" which causes the GemFireRedisServer to listen on the host's default address. This property is ignored if redis-port is \"0\".");
+    m.put(REDIS_PASSWORD, "The password which client of GemFireRedisServer must use to authenticate themselves. The default is none and no authentication will be required.");
+    m.put(ENABLE_CLUSTER_CONFIGURATION, LocalizedStrings.AbstractDistributionConfig_ENABLE_SHARED_CONFIGURATION.toLocalizedString());
+    m.put(USE_CLUSTER_CONFIGURATION, LocalizedStrings.AbstractDistributionConfig_USE_SHARED_CONFIGURATION.toLocalizedString());
+    m.put(LOAD_CLUSTER_CONFIGURATION_FROM_DIR, LocalizedStrings.AbstractDistributionConfig_LOAD_SHARED_CONFIGURATION_FROM_DIR.toLocalizedString(SharedConfiguration.CLUSTER_CONFIG_ARTIFACTS_DIR_NAME));
     m.put(CLUSTER_CONFIGURATION_DIR, LocalizedStrings.AbstractDistributionConfig_CLUSTER_CONFIGURATION_DIR.toLocalizedString());
     m.put(
-        SERVER_SSL_ENABLED_NAME,
+        SERVER_SSL_ENABLED,
         "If true then the cache server will only allow SSL clients to connect. Defaults to false.");
     m.put(
-        SERVER_SSL_CIPHERS_NAME,
+        SERVER_SSL_CIPHERS,
         "List of available SSL cipher suites that are to be enabled for CacheServer. Defaults to \""
             + DEFAULT_SERVER_SSL_CIPHERS
             + "\" meaning your provider''s defaults.");
     m.put(
-        SERVER_SSL_PROTOCOLS_NAME,
+        SERVER_SSL_PROTOCOLS,
         "List of available SSL protocols that are to be enabled for CacheServer. Defaults to \""
             + DEFAULT_SERVER_SSL_PROTOCOLS
             + "\" meaning defaults of your provider.");
     m.put(
-        SERVER_SSL_REQUIRE_AUTHENTICATION_NAME,
+        SERVER_SSL_REQUIRE_AUTHENTICATION,
         "If set to false, ciphers and protocols that permit anonymous Clients are allowed. Defaults to \""
             + DEFAULT_SERVER_SSL_REQUIRE_AUTHENTICATION + "\".");
     
-    m.put(SERVER_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing server's or client's own certificate and private key.");
+    m.put(SERVER_SSL_KEYSTORE,"Location of the Java keystore file containing server's or client's own certificate and private key.");
 
-    m.put(SERVER_SSL_KEYSTORE_TYPE_NAME, 
+    m.put(SERVER_SSL_KEYSTORE_TYPE,
         "For Java keystore file format, this property has the value jks (or JKS).");
 
-    m.put(SERVER_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
+    m.put(SERVER_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore. ");
 
-    m.put(SERVER_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by server or client(trust store).");
+    m.put(SERVER_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by server or client(trust store).");
     
-    m.put(SERVER_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
+    m.put(SERVER_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
     
     m.put(
-        GATEWAY_SSL_ENABLED_NAME,
+        GATEWAY_SSL_ENABLED,
         "If true then the gateway receiver will only allow SSL gateway sender to connect. Defaults to false.");
     m.put(
-        GATEWAY_SSL_CIPHERS_NAME,
+        GATEWAY_SSL_CIPHERS,
         "List of available SSL cipher suites that are to be enabled for Gateway Receiver. Defaults to \""
             + DEFAULT_GATEWAY_SSL_CIPHERS
             + "\" meaning your provider''s defaults.");
     m.put(
-        GATEWAY_SSL_PROTOCOLS_NAME,
+        GATEWAY_SSL_PROTOCOLS,
         "List of available SSL protocols that are to be enabled for Gateway Receiver. Defaults to \""
             + DEFAULT_GATEWAY_SSL_PROTOCOLS
             + "\" meaning defaults of your provider.");
     m.put(
-        GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME,
+        GATEWAY_SSL_REQUIRE_AUTHENTICATION,
         "If set to false, ciphers and protocols that permit anonymous gateway senders are allowed. Defaults to \""
             + DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION + "\".");    
     
-    m.put(GATEWAY_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing gateway's own certificate and private key.");
+    m.put(GATEWAY_SSL_KEYSTORE,"Location of the Java keystore file containing gateway's own certificate and private key.");
 
-    m.put(GATEWAY_SSL_KEYSTORE_TYPE_NAME, 
+    m.put(GATEWAY_SSL_KEYSTORE_TYPE,
         "For Java keystore file format, this property has the value jks (or JKS).");
 
-    m.put(GATEWAY_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
+    m.put(GATEWAY_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
 
-    m.put(GATEWAY_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by gateway.");
+    m.put(GATEWAY_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by gateway.");
     
-    m.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
+    m.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
     
-    m.put(HTTP_SERVICE_PORT_NAME, "If non zero, then the gemfire developer REST service will be deployed and started when the cache is created. Default value is 0.");
-    m.put(HTTP_SERVICE_BIND_ADDRESS_NAME, "The address where gemfire developer REST service will listen for remote REST connections. Default is \"\" which causes the Rest service to listen on the host's default address.");
+    m.put(HTTP_SERVICE_PORT, "If non zero, then the gemfire developer REST service will be deployed and started when the cache is created. Default value is 0.");
+    m.put(HTTP_SERVICE_BIND_ADDRESS, "The address where gemfire developer REST service will listen for remote REST connections. Default is \"\" which causes the Rest service to listen on the host's default address.");
     
     m.put(
-        HTTP_SERVICE_SSL_ENABLED_NAME,
+        HTTP_SERVICE_SSL_ENABLED,
         "If true then the http service like REST dev api and Pulse will only allow SSL enabled clients to connect. Defaults to false.");
     m.put(
-        HTTP_SERVICE_SSL_CIPHERS_NAME,
+        HTTP_SERVICE_SSL_CIPHERS,
         "List of available SSL cipher suites that are to be enabled for Http Service. Defaults to \""
             + DEFAULT_HTTP_SERVICE_SSL_CIPHERS
             + "\" meaning your provider''s defaults.");
     m.put(
-        HTTP_SERVICE_SSL_PROTOCOLS_NAME,
+        HTTP_SERVICE_SSL_PROTOCOLS,
         "List of available SSL protocols that are to be enabled for Http Service. Defaults to \""
             + DEFAULT_HTTP_SERVICE_SSL_PROTOCOLS
             + "\" meaning defaults of your provider.");
     m.put(
-        HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME,
+        HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION,
         "If set to false, ciphers and protocols that permit anonymous http clients are allowed. Defaults to \""
             + DEFAULT_HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION + "\".");    
     
-    m.put(HTTP_SERVICE_SSL_KEYSTORE_NAME,"Location of the Java keystore file containing Http Service's own certificate and private key.");
+    m.put(HTTP_SERVICE_SSL_KEYSTORE,"Location of the Java keystore file containing Http Service's own certificate and private key.");
 
-    m.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, 
+    m.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE,
         "For Java keystore file format, this property has the value jks (or JKS).");
 
-    m.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
+    m.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD,"Password to access the private key from the keystore file specified by javax.net.ssl.keyStore.");
 
-    m.put(HTTP_SERVICE_SSL_TRUSTSTORE_NAME,"Location of the Java keystore file containing the collection of CA certificates trusted by Http Service.");
+    m.put(HTTP_SERVICE_SSL_TRUSTSTORE,"Location of the Java keystore file containing the collection of CA certificates trusted by Http Service.");
     
-    m.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
+    m.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD,"Password to unlock the keystore file (store password) specified by  javax.net.ssl.trustStore.");
     
-    m.put(START_DEV_REST_API_NAME, "If true then the developer(API) REST service will be started when the cache is created. Defaults to false.");
-    m.put(OFF_HEAP_MEMORY_SIZE_NAME, LocalizedStrings.AbstractDistributionConfig_OFF_HEAP_MEMORY_SIZE_0.toLocalizedString(DEFAULT_OFF_HEAP_MEMORY_SIZE));
-    m.put(LOCK_MEMORY_NAME, LocalizedStrings.AbstractDistributionConfig_LOCK_MEMORY.toLocalizedString(DEFAULT_LOCK_MEMORY));
-    m.put(DISTRIBUTED_TRANSACTIONS_NAME, "Flag to indicate whether all transactions including JTA should be distributed transactions.  Default is false, meaning colocated transactions.");
+    m.put(START_DEV_REST_API, "If true then the developer(API) REST service will be started when the cache is created. Defaults to false.");
+    m.put(OFF_HEAP_MEMORY_SIZE, LocalizedStrings.AbstractDistributionConfig_OFF_HEAP_MEMORY_SIZE_0.toLocalizedString(DEFAULT_OFF_HEAP_MEMORY_SIZE));
+    m.put(LOCK_MEMORY, LocalizedStrings.AbstractDistributionConfig_LOCK_MEMORY.toLocalizedString(DEFAULT_LOCK_MEMORY));
+    m.put(DISTRIBUTED_TRANSACTIONS, "Flag to indicate whether all transactions including JTA should be distributed transactions.  Default is false, meaning colocated transactions.");
 
-    m.put(SECURITY_SHIRO_INIT_NAME, "The name of the shiro configuration file in the classpath, e.g. shiro.ini");
+    m.put(SECURITY_SHIRO_INIT, "The name of the shiro configuration file in the classpath, e.g. shiro.ini");
 
     dcAttDescriptions = Collections.unmodifiableMap(m);
 


Mime
View raw message