geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [26/67] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public
Date Thu, 02 Jun 2016 00:08:12 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
index 7fda9f7..4aec26d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
@@ -85,6 +85,21 @@ import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManagerFactory;
+import java.io.*;
+import java.net.ConnectException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.security.KeyStore;
+import java.util.*;
+import java.util.Map.Entry;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+
 /**
  *
  * @since GemFire 7.0
@@ -310,8 +325,8 @@ public class ShellCommands implements CommandMarker {
           if (!sslConfigProps.containsKey(DistributionConfig.CLUSTER_SSL_ENABLED_NAME)) {
             sslConfigProps.put(DistributionConfig.SSL_ENABLED_NAME, String.valueOf(true));
           }
-          sslConfigProps.put(DistributionConfig.MCAST_PORT_NAME, String.valueOf(0));
-          sslConfigProps.put(DistributionConfig.LOCATORS_NAME, "");
+          sslConfigProps.put(MCAST_PORT, String.valueOf(0));
+          sslConfigProps.put(LOCATORS, "");
 
           String sslInfoLogMsg = "Connecting to Locator via SSL.";
           if (useSsl) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterRuntimeConfigFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterRuntimeConfigFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterRuntimeConfigFunction.java
index c031ca0..6b5fc75 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterRuntimeConfigFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/AlterRuntimeConfigFunction.java
@@ -16,10 +16,6 @@
  */
 package com.gemstone.gemfire.management.internal.cli.functions;
 
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.CacheFactory;
@@ -32,6 +28,10 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.management.internal.cli.CliUtil;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
 /****
  * 
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
index 04b9299..3dd0eb5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/ChangeLogLevelFunction.java
@@ -16,21 +16,20 @@
  */
 package com.gemstone.gemfire.management.internal.cli.functions;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.execute.Function;
 import com.gemstone.gemfire.cache.execute.FunctionContext;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.InternalEntity;
 import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.logging.LogWriterImpl;
 import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 import com.gemstone.gemfire.internal.logging.log4j.LogWriterLogger;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -57,7 +56,7 @@ public class ChangeLogLevelFunction implements Function, InternalEntity {
       final String logLevel = (String) args[0];
       Level log4jLevel = LogWriterLogger.logWriterNametoLog4jLevel(logLevel);
       logwriterLogger.setLevel(log4jLevel);
-      System.setProperty("gemfire.log-level", logLevel);
+      System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, logLevel);
       // LOG:CONFIG:
       logger.info(LogMarker.CONFIG, "GFSH Changed log level to {}", log4jLevel);
       result.put(cache.getDistributedSystem().getDistributedMember().getId(), "New log level is " + log4jLevel);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
index 5caacab..be511d9 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
@@ -16,19 +16,8 @@
  */
 package com.gemstone.gemfire.management.internal.cli.functions;
 
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.Declarable;
 import com.gemstone.gemfire.cache.execute.FunctionAdapter;
 import com.gemstone.gemfire.cache.execute.FunctionContext;
 import com.gemstone.gemfire.cache.server.CacheServer;
@@ -42,6 +31,10 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
 import com.gemstone.gemfire.management.internal.cli.domain.MemberConfigurationInfo;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.*;
+
 /****
  * 
  *
@@ -61,7 +54,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
     
     Cache cache = CacheFactory.getAnyInstance();
     InternalDistributedSystem system = (InternalDistributedSystem) cache.getDistributedSystem();
-    DistributionConfig  config = system.getConfig();
+    DistributionConfig config = system.getConfig();
     
     DistributionConfigImpl distConfigImpl = ((DistributionConfigImpl) config);
     MemberConfigurationInfo memberConfigInfo = new MemberConfigurationInfo();
@@ -117,7 +110,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
         cacheServerAttributes.put("message-time-to-live", Integer.toString(cacheServer.getMessageTimeToLive()));
         cacheServerAttributes.put("notify-by-subscription", Boolean.toString(cacheServer.getNotifyBySubscription()));
         cacheServerAttributes.put("port", Integer.toString(cacheServer.getPort()));
-        cacheServerAttributes.put("socket-buffer-size", Integer.toString(cacheServer.getSocketBufferSize()));
+        cacheServerAttributes.put(DistributionConfig.SOCKET_BUFFER_SIZE_NAME, Integer.toString(cacheServer.getSocketBufferSize()));
         cacheServerAttributes.put("load-poll-interval", Long.toString(cacheServer.getLoadPollInterval()));
         cacheServerAttributes.put("tcp-no-delay", Boolean.toString(cacheServer.getTcpNoDelay()));
 
@@ -167,7 +160,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
     csAttributesDefault.put("message-time-to-live", Integer.toString(CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE));
     csAttributesDefault.put("notify-by-subscription", Boolean.toString(CacheServer.DEFAULT_NOTIFY_BY_SUBSCRIPTION));
     csAttributesDefault.put("port", Integer.toString(CacheServer.DEFAULT_PORT));
-    csAttributesDefault.put("socket-buffer-size", Integer.toString(CacheServer.DEFAULT_SOCKET_BUFFER_SIZE));
+    csAttributesDefault.put(DistributionConfig.SOCKET_BUFFER_SIZE_NAME, Integer.toString(CacheServer.DEFAULT_SOCKET_BUFFER_SIZE));
     csAttributesDefault.put("load-poll-interval", Long.toString(CacheServer.DEFAULT_LOAD_POLL_INTERVAL));
     return csAttributesDefault;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberInformationFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberInformationFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberInformationFunction.java
index a3af1f7..e8d4efe 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberInformationFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberInformationFunction.java
@@ -16,14 +16,6 @@
  */
 package com.gemstone.gemfire.management.internal.cli.functions;
 
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.MemoryUsage;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.CacheFactory;
@@ -40,6 +32,13 @@ import com.gemstone.gemfire.management.internal.cli.CliUtil;
 import com.gemstone.gemfire.management.internal.cli.domain.CacheServerInfo;
 import com.gemstone.gemfire.management.internal.cli.domain.MemberInformation;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 /***
  * 
  * since 7.0
@@ -86,7 +85,7 @@ public class GetMemberInformationFunction extends FunctionAdapter implements Int
        */
 
       InternalDistributedSystem system = (InternalDistributedSystem) cache.getDistributedSystem();
-      DistributionConfig 	config = system.getConfig();
+      DistributionConfig config = system.getConfig();
       String 	serverBindAddress     = config.getServerBindAddress();
       MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
index 0e2508a..bf71373 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java
@@ -16,23 +16,20 @@
  */
 package com.gemstone.gemfire.management.internal.cli.help.utils;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.management.cli.CliMetaData;
+import com.gemstone.gemfire.management.internal.cli.help.format.*;
 import com.gemstone.gemfire.management.internal.cli.modes.CommandModes;
 import com.gemstone.gemfire.management.internal.cli.modes.CommandModes.CommandMode;
-import com.gemstone.gemfire.management.internal.cli.help.format.Block;
-import com.gemstone.gemfire.management.internal.cli.help.format.DataNode;
-import com.gemstone.gemfire.management.internal.cli.help.format.Help;
-import com.gemstone.gemfire.management.internal.cli.help.format.NewHelp;
-import com.gemstone.gemfire.management.internal.cli.help.format.Row;
 import com.gemstone.gemfire.management.internal.cli.parser.Argument;
 import com.gemstone.gemfire.management.internal.cli.parser.CommandTarget;
 import com.gemstone.gemfire.management.internal.cli.parser.Option;
 import com.gemstone.gemfire.management.internal.cli.parser.SyntaxConstants;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * @since GemFire 7.0
  */
@@ -77,7 +74,7 @@ public class HelpUtils {
   public static Help getHelp(CommandTarget commandTarget) {
     List<Block> blocks = new ArrayList<Block>();
     // First we will have the block for NAME of the command
-    blocks.add(block(NAME_NAME, row(commandTarget.getCommandName())));
+    blocks.add(block(SystemConfigurationProperties.NAME, row(commandTarget.getCommandName())));
     // Now add synonyms if any
     if (commandTarget.getSynonyms() != null) {
       blocks.add(block(SYNONYMS_NAME, row(commandTarget.getSynonyms())));
@@ -189,7 +186,7 @@ public class HelpUtils {
   public static NewHelp getNewHelp(CommandTarget commandTarget, boolean withinShell) {
     DataNode root = new DataNode(null, new ArrayList<DataNode>());
     // First we will have the block for NAME of the command
-    DataNode name = new DataNode(NAME_NAME, new ArrayList<DataNode>());
+    DataNode name = new DataNode(SystemConfigurationProperties.NAME, new ArrayList<DataNode>());
     name.addChild(new DataNode(commandTarget.getCommandName(), null));
     root.addChild(name);
     if (withinShell) {// include availabilty info

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
index 1a0f2ae..88a4044 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
@@ -16,15 +16,18 @@
  */
 package com.gemstone.gemfire.management.internal.cli.i18n;
 
-import java.text.MessageFormat;
-
 import com.gemstone.gemfire.cache.PartitionAttributesFactory;
 import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
 import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
 
+import java.text.MessageFormat;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**-*
  * Contains 'String' constants used as key to the Localized strings to be used
  * in classes under <code>com.gemstone.gemfire.management.internal.cli</code>
@@ -270,26 +273,26 @@ public class CliStrings {
   public static final String ALTER_RUNTIME_CONFIG__MEMBER__HELP = "Name/Id of the member in whose configuration will be altered.";
   public static final String ALTER_RUNTIME_CONFIG__GROUP = "group";
   public static final String ALTER_RUNTIME_CONFIG__GROUP__HELP = "Group of members whose configuration will be altered.";
-  public static final String ALTER_RUNTIME_CONFIG__ARCHIVE__FILE__SIZE__LIMIT = DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME;
+  public static final String ALTER_RUNTIME_CONFIG__ARCHIVE__FILE__SIZE__LIMIT = ARCHIVE_FILE_SIZE_LIMIT;
   public static final String ALTER_RUNTIME_CONFIG__ARCHIVE__FILE__SIZE__LIMIT__HELP = "Archive file size limit. Valid values are (in megabytes): "
       + DistributionConfig.MIN_ARCHIVE_FILE_SIZE_LIMIT + " - " + DistributionConfig.MAX_ARCHIVE_FILE_SIZE_LIMIT + ".";
-  public static final String ALTER_RUNTIME_CONFIG__ARCHIVE__DISK__SPACE__LIMIT = DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME;
+  public static final String ALTER_RUNTIME_CONFIG__ARCHIVE__DISK__SPACE__LIMIT = ARCHIVE_DISK_SPACE_LIMIT;
   public static final String ALTER_RUNTIME_CONFIG__ARCHIVE__DISK__SPACE__LIMIT__HELP = "Archive disk space limit. Valid values are (in megabytes): "
       + DistributionConfig.MIN_ARCHIVE_DISK_SPACE_LIMIT + " - " + DistributionConfig.MAX_ARCHIVE_DISK_SPACE_LIMIT + ".";
-  public static final String ALTER_RUNTIME_CONFIG__LOG__FILE__SIZE__LIMIT = DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME;
+  public static final String ALTER_RUNTIME_CONFIG__LOG__FILE__SIZE__LIMIT = LOG_FILE_SIZE_LIMIT;
   public static final String ALTER_RUNTIME_CONFIG__LOG__FILE__SIZE__LIMIT__HELP = "Log file size limit. Valid values are (in megabytes): "
       + DistributionConfig.MIN_LOG_FILE_SIZE_LIMIT + " - " + DistributionConfig.MAX_LOG_FILE_SIZE_LIMIT + ".";
-  public static final String ALTER_RUNTIME_CONFIG__LOG__DISK__SPACE__LIMIT = DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME;
+  public static final String ALTER_RUNTIME_CONFIG__LOG__DISK__SPACE__LIMIT = LOG_DISK_SPACE_LIMIT;
   public static final String ALTER_RUNTIME_CONFIG__LOG__DISK__SPACE__LIMIT__HELP = "Log disk space limit. Valid values are (in megabytes): "
       + DistributionConfig.MIN_LOG_DISK_SPACE_LIMIT + " - " + DistributionConfig.MAX_LOG_DISK_SPACE_LIMIT + ".";
-  public static final String ALTER_RUNTIME_CONFIG__LOG__LEVEL = DistributionConfig.LOG_LEVEL_NAME;
+  public static final String ALTER_RUNTIME_CONFIG__LOG__LEVEL = LOG_LEVEL;
   public static final String ALTER_RUNTIME_CONFIG__LOG__LEVEL__HELP = "Log level. Valid values are: none, error, info, config , warning, severe, fine, finer and finest.";
   public static final String ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLING__ENABLED = "enable-statistics";
   public static final String ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLING__ENABLED__HELP = "Whether statistic sampling should be enabled. Valid values are: true and false.";
-  public static final String ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLE__RATE = DistributionConfig.STATISTIC_SAMPLE_RATE_NAME;
+  public static final String ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLE__RATE = STATISTIC_SAMPLE_RATE;
   public static final String ALTER_RUNTIME_CONFIG__STATISTIC__SAMPLE__RATE__HELP = "Statistic sampling rate. Valid values are (in milliseconds): "
       + DistributionConfig.MIN_STATISTIC_SAMPLE_RATE + " - " + DistributionConfig.MAX_STATISTIC_SAMPLE_RATE + ".";
-  public static final String ALTER_RUNTIME_CONFIG__STATISTIC__ARCHIVE__FILE = DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME;
+  public static final String ALTER_RUNTIME_CONFIG__STATISTIC__ARCHIVE__FILE = STATISTIC_ARCHIVE_FILE;
   public static final String ALTER_RUNTIME_CONFIG__STATISTIC__ARCHIVE__FILE__HELP = "File to which the statistics will be written.";
   
   public static final String ALTER_RUNTIME_CONFIG__COPY__ON__READ = CacheXml.COPY_ON_READ;
@@ -360,7 +363,7 @@ public class CliStrings {
   /* connect command */
   public static final String CONNECT = "connect";
   public static final String CONNECT__HELP = "Connect to a jmx-manager either directly or via a Locator. If connecting via a Locator, and a jmx-manager doesn't already exist, the Locator will start one.";
-  public static final String CONNECT__JMX_MANAGER = "jmx-manager";
+  public static final String CONNECT__JMX_MANAGER = JMX_MANAGER;
   public static final String CONNECT__JMX_MANAGER__HELP = "Network address of the jmx-manager in the form: host[port].";
   public static final String CONNECT__LOCATOR = "locator";
   public static final String CONNECT__LOCATOR__HELP = "Network address of the Locator in the form: host[port].";
@@ -941,7 +944,7 @@ public class CliStrings {
   public static final String EXPORT_LOGS__GROUP = "group";
   public static final String EXPORT_LOGS__GROUP__HELP = "Group of members whose log files will be exported.";
   public static final String EXPORT_LOGS__MSG__CANNOT_EXECUTE = "Cannot execute";
-  public static final String EXPORT_LOGS__LOGLEVEL = "log-level";
+  public static final String EXPORT_LOGS__LOGLEVEL = DistributionConfig.LOG_LEVEL_NAME;
   public static final String EXPORT_LOGS__LOGLEVEL__HELP = "Minimum level of log entries to export. Valid values are: none, error, info, config , fine, finer and finest.  The default is \"info\".";
   public static final String EXPORT_LOGS__UPTO_LOGLEVEL = "only-log-level";
   public static final String EXPORT_LOGS__UPTO_LOGLEVEL__HELP = "Whether to only include those entries that exactly match the --log-level specified.";
@@ -1490,7 +1493,7 @@ public class CliStrings {
   public static final String CREATE_GATEWAYRECEIVER__BINDADDRESS__HELP = "The IP address or host name that the receiver's socket will listen on for client connections.";
   public static final String CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS = "maximum-time-between-pings";
   public static final String CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS__HELP = "The maximum amount of time between client pings.";
-  public static final String CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE = "socket-buffer-size";
+  public static final String CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE = SOCKET_BUFFER_SIZE;
   public static final String CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE__HELP = "The buffer size in bytes of the socket connection for this GatewayReceiver.";
   public static final String CREATE_GATEWAYRECEIVER__GATEWAYTRANSPORTFILTER = "gateway-transport-filter";
   public static final String CREATE_GATEWAYRECEIVER__GATEWAYTRANSPORTFILTER__HELP = "The fully qualified class names of GatewayTransportFilters (separated by comma) to be added to the GatewayReceiver. e.g. gateway-transport-filter=com.user.filters.MyFilter1,com.user.filters.MyFilters2";
@@ -1522,7 +1525,7 @@ public class CliStrings {
   public static final String CREATE_GATEWAYSENDER__PARALLEL__HELP = "Whether this is Parallel GatewaySender.";
   public static final String CREATE_GATEWAYSENDER__MANUALSTART = "manual-start";
   public static final String CREATE_GATEWAYSENDER__MANUALSTART__HELP = "Whether manual start is to be enabled or the sender will start automatically after creation.";
-  public static final String CREATE_GATEWAYSENDER__SOCKETBUFFERSIZE = "socket-buffer-size";
+  public static final String CREATE_GATEWAYSENDER__SOCKETBUFFERSIZE = SOCKET_BUFFER_SIZE;
   public static final String CREATE_GATEWAYSENDER__SOCKETBUFFERSIZE__HELP = "The buffer size of the socket connection between this GatewaySender and its receiving GatewayReceiver.";
   public static final String CREATE_GATEWAYSENDER__SOCKETREADTIMEOUT = "socket-read-timeout";
   public static final String CREATE_GATEWAYSENDER__SOCKETREADTIMEOUT__HELP = "The amount of time in milliseconds that a socket read between a sending GatewaySender and its receiving GatewayReceiver will block.";
@@ -1621,13 +1624,13 @@ public class CliStrings {
   public static final String START_LOCATOR__HOSTNAME_FOR_CLIENTS__HELP = "Hostname or IP address that will be sent to clients so they can connect to this Locator. The default is the bind-address of the Locator.";
   public static final String START_LOCATOR__INCLUDE_SYSTEM_CLASSPATH = "include-system-classpath";
   public static final String START_LOCATOR__INCLUDE_SYSTEM_CLASSPATH__HELP = "Includes the System CLASSPATH on the Locator's CLASSPATH. The System CLASSPATH is not included by default.";
-  public static final String START_LOCATOR__LOCATORS = "locators";
+  public static final String START_LOCATOR__LOCATORS = LOCATORS;
   public static final String START_LOCATOR__LOCATORS__HELP = "Sets the list of Locators used by this Locator to join the appropriate GemFire cluster.";
-  public static final String START_LOCATOR__LOG_LEVEL = "log-level";
+  public static final String START_LOCATOR__LOG_LEVEL = LOG_LEVEL;
   public static final String START_LOCATOR__LOG_LEVEL__HELP = "Sets the level of output logged to the Locator log file.  Possible values for log-level include: finest, finer, fine, config, info, warning, severe, none.";
-  public static final String START_LOCATOR__MCAST_ADDRESS = "mcast-address";
+  public static final String START_LOCATOR__MCAST_ADDRESS = MCAST_ADDRESS;
   public static final String START_LOCATOR__MCAST_ADDRESS__HELP = "The IP address or hostname used to bind the UPD socket for multi-cast networking so the Locator can communicate other members in the GemFire cluster using a common multicast address and port.  If mcast-port is zero, then mcast-address is ignored.";
-  public static final String START_LOCATOR__MCAST_PORT = "mcast-port";
+  public static final String START_LOCATOR__MCAST_PORT = MCAST_PORT;
   public static final String START_LOCATOR__MCAST_PORT__HELP = "Sets the port used for multi-cast networking so the Locator can communicate with other members of the GemFire cluster.  A zero value disables mcast.";
   public static final String START_LOCATOR__MEMBER_NAME = "name";
   public static final String START_LOCATOR__MEMBER_NAME__HELP = "The member name to give this Locator in the GemFire cluster.";
@@ -1650,7 +1653,7 @@ public class CliStrings {
   public static final String START_LOCATOR__CONNECT = "connect";
   public static final String START_LOCATOR__CONNECT__HELP = "When connect is set to false , Gfsh does not automatically connect to the locator which is started using this command.";
   public static final String START_LOCATOR__USE__0__TO__CONNECT = "Please use \"{0}\" to connect Gfsh to the locator.";
-  public static final String START_LOCATOR__ENABLE__SHARED__CONFIGURATION = "enable-cluster-configuration";
+  public static final String START_LOCATOR__ENABLE__SHARED__CONFIGURATION = ENABLE_CLUSTER_CONFIGURATION;
   public static final String START_LOCATOR__ENABLE__SHARED__CONFIGURATION__HELP = "When " + START_LOCATOR__ENABLE__SHARED__CONFIGURATION + " is set to true, locator hosts and serves cluster configuration.";
   public static final String START_LOCATOR__LOAD__SHARED_CONFIGURATION__FROM__FILESYSTEM = "load-cluster-configuration-from-dir";
   public static final String START_LOCATOR__LOAD__SHARED_CONFIGURATION__FROM__FILESYSTEM__HELP = "When \" " + START_LOCATOR__LOAD__SHARED_CONFIGURATION__FROM__FILESYSTEM + " \" is set to true, the locator loads the cluster configuration from the \""+ SharedConfiguration.CLUSTER_CONFIG_ARTIFACTS_DIR_NAME + "\" directory.";  
@@ -1688,7 +1691,7 @@ public class CliStrings {
   public static final String START_SERVER__ASSIGN_BUCKETS__HELP = "Whether to assign buckets to the partitioned regions of the cache on server start.";
   public static final String START_SERVER__BIND_ADDRESS = "bind-address";
   public static final String START_SERVER__BIND_ADDRESS__HELP = "The IP address on which the Server will be bound.  By default, the Server is bound to all local addresses.";
-  public static final String START_SERVER__CACHE_XML_FILE = "cache-xml-file";
+  public static final String START_SERVER__CACHE_XML_FILE = CACHE_XML_FILE;
   public static final String START_SERVER__CACHE_XML_FILE__HELP = "Specifies the name of the XML file or resource to initialize the cache with when it is created.";
   public static final String START_SERVER__CLASSPATH = "classpath";
   public static final String START_SERVER__CLASSPATH__HELP = "Location of user application classes required by the Server. The user classpath is prepended to the Server's classpath.";
@@ -1698,7 +1701,7 @@ public class CliStrings {
   public static final String START_SERVER__DISABLE_DEFAULT_SERVER__HELP = "Whether the Cache Server will be started by default.";
   public static final String START_SERVER__DISABLE_EXIT_WHEN_OUT_OF_MEMORY = "disable-exit-when-out-of-memory";
   public static final String START_SERVER__DISABLE_EXIT_WHEN_OUT_OF_MEMORY_HELP = "Prevents the JVM from exiting when an OutOfMemoryError occurs.";
-  public static final String START_SERVER__ENABLE_TIME_STATISTICS = "enable-time-statistics";
+  public static final String START_SERVER__ENABLE_TIME_STATISTICS = ENABLE_TIME_STATISTICS;
   public static final String START_SERVER__ENABLE_TIME_STATISTICS__HELP = "Causes additional time-based statistics to be gathered for GemFire operations.";
   public static final String START_SERVER__FORCE = "force";
   public static final String START_SERVER__FORCE__HELP = "Whether to allow the PID file from a previous Cache Server run to be overwritten.";
@@ -1710,55 +1713,55 @@ public class CliStrings {
   public static final String START_SERVER__INITIAL_HEAP__HELP = "Initial size of the heap in the same format as the JVM -Xms parameter.";
   public static final String START_SERVER__J = "J";
   public static final String START_SERVER__J__HELP = "Argument passed to the JVM on which the server will run. For example, --J=-Dfoo.bar=true will set the system property \"foo.bar\" to \"true\".";
-  public static final String START_SERVER__LOCATORS = "locators";
+  public static final String START_SERVER__LOCATORS = LOCATORS;
   public static final String START_SERVER__LOCATORS__HELP = "Sets the list of Locators used by the Cache Server to join the appropriate GemFire cluster.";
-  public static final String START_SERVER__LOCK_MEMORY = "lock-memory";
+  public static final String START_SERVER__LOCK_MEMORY = SystemConfigurationProperties.LOCK_MEMORY;
   public static final String START_SERVER__LOCK_MEMORY__HELP = "Causes GemFire to lock heap and off-heap memory pages into RAM. This prevents the operating system from swapping the pages out to disk, which can cause severe performance degradation. When you use this option, also configure the operating system limits for locked memory.";
   public static final String START_SERVER__LOCATOR_WAIT_TIME = "locator-wait-time";
   public static final String START_SERVER__LOCATOR_WAIT_TIME_HELP = "Sets the number of seconds the server will wait for a locator to become available during startup before giving up.";
-  public static final String START_SERVER__LOG_LEVEL = "log-level";
+  public static final String START_SERVER__LOG_LEVEL = LOG_LEVEL;
   public static final String START_SERVER__LOG_LEVEL__HELP = "Sets the level of output logged to the Cache Server log file.  Possible values for log-level include: finest, finer, fine, config, info, warning, severe, none.";
   public static final String START_SERVER__MAXHEAP = "max-heap";
   public static final String START_SERVER__MAXHEAP__HELP = "Maximum size of the heap in the same format as the JVM -Xmx parameter.";
-  public static final String START_SERVER__MCAST_ADDRESS = "mcast-address";
+  public static final String START_SERVER__MCAST_ADDRESS = MCAST_ADDRESS;
   public static final String START_SERVER__MCAST_ADDRESS__HELP = "The IP address or hostname used to bind the UPD socket for multi-cast networking so the Cache Server can communicate with other members in the GemFire cluster.  If mcast-port is zero, then mcast-address is ignored.";
-  public static final String START_SERVER__MCAST_PORT = "mcast-port";
+  public static final String START_SERVER__MCAST_PORT = MCAST_PORT;
   public static final String START_SERVER__MCAST_PORT__HELP = "Sets the port used for multi-cast networking so the Cache Server can communicate with other members of the GemFire cluster.  A zero value disables mcast.";
   public static final String START_SERVER__NAME = "name";
   public static final String START_SERVER__NAME__HELP = "The member name to give this Cache Server in the GemFire cluster.";
-  public static final String START_SERVER__MEMCACHED_PORT = "memcached-port";
+  public static final String START_SERVER__MEMCACHED_PORT = MEMCACHED_PORT;
   public static final String START_SERVER__MEMCACHED_PORT__HELP = "Sets the port that the GemFire memcached service listens on for memcached clients.";
-  public static final String START_SERVER__MEMCACHED_PROTOCOL = "memcached-protocol";
+  public static final String START_SERVER__MEMCACHED_PROTOCOL = MEMCACHED_PROTOCOL;
   public static final String START_SERVER__MEMCACHED_PROTOCOL__HELP = "Sets the protocol that the GemFire memcached service uses (ASCII or BINARY).";
-  public static final String START_SERVER__MEMCACHED_BIND_ADDRESS = "memcached-bind-address";
+  public static final String START_SERVER__MEMCACHED_BIND_ADDRESS = MEMCACHED_BIND_ADDRESS;
   public static final String START_SERVER__MEMCACHED_BIND_ADDRESS__HELP = "Sets the IP address the GemFire memcached service listens on for memcached clients. The default is to bind to the first non-loopback address for this machine.";
-  public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size";
+  public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE = SystemConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
   public static final String START_SERVER__OFF_HEAP_MEMORY_SIZE__HELP = "The total size of off-heap memory specified as off-heap-memory-size=<n>[g|m]. <n> is the size. [g|m] indicates whether the size should be interpreted as gigabytes or megabytes. A non-zero size causes that much memory to be allocated from the operating system and reserved for off-heap use.";
   public static final String START_SERVER__PROPERTIES = "properties-file";
   public static final String START_SERVER__PROPERTIES__HELP = "The gemfire.properties file for configuring the Cache Server's distributed system. The file's path can be absolute or relative to the gfsh working directory.";
-  public static final String START_SERVER__REDIS_PORT = "redis-port";
+  public static final String START_SERVER__REDIS_PORT = SystemConfigurationProperties.REDIS_PORT;
   public static final String START_SERVER__REDIS_PORT__HELP = "Sets the port that the GemFire Redis service listens on for Redis clients.";
-  public static final String START_SERVER__REDIS_BIND_ADDRESS = "redis-bind-address";
+  public static final String START_SERVER__REDIS_BIND_ADDRESS = SystemConfigurationProperties.REDIS_BIND_ADDRESS;
   public static final String START_SERVER__REDIS_BIND_ADDRESS__HELP = "Sets the IP address the GemFire Redis service listens on for Redis clients. The default is to bind to the first non-loopback address for this machine.";
-  public static final String START_SERVER__REDIS_PASSWORD = "redis-password";
+  public static final String START_SERVER__REDIS_PASSWORD = SystemConfigurationProperties.REDIS_PASSWORD;
   public static final String START_SERVER__REDIS_PASSWORD__HELP = "Sets the authentication password for GemFireRedisServer";
   public static final String START_SERVER__SECURITY_PROPERTIES = "security-properties-file";
   public static final String START_SERVER__SECURITY_PROPERTIES__HELP = "The gfsecurity.properties file for configuring the Server's security configuration in the distributed system. The file's path can be absolute or relative to gfsh directory.";
   public static final String START_SERVER__REBALANCE = "rebalance";
   public static final String START_SERVER__REBALANCE__HELP = "Whether to initiate rebalancing across the GemFire cluster.";
-  public static final String START_SERVER__SERVER_BIND_ADDRESS = "server-bind-address";
+  public static final String START_SERVER__SERVER_BIND_ADDRESS = SERVER_BIND_ADDRESS;
   public static final String START_SERVER__SERVER_BIND_ADDRESS__HELP = "The IP address that this distributed system's server sockets in a client-server topology will be bound. If set to an empty string then all of the local machine's addresses will be listened on.";
   public static final String START_SERVER__SERVER_PORT = "server-port";
   public static final String START_SERVER__SERVER_PORT__HELP = "The port that the distributed system's server sockets in a client-server topology will listen on.  The default server-port is "
       + CacheServer.DEFAULT_PORT + ".";
   public static final String START_SERVER__SPRING_XML_LOCATION = "spring-xml-location";
   public static final String START_SERVER__SPRING_XML_LOCATION_HELP = "Specifies the location of a Spring XML configuration file(s) for bootstrapping and configuring a GemFire Server.";
-  public static final String START_SERVER__STATISTIC_ARCHIVE_FILE = "statistic-archive-file";
+  public static final String START_SERVER__STATISTIC_ARCHIVE_FILE = STATISTIC_ARCHIVE_FILE;
   public static final String START_SERVER__STATISTIC_ARCHIVE_FILE__HELP = "The file that statistic samples are written to.  An empty string (default) disables statistic archival.";
   // public static final String START_SERVER__START_LOCATOR = "start-locator";
   // public static final String START_SERVER__START_LOCATOR__HELP =
   // "To start embedded Locator with given endpoints in the format: host[port]. If no endpoints are given defaults (localhost[10334]) are assumed.";
-  public static final String START_SERVER__USE_CLUSTER_CONFIGURATION = "use-cluster-configuration";
+  public static final String START_SERVER__USE_CLUSTER_CONFIGURATION = USE_CLUSTER_CONFIGURATION;
   public static final String START_SERVER__USE_CLUSTER_CONFIGURATION__HELP = "When set to true, the server requests the configuration from locator's cluster configuration service.";
   public static final String START_SERVER__GENERAL_ERROR_MESSAGE = "An error occurred while attempting to start a GemFire Cache Server: %1$s";
   public static final String START_SERVER__PROCESS_TERMINATED_ABNORMALLY_ERROR_MESSAGE = "The Cache Server process terminated unexpectedly with exit status %1$d. Please refer to the log file in %2$s for full details.%n%n%3$s";
@@ -1809,9 +1812,8 @@ public class CliStrings {
   
   public static final String START_SERVER__MESSAGE__TIME__TO__LIVE = "message-time-to-live";
   public static final String START_SERVER__MESSAGE__TIME__TO__LIVE__HELP = "Sets the time (in seconds ) after which a message in the client queue will expire";
-  
-  
-  public static final String START_SERVER__SOCKET__BUFFER__SIZE = "socket-buffer-size";
+
+  public static final String START_SERVER__SOCKET__BUFFER__SIZE = SOCKET_BUFFER_SIZE;
   public static final String START_SERVER__SOCKET__BUFFER__SIZE__HELP = "Sets the buffer size in bytes of the socket connection for this CacheServer. The default is 32768 bytes.";
   
   public static final String START_SERVER__TCP__NO__DELAY = "tcp-no-delay";
@@ -2048,7 +2050,7 @@ public class CliStrings {
   //List durable cqs
 
   public static final String LIST_DURABLE_CQS = "list durable-cqs";
-  public static final String LIST_DURABLE_CQS__DURABLECLIENTID = "durable-client-id";
+  public static final String LIST_DURABLE_CQS__DURABLECLIENTID = DURABLE_CLIENT_ID;
   public static final String LIST_DURABLE_CQS__DURABLECLIENTID__HELP = "The id used to identify the durable client";
   public static final String LIST_DURABLE_CQS__HELP = "List durable client cqs associated with the specified durable client id.";
   public static final String LIST_DURABLE_CQS__MEMBER = "member";
@@ -2068,7 +2070,7 @@ public class CliStrings {
   public static final String CLOSE_DURABLE_CQS__HELP = "Closes the durable cq registered by the durable client and drains events held for the durable cq from the subscription queue.";
   public static final String CLOSE_DURABLE_CQS__NAME = "durable-cq-name";
   public static final String CLOSE_DURABLE_CQS__NAME__HELP = "Name of the cq to be closed.";
-  public static final String CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID = "durable-client-id";
+  public static final String CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID = DURABLE_CLIENT_ID;
   public static final String CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID__HELP = "The id of the durable client";
   public static final String CLOSE_DURABLE_CQS__MEMBER = "member";
   public static final String CLOSE_DURABLE_CQS__MEMBER__HELP = "Name/Id of the member for which the durable client is registered and the cq to be closed.";
@@ -2081,7 +2083,7 @@ public class CliStrings {
   //Close Durable Clients
   public static final String CLOSE_DURABLE_CLIENTS = "close durable-client";
   public static final String CLOSE_DURABLE_CLIENTS__HELP = "Attempts to close the durable client, the client must be disconnected.";
-  public static final String CLOSE_DURABLE_CLIENTS__CLIENT__ID = "durable-client-id";
+  public static final String CLOSE_DURABLE_CLIENTS__CLIENT__ID = DURABLE_CLIENT_ID;
   public static final String CLOSE_DURABLE_CLIENTS__CLIENT__ID__HELP = "The id used to identify the durable client.";
   public static final String CLOSE_DURABLE_CLIENTS__MEMBER = "member";
   public static final String CLOSE_DURABLE_CLIENTS__MEMBER__HELP = "Name/Id of the member for which the durable client is to be closed.";
@@ -2092,7 +2094,7 @@ public class CliStrings {
 
   public static final String COUNT_DURABLE_CQ_EVENTS = "show subscription-queue-size";
   public static final String COUNT_DURABLE_CQ_EVENTS__HELP = "Shows the number of events in the subscription queue.  If a cq name is provided, counts the number of events in the subscription queue for the specified cq.";
-  public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID = "durable-client-id";
+  public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID = DURABLE_CLIENT_ID;
   public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID__HELP = "The id used to identify the durable client.";
   public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME = "durable-cq-name";
   public static final String COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME__HELP = "The name that identifies the cq.";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
index bbb0841..d199648 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/shell/JmxOperationInvoker.java
@@ -16,38 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli.shell;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicBoolean;
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.JMX;
-import javax.management.MBeanException;
-import javax.management.MBeanServerConnection;
-import javax.management.MalformedObjectNameException;
-import javax.management.Notification;
-import javax.management.NotificationListener;
-import javax.management.ObjectName;
-import javax.management.QueryExp;
-import javax.management.ReflectionException;
-import javax.management.remote.JMXConnectionNotification;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-import javax.rmi.ssl.SslRMIClientSocketFactory;
-
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.lang.StringUtils;
 import com.gemstone.gemfire.internal.util.ArrayUtils;
 import com.gemstone.gemfire.internal.util.IOUtils;
@@ -61,6 +30,22 @@ import com.gemstone.gemfire.management.internal.cli.LogWrapper;
 import com.gemstone.gemfire.management.internal.cli.commands.ShellCommands;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 
+import javax.management.*;
+import javax.management.remote.JMXConnectionNotification;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+import javax.rmi.ssl.SslRMIClientSocketFactory;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 /**
  * OperationInvoker JMX Implementation
  *
@@ -124,7 +109,7 @@ public class JmxOperationInvoker implements OperationInvoker {
         Entry<String, String> entry = it.next();
         String key = entry.getKey();
         String value = entry.getValue();
-        if (key.startsWith("javax.") || key.startsWith("cluster-ssl") || key.startsWith("jmx-manager-ssl") ) {
+        if (key.startsWith("javax.") || key.startsWith("cluster-ssl") || key.startsWith(DistributionConfig.JMX_MANAGER_SSL_NAME)) {
           key =  checkforSystemPropertyPrefix(entry.getKey());
           if((key.equals(Gfsh.SSL_ENABLED_CIPHERS) || key.equals(Gfsh.SSL_ENABLED_PROTOCOLS)) && "any".equals(value)){
             continue;
@@ -239,7 +224,7 @@ public class JmxOperationInvoker implements OperationInvoker {
     String returnKey = key;
     if (key.startsWith("javax."))
       returnKey = key;
-    if (key.startsWith("cluster-ssl") || key.startsWith("jmx-manager-ssl")) {
+    if (key.startsWith("cluster-ssl") || key.startsWith(DistributionConfig.JMX_MANAGER_SSL_NAME)) {
       if (key.endsWith("keystore")) {
         returnKey = Gfsh.SSL_KEYSTORE;
       } else if (key.endsWith("keystore-password")) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/DtdResolver.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/DtdResolver.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/DtdResolver.java
index 83ed68c..d986e8a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/DtdResolver.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/configuration/utils/DtdResolver.java
@@ -16,18 +16,18 @@
  */
 package com.gemstone.gemfire.management.internal.configuration.utils;
 
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
+import org.apache.commons.io.FileUtils;
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-import org.apache.commons.io.FileUtils;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
-
-import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
-
 /******
  * This class is used to resolve the location of DTD. 
  * During development time the dtd for the latest version is not published 
@@ -43,7 +43,7 @@ public class DtdResolver implements EntityResolver{
   {
     if (!isHttpUrlOK(systemId)) {
       URL dtdURL = getClass().getResource(CacheXml.LATEST_DTD_LOCATION);
-      File dtd = new File("gemfire.dtd");
+      File dtd = new File(DistributionConfig.GEMFIRE_PREFIX + "dtd");
       FileUtils.copyURLToFile(dtdURL, dtd);
       InputSource inputSource = new InputSource(FileUtils.openInputStream(dtd));
       FileUtils.deleteQuietly(dtd);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
index 28c7f49..3bf07d0 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/DurableClientCommandsController.java
@@ -16,16 +16,12 @@
  */
 package com.gemstone.gemfire.management.internal.web.controllers;
 
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.internal.lang.StringUtils;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
-
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * The DurableClientCommandsController class implements GemFire Management REST API web service endpoints for the
@@ -48,7 +44,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.GET, value = "/durable-clients/{durable-client-id}/cqs")
   @ResponseBody
-  public String listDurableClientContinuousQueries(@PathVariable("durable-client-id") final String durableClientId,
+  public String listDurableClientContinuousQueries(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                                    @RequestParam(value = CliStrings.LIST_DURABLE_CQS__MEMBER, required = false) final String memberNameId,
                                                    @RequestParam(value = CliStrings.LIST_DURABLE_CQS__GROUP, required = false) final String[] groups)
   {
@@ -69,7 +65,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.GET, value = "/durable-clients/{durable-client-id}/cqs/events")
   @ResponseBody
-  public String countDurableClientContinuousQueryEvents(@PathVariable("durable-client-id") final String durableClientId,
+  public String countDurableClientContinuousQueryEvents(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                                         @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, required = false) final String memberNameId,
                                                         @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP, required = false) final String[] groups)
   {
@@ -78,7 +74,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.GET, value = "/durable-clients/{durable-client-id}/cqs/{durable-cq-name}/events")
   @ResponseBody
-  public String countDurableClientContinuousQueryEvents(@PathVariable("durable-client-id") final String durableClientId,
+  public String countDurableClientContinuousQueryEvents(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                                         @PathVariable("durable-cq-name") final String durableCqName,
                                                         @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__MEMBER, required = false) final String memberNameId,
                                                         @RequestParam(value = CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP, required = false) final String[] groups)
@@ -112,7 +108,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.POST, value = "/durable-clients/{durable-client-id}", params = "op=close")
   @ResponseBody
-  public String closeDurableClient(@PathVariable("durable-client-id") final String durableClientId,
+  public String closeDurableClient(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                    @RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__MEMBER, required = false) final String memberNameId,
                                    @RequestParam(value = CliStrings.CLOSE_DURABLE_CLIENTS__GROUP, required = false) final String[] groups)
   {
@@ -133,7 +129,7 @@ public class DurableClientCommandsController extends AbstractCommandsController
 
   @RequestMapping(method = RequestMethod.POST, value = "/durable-clients/{durable-client-id}/cqs/{durable-cq-name}", params = "op=close")
   @ResponseBody
-  public String closeDurableContinuousQuery(@PathVariable("durable-client-id") final String durableClientId,
+  public String closeDurableContinuousQuery(@PathVariable(SystemConfigurationProperties.DURABLE_CLIENT_ID) final String durableClientId,
                                             @PathVariable("durable-cq-name")final String durableCqName,
                                             @RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__MEMBER, required = false) final String memberNameId,
                                             @RequestParam(value = CliStrings.CLOSE_DURABLE_CQS__GROUP, required = false) final String[] groups)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
index cefec91..13face2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/LoginHandlerInterceptor.java
@@ -16,22 +16,22 @@
  */
 package com.gemstone.gemfire.management.internal.web.controllers.support;
 
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
 import com.gemstone.gemfire.management.internal.security.ResourceConstants;
 import com.gemstone.gemfire.security.Authenticator;
-import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
-
 import org.apache.logging.log4j.Logger;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * The GetEnvironmentHandlerInterceptor class handles extracting Gfsh environment variables encoded in the HTTP request
  * message as request parameters.
@@ -59,7 +59,7 @@ public class LoginHandlerInterceptor extends HandlerInterceptorAdapter {
 
   protected static final String ENVIRONMENT_VARIABLE_REQUEST_PARAMETER_PREFIX = "vf.gf.env.";
 
-  protected static final String SECURITY_VARIABLE_REQUEST_HEADER_PREFIX = "security-";
+  protected static final String SECURITY_VARIABLE_REQUEST_HEADER_PREFIX = DistributionConfig.SECURITY_PREFIX_NAME;
 
   public static Map<String, String> getEnvironment() {
     return ENV.get();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java
index 5d66622..f8ed28d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/AutoSerializableManager.java
@@ -16,6 +16,17 @@
  */
 package com.gemstone.gemfire.pdx.internal;
 
+import com.gemstone.gemfire.CancelException;
+import com.gemstone.gemfire.cache.RegionService;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.CopyOnWriteHashSet;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteWeakHashMap;
+import com.gemstone.gemfire.pdx.*;
+import com.gemstone.gemfire.pdx.internal.unsafe.UnsafeWrapper;
+import org.apache.logging.log4j.Logger;
+
 import java.io.Externalizable;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
@@ -23,36 +34,11 @@ import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.regex.Pattern;
 
-import org.apache.logging.log4j.Logger;
-
-import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.cache.RegionService;
-import com.gemstone.gemfire.internal.CopyOnWriteHashSet;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteWeakHashMap;
-import com.gemstone.gemfire.pdx.FieldType;
-import com.gemstone.gemfire.pdx.NonPortableClassException;
-import com.gemstone.gemfire.pdx.PdxReader;
-import com.gemstone.gemfire.pdx.PdxSerializationException;
-import com.gemstone.gemfire.pdx.PdxWriter;
-import com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer;
-import com.gemstone.gemfire.pdx.internal.unsafe.UnsafeWrapper;
-
 /**
  * The core of auto serialization which is used in both aspect and
  * reflection-based auto-serialization. This simple manager class is a singleton
@@ -95,7 +81,7 @@ public class AutoSerializableManager {
    * testing as well as possibly debugging future customer issues.
    */
   private static final String NO_HARDCODED_EXCLUDES_PARAM =
-      "gemfire.auto.serialization.no.hardcoded.excludes";
+      DistributionConfig.GEMFIRE_PREFIX + "auto.serialization.no.hardcoded.excludes";
 
   private boolean noHardcodedExcludes =
       Boolean.getBoolean(NO_HARDCODED_EXCLUDES_PARAM);
@@ -595,16 +581,16 @@ public class AutoSerializableManager {
   static {
     UnsafeWrapper tmp = null;
     // only use Unsafe if SAFE was not explicitly requested
-    if (!Boolean.getBoolean("gemfire.AutoSerializer.SAFE")) {
+    if (!Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "AutoSerializer.SAFE")) {
       try {
         tmp = new UnsafeWrapper();
         // only throw an exception if UNSAFE was explicitly requested
       } catch (RuntimeException ex) {
-        if (Boolean.getBoolean("gemfire.AutoSerializer.UNSAFE")) {
+        if (Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "AutoSerializer.UNSAFE")) {
           throw ex;
         }
       } catch (Error ex) {
-        if (Boolean.getBoolean("gemfire.AutoSerializer.UNSAFE")) {
+        if (Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "AutoSerializer.UNSAFE")) {
           throw ex;
         }
       }
@@ -1905,8 +1891,8 @@ public class AutoSerializableManager {
       autoClassInfo.setSerializedType(w.getAutoPdxType());
     }
   }
-  
-  private static final boolean USE_CONSTRUCTOR = !Boolean.getBoolean("gemfire.autopdx.ignoreConstructor");
+
+  private static final boolean USE_CONSTRUCTOR = !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "autopdx.ignoreConstructor");
   
   /**
    * Using the given PdxReader, recreate the given object.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java
index 9a08909..1f40a4d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/PdxWriterImpl.java
@@ -16,27 +16,21 @@
  */
 package com.gemstone.gemfire.pdx.internal;
 
-import java.io.DataOutput;
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.util.Date;
-
 import com.gemstone.gemfire.InternalGemFireException;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.DSCODE;
 import com.gemstone.gemfire.internal.HeapDataOutputStream;
 import com.gemstone.gemfire.internal.InternalDataSerializer;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.tcp.ByteBufferInputStream.ByteSource;
-import com.gemstone.gemfire.pdx.FieldType;
-import com.gemstone.gemfire.pdx.PdxFieldAlreadyExistsException;
-import com.gemstone.gemfire.pdx.PdxFieldDoesNotExistException;
-import com.gemstone.gemfire.pdx.PdxInstance;
-import com.gemstone.gemfire.pdx.PdxSerializable;
-import com.gemstone.gemfire.pdx.PdxSerializationException;
-import com.gemstone.gemfire.pdx.PdxUnreadFields;
-import com.gemstone.gemfire.pdx.PdxWriter;
+import com.gemstone.gemfire.pdx.*;
 import com.gemstone.gemfire.pdx.internal.AutoSerializableManager.AutoClassInfo;
 
+import java.io.DataOutput;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.Date;
+
 /**
  * A new instance of this class is created for each (nested) instance of
  * {@link PdxSerializable}. But it may share the underlying instance
@@ -89,7 +83,7 @@ public class PdxWriterImpl implements PdxWriter {
    * This property should only be set when debugging new code since it will slow down
    * pdx serialization.
    */
-  private static final boolean sysPropDoExtraPdxValidation = Boolean.getBoolean("gemfire.validatePdxWriters");
+  private static final boolean sysPropDoExtraPdxValidation = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "validatePdxWriters");
   private boolean doExtraValidation = sysPropDoExtraPdxValidation;
 
   public PdxWriterImpl(TypeRegistry tr, Object pdx, PdxOutputStream out) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java
index 4a77018..22b964f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/pdx/internal/TypeRegistry.java
@@ -16,15 +16,11 @@
  */
 package com.gemstone.gemfire.pdx.internal;
 
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.DiskStore;
 import com.gemstone.gemfire.cache.DiskStoreFactory;
 import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.Assert;
 import com.gemstone.gemfire.internal.InternalDataSerializer;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -35,13 +31,17 @@ import com.gemstone.gemfire.internal.util.concurrent.CopyOnWriteWeakHashMap;
 import com.gemstone.gemfire.pdx.PdxSerializationException;
 import com.gemstone.gemfire.pdx.PdxSerializer;
 import com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer;
+import org.apache.logging.log4j.Logger;
+
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 
 
 public class TypeRegistry {
   private static final Logger logger = LogService.getLogger();
-  
-  private static final boolean DISABLE_TYPE_REGISTRY 
-      = Boolean.getBoolean("gemfire.TypeRegistry.DISABLE_PDX_REGISTRY"); 
+
+  private static final boolean DISABLE_TYPE_REGISTRY
+      = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "TypeRegistry.DISABLE_PDX_REGISTRY");
 
   private final Map<Integer, PdxType> idToType = new CopyOnWriteHashMap<Integer, PdxType>();
   private final Map<PdxType, Integer> typeToId = new CopyOnWriteHashMap<PdxType, Integer>();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
index 1114a68..47402a7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
@@ -16,15 +16,18 @@
  */
 package com.gemstone.gemfire.redis;
 
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.cache.*;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.hll.HyperLogLogPlus;
+import com.gemstone.gemfire.internal.redis.*;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.buffer.PooledByteBufAllocator;
-import io.netty.channel.Channel;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.ChannelPipeline;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.ServerChannel;
+import io.netty.channel.*;
 import io.netty.channel.nio.NioEventLoopGroup;
 import io.netty.channel.oio.OioEventLoopGroup;
 import io.netty.channel.socket.SocketChannel;
@@ -38,34 +41,9 @@ import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.Collection;
 import java.util.Map.Entry;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.EntryEvent;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionDestroyedException;
-import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.SocketCreator;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.redis.ByteArrayWrapper;
-import com.gemstone.gemfire.internal.redis.ByteToCommandDecoder;
-import com.gemstone.gemfire.internal.redis.Coder;
-import com.gemstone.gemfire.internal.redis.ExecutionHandlerContext;
-import com.gemstone.gemfire.internal.redis.RedisDataType;
-import com.gemstone.gemfire.internal.redis.RegionProvider;
-import com.gemstone.gemfire.internal.hll.HyperLogLogPlus;
-
 /**
  * The GemFireRedisServer is a server that understands the Redis protocol. As
  * commands are sent to the server, each command is picked up by a thread,
@@ -405,7 +383,7 @@ public class GemFireRedisServer {
         if (c == null) {
           CacheFactory cacheFactory = new CacheFactory();
           if (logLevel != null)
-            cacheFactory.set("log-level", logLevel);
+            cacheFactory.set(DistributionConfig.LOG_LEVEL_NAME, logLevel);
           c = cacheFactory.create();
         }
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/resources/com/gemstone/gemfire/internal/i18n/StringIdResourceBundle_ja.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/main/resources/com/gemstone/gemfire/internal/i18n/StringIdResourceBundle_ja.txt b/geode-core/src/main/resources/com/gemstone/gemfire/internal/i18n/StringIdResourceBundle_ja.txt
index 041e5f3..a20426b 100644
--- a/geode-core/src/main/resources/com/gemstone/gemfire/internal/i18n/StringIdResourceBundle_ja.txt
+++ b/geode-core/src/main/resources/com/gemstone/gemfire/internal/i18n/StringIdResourceBundle_ja.txt
@@ -2763,7 +2763,7 @@
 3958   = <vmarg> 起動したCacheServer VMに渡されるVMオプション。例: -J-Xmx1024M(1 GBのヒープの場合)
 3959   = <dir> キャッシュ・サーバーが実行されるディレクトリ。デフォルトは現在のディレクトリ
 3960   = <classpath> キャッシュ・サーバーで必要なユーザー・クラスの場所。このパスは、現在のclasspathに追加されます。
-3961   = <attName> "mcast-port"や"cache-xml-file"などの分散システム属性。
+3961   = <attName> DistributionConfig.MCAST_PORT_NAMEや"cache-xml-file"などの分散システム属性。
 3962   = GemFire CacheServer VMを停止します
 3963   = GemFire CacheServer VMのステータスおよびプロセスIDを通知します
 3964   = サーバー・プロセス起動中のエラー。 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
index 2944d8e..421ac7e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/CopyJUnitTest.java
@@ -16,22 +16,22 @@
  */
 package com.gemstone.gemfire;
 
-import static org.junit.Assert.*;
-
 import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.*;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.pdx.PdxInstance;
 import com.gemstone.gemfire.pdx.WritablePdxInstance;
-import com.gemstone.gemfire.cache.util.*;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.*;
 
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
 
 /**
  * Tests the functionality of the {@link CopyHelper#copy} method
@@ -51,7 +51,7 @@ public class CopyJUnitTest {
   
   private void createCache(boolean copyOnRead) throws CacheException {
     Properties p = new Properties();
-    p.setProperty("mcast-port", "0"); // loner
+    p.setProperty(MCAST_PORT, "0"); // loner
     this.cache = CacheFactory.create(DistributedSystem.connect(p));
     this.cache.setCopyOnRead(copyOnRead);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
index ca0cb47..bccf229 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
@@ -16,22 +16,26 @@
  */
 package com.gemstone.gemfire;
 
-import static org.junit.Assert.*;
-
-import com.gemstone.gemfire.distributed.*;
-import com.gemstone.gemfire.internal.*;
 import com.gemstone.gemfire.cache.*;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.InternalInstantiator;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-
-import java.util.Properties;
-import java.io.*;
-
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.fail;
+
 /**
  * This class makes sure that instantatiors are persisted to disk
  * and can be recovered.
@@ -71,9 +75,9 @@ public class DiskInstantiatorsJUnitTest {
   
   private void connect() throws CacheException {
     Properties cfg = new Properties();
-    cfg.setProperty("mcast-port", "0");
-    cfg.setProperty("locators", "");
-    cfg.setProperty("statistic-sampling-enabled", "false");
+    cfg.setProperty(MCAST_PORT, "0");
+    cfg.setProperty(LOCATORS, "");
+    cfg.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
 
     this.ds = DistributedSystem.connect(cfg);
     this.c = CacheFactory.create(ds);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
index 5e55ac0..30b5c27 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java
@@ -16,18 +16,20 @@
  */
 package com.gemstone.gemfire;
 
-import static org.junit.Assert.*;
-
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.*;
-
-import java.util.*;
-
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.TestName;
 
+import java.util.Properties;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertTrue;
+
 /**
  * This is an abstract superclass for classes that test GemFire.  It
  * has setUp() and tearDown() methods that create and initialize a
@@ -44,9 +46,9 @@ public abstract class GemFireTestCase {
   public void setUp() throws Exception {
     Properties p = new Properties();
     // make it a loner
-    p.setProperty("mcast-port", "0");
-    p.setProperty("locators", "");
-    p.setProperty(DistributionConfig.NAME_NAME, getName());
+    p.setProperty(MCAST_PORT, "0");
+    p.setProperty(LOCATORS, "");
+    p.setProperty(SystemConfigurationProperties.NAME, getName());
     DistributedSystem.connect(p);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
index ad56bab..a24708d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/JtaNoninvolvementJUnitTest.java
@@ -16,27 +16,25 @@
  */
 package com.gemstone.gemfire;
 
-import static org.junit.Assert.*;
-
 import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.*;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.internal.jndi.JNDIInvoker;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-
-import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.naming.NamingException;
-import javax.transaction.UserTransaction;
-
 import org.junit.After;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runners.MethodSorters;
 
+import javax.transaction.UserTransaction;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
 /**
  * Ensure that the ignoreJTA Region setting works
  *
@@ -53,7 +51,7 @@ public class JtaNoninvolvementJUnitTest {
 
   private void createCache(boolean copyOnRead) throws CacheException {
     Properties p = new Properties();
-    p.setProperty("mcast-port", "0"); // loner
+    p.setProperty(MCAST_PORT, "0"); // loner
     this.cache = CacheFactory.create(DistributedSystem.connect(p));
 
     AttributesFactory af = new AttributesFactory();
@@ -161,7 +159,7 @@ public class JtaNoninvolvementJUnitTest {
   public void test002IgnoreJTASysProp() throws Exception {
     javax.transaction.UserTransaction ut = null;
     try {
-      System.setProperty("gemfire.ignoreJTA", "true");
+      System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "ignoreJTA", "true");
       createCache(false);
       ut = 
           (UserTransaction) cache.getJNDIContext().lookup("java:/UserTransaction");
@@ -173,7 +171,7 @@ public class JtaNoninvolvementJUnitTest {
     } finally {
       closeCache();
       cache = null;
-      System.setProperty("gemfire.ignoreJTA", "false");
+      System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "ignoreJTA", "false");
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
index 700ea4f..5ccbc98 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
@@ -17,12 +17,15 @@
 package com.gemstone.gemfire;
 
 import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import org.junit.experimental.categories.Category;
 
-import java.util.*;
+import java.util.Properties;
 
-import org.junit.experimental.categories.Category;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
 
 /**
  * Tests the functionality of JOM {@link Statistics}.
@@ -37,11 +40,11 @@ public class LocalStatisticsJUnitTest extends StatisticsTestCase {
   protected DistributedSystem getSystem() {
     if (this.system == null) {
       Properties props = new Properties();
-      props.setProperty("statistic-sampling-enabled", "true");
-      props.setProperty("statistic-archive-file", "StatisticsTestCase-localTest.gfs");
-      props.setProperty("mcast-port", "0");
-      props.setProperty("locators", "");
-      props.setProperty(DistributionConfig.NAME_NAME, getName());
+      props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+      props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "StatisticsTestCase-localTest.gfs");
+      props.setProperty(MCAST_PORT, "0");
+      props.setProperty(LOCATORS, "");
+      props.setProperty(SystemConfigurationProperties.NAME, getName());
       this.system = DistributedSystem.connect(props);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
index eab238e..bbc485f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
@@ -16,23 +16,27 @@
  */
 package com.gemstone.gemfire;
 
-import static org.junit.Assert.*;
-
+import com.gemstone.gemfire.cache.*;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.distributed.internal.LonerDistributionManager;
-import com.gemstone.gemfire.internal.*;
-import com.gemstone.gemfire.distributed.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.cache.*;
+import com.gemstone.gemfire.internal.OSProcess;
+import com.gemstone.gemfire.internal.PureJavaMode;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-
-import java.util.Properties;
-import java.net.*;
-
 import org.junit.After;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Properties;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
 /**
  * This class makes sure an isolated "loner" distribution manager
  * can be created and do some cache functions.
@@ -56,9 +60,9 @@ public class LonerDMJUnitTest {
     DistributedSystem ds = null;
     Cache c = null;
     Properties cfg = new Properties();
-    cfg.setProperty("mcast-port", "0");
-    cfg.setProperty("locators", "");
-    cfg.setProperty("statistic-sampling-enabled", "false");
+    cfg.setProperty(MCAST_PORT, "0");
+    cfg.setProperty(LOCATORS, "");
+    cfg.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
 
     for (int i=0; i < 2; i++) {
       start = System.currentTimeMillis();
@@ -109,10 +113,10 @@ public class LonerDMJUnitTest {
     DistributedSystem ds = null;
     Cache c = null;
     Properties cfg = new Properties();
-    cfg.setProperty("mcast-port", "0");
-    cfg.setProperty("locators", "");
-    cfg.setProperty("statistic-sampling-enabled", "true");
-    cfg.setProperty("statistic-archive-file", "lonerStats.gfs");
+    cfg.setProperty(MCAST_PORT, "0");
+    cfg.setProperty(LOCATORS, "");
+    cfg.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+    cfg.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "lonerStats.gfs");
 
     for (int i=0; i < 1; i++) {
       start = System.currentTimeMillis();
@@ -162,10 +166,10 @@ public class LonerDMJUnitTest {
     String name = "Foo";
 
     Properties cfg = new Properties();
-    cfg.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-    cfg.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    cfg.setProperty(MCAST_PORT, "0");
+    cfg.setProperty(LOCATORS, "");
     cfg.setProperty(DistributionConfig.ROLES_NAME, "lonelyOne");
-    cfg.setProperty(DistributionConfig.NAME_NAME, name);
+    cfg.setProperty(SystemConfigurationProperties.NAME, name);
     DistributedSystem ds = DistributedSystem.connect(cfg);
     System.out.println("MemberId = " + ds.getMemberId());
     assertEquals(host.toString(), ds.getDistributedMember().getHost());


Mime
View raw message