geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [40/67] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public
Date Thu, 02 Jun 2016 00:08:26 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java b/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
index 4016c7c..1d65311 100644
--- a/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
@@ -17,6 +17,7 @@
 
 package com.gemstone.gemfire.modules.session.internal.filter;
 
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.modules.session.filter.SessionCachingFilter;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import com.mockrunner.mock.web.MockFilterConfig;
@@ -37,9 +38,9 @@ public class SessionReplicationLocalCacheJUnitTest extends CommonTests {
     WebMockObjectFactory factory = getWebMockObjectFactory();
     MockFilterConfig config = factory.getMockFilterConfig();
 
-    config.setInitParameter("gemfire.property.mcast-port", "0");
+    config.setInitParameter(DistributionConfig.GEMFIRE_PREFIX + "property.mcast-port", "0");
     config.setInitParameter("cache-type", "peer-to-peer");
-    config.setInitParameter("gemfire.cache.enable_local_cache", "true");
+    config.setInitParameter(DistributionConfig.GEMFIRE_PREFIX + "cache.enable_local_cache", "true");
 
     factory.getMockServletContext().setContextPath(CONTEXT_PATH);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
index ea81309..481ec09 100644
--- a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
+++ b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java
@@ -261,7 +261,7 @@ public abstract class AbstractCache {
         logFile = new File("servers" + separator + weblogicName + separator +
             "logs" + separator + logFileName);
       } else {
-        logFile = new File(System.getProperty("gemfire.logdir"), logFileName);
+        logFile = new File(System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "logdir"), logFileName);
       }
     }
     return logFile;
@@ -283,7 +283,7 @@ public abstract class AbstractCache {
           statisticsArchiveFile = new File("servers" + separator + weblogicName + separator +
               "logs" + separator + statisticsArchiveFileName);
         } else {
-          statisticsArchiveFile = new File(System.getProperty("gemfire.statisticsdir"), statisticsArchiveFileName);
+          statisticsArchiveFile = new File(System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "statisticsdir"), statisticsArchiveFileName);
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
index 194a7c7..4f2d06d 100644
--- a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
+++ b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java
@@ -17,6 +17,7 @@
 package com.gemstone.gemfire.modules.session;
 
 import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.modules.session.catalina.DeltaSessionManager;
 import com.gemstone.gemfire.modules.session.catalina.PeerToPeerCacheLifecycleListener;
@@ -36,6 +37,7 @@ import java.beans.PropertyChangeEvent;
 import java.io.IOException;
 import java.io.PrintWriter;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
 import static junit.framework.Assert.*;
 
 public abstract class TestSessionsBase {
@@ -56,8 +58,8 @@ public abstract class TestSessionsBase {
     server = new EmbeddedTomcat("/test", port, "JVM-1");
 
     PeerToPeerCacheLifecycleListener p2pListener = new PeerToPeerCacheLifecycleListener();
-    p2pListener.setProperty("mcast-port", "0");
-    p2pListener.setProperty("log-level", "config");
+    p2pListener.setProperty(MCAST_PORT, "0");
+    p2pListener.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config");
     server.getEmbedded().addLifecycleListener(p2pListener);
     sessionManager = manager;
     sessionManager.setEnableCommitValve(true);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index 499c3e5..e04e012 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -16,51 +16,8 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.lang.management.ManagementFactory;
-import java.net.InetAddress;
-import java.nio.charset.Charset;
-import java.text.DateFormat;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.TimeUnit;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.Query;
-import javax.management.QueryExp;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
-import org.junit.FixMethodOrder;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runners.MethodSorters;
-
 import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.client.ClientCache;
-import com.gemstone.gemfire.cache.client.ClientCacheFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
-import com.gemstone.gemfire.cache.client.Pool;
-import com.gemstone.gemfire.cache.client.PoolFactory;
-import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.*;
 import com.gemstone.gemfire.distributed.AbstractLauncher.ServiceState;
 import com.gemstone.gemfire.distributed.AbstractLauncher.Status;
 import com.gemstone.gemfire.distributed.LocatorLauncher;
@@ -82,7 +39,32 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runners.MethodSorters;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.Query;
+import javax.management.QueryExp;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.net.InetAddress;
+import java.nio.charset.Charset;
+import java.text.DateFormat;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.TimeUnit;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
 
@@ -324,9 +306,9 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     command.addOption(CliStrings.START_LOCATOR__DIR, pathname);
     command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
     command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
     command.addOption(CliStrings.START_LOCATOR__J,
-        "-Dgemfire.jmx-manager-port=" + AvailablePortHelper.getRandomAvailableTCPPort());
+        "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + AvailablePortHelper.getRandomAvailableTCPPort());
 
     CommandResult result = executeCommand(command.toString());
 
@@ -370,10 +352,10 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName()));
     command.addOption(CliStrings.START_LOCATOR__PORT, "0");
     command.addOption(CliStrings.START_LOCATOR__PROPERTIES, gemfirePropertiesPathname);
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager=false");
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager-port=0");
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager-start=false");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager=false");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=0");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-start=false");
 
     CommandResult result = executeCommand(command.toString());
 
@@ -396,10 +378,10 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, getClass().getSimpleName().concat("_").concat(getTestMethodName()));
     command.addOption(CliStrings.START_LOCATOR__PORT, "0");
     command.addOption(CliStrings.START_LOCATOR__SECURITY_PROPERTIES, gemfireSecurityPropertiesPathname);
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager=false");
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager-port=0");
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager-start=false");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager=false");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=0");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-start=false");
 
     CommandResult result = executeCommand(command.toString());
 
@@ -492,9 +474,9 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
       command.addOption(CliStrings.START_LOCATOR__DIR, pathname);
       command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
       command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
-      command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
+      command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
       command.addOption(CliStrings.START_LOCATOR__J,
-          "-Dgemfire.jmx-manager-port=" + AvailablePortHelper.getRandomAvailableTCPPort());
+          "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + AvailablePortHelper.getRandomAvailableTCPPort());
 
       CommandResult result = executeCommand(command.toString());
 
@@ -542,8 +524,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
       command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
       command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
       command.addOption(CliStrings.START_LOCATOR__FORCE, Boolean.TRUE.toString());
-      command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
-      command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager-port=" + jmxManagerPort);
+      command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+      command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
 
       CommandResult result = executeCommand(command.toString());
 
@@ -605,8 +587,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
       command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
       command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
       command.addOption(CliStrings.START_LOCATOR__FORCE, Boolean.TRUE.toString());
-      command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
-      command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager-port=" + jmxManagerPort);
+      command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+      command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
 
       CommandResult result = executeCommand(command.toString());
 
@@ -671,8 +653,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
     command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
     command.addOption(CliStrings.START_LOCATOR__FORCE, Boolean.TRUE.toString());
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager-port=" + jmxManagerPort);
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
 
     CommandResult result = executeCommand(command.toString());
 
@@ -759,8 +741,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
     command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
     command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
     command.addOption(CliStrings.START_LOCATOR__FORCE, Boolean.TRUE.toString());
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.http-service-port=0");
-    command.addOption(CliStrings.START_LOCATOR__J, "-Dgemfire.jmx-manager-port=" + jmxManagerPort);
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+    command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
 
     CommandResult result = executeCommand(command.toString());
 
@@ -839,7 +821,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
         IOUtils.tryGetCanonicalPathElseGetAbsolutePath(writeAndGetCacheXmlFile(workingDirectory)));
     command.addOption(CliStrings.START_SERVER__INCLUDE_SYSTEM_CLASSPATH);
     command.addOption(CliStrings.START_SERVER__J,
-        "-Dgemfire." + DistributionConfig.START_LOCATOR_NAME + "=localhost[" + locatorPort + "]");
+        "-D" + DistributionConfig.GEMFIRE_PREFIX + "" + START_LOCATOR + "=localhost[" + locatorPort + "]");
 
 
     CommandResult result = executeCommand(command.toString());
@@ -935,7 +917,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
   }
 
   private ClientCache setupClientCache(final String durableClientId, final int serverPort) {
-    ClientCache clientCache = new ClientCacheFactory().set("durable-client-id", durableClientId).create();
+    ClientCache clientCache = new ClientCacheFactory().set(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId).create();
 
     PoolFactory poolFactory = PoolManager.createFactory();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
index 3d466b9..3fc1fcc 100755
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
@@ -16,24 +16,10 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
 import com.gemstone.gemfire.GemFireException;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.distributed.ServerLauncher;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.DistributionLocator;
 import com.gemstone.gemfire.internal.lang.StringUtils;
@@ -41,6 +27,17 @@ import com.gemstone.gemfire.internal.lang.SystemUtils;
 import com.gemstone.gemfire.internal.util.IOUtils;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.File;
+import java.util.*;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
 
 /**
  * The LauncherLifecycleCommandsJUnitTest class is a test suite of test cases testing the contract and functionality of
@@ -103,11 +100,11 @@ public class LauncherLifecycleCommandsJUnitTest {
 
     final Properties gemfireProperties = new Properties();
 
-    gemfireProperties.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[11235]");
+    gemfireProperties.setProperty(LOCATORS, "localhost[11235]");
     gemfireProperties.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config");
     gemfireProperties.setProperty(DistributionConfig.LOG_FILE_NAME, StringUtils.EMPTY_STRING);
-    gemfireProperties.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-    gemfireProperties.setProperty(DistributionConfig.NAME_NAME, "tidepool");
+    gemfireProperties.setProperty(MCAST_PORT, "0");
+    gemfireProperties.setProperty(SystemConfigurationProperties.NAME, "tidepool");
 
     getLauncherLifecycleCommands().addGemFireSystemProperties(commandLine, gemfireProperties);
 
@@ -118,10 +115,10 @@ public class LauncherLifecycleCommandsJUnitTest {
       final String propertyValue = gemfireProperties.getProperty(propertyName);
       if (StringUtils.isBlank(propertyValue)) {
         for (final String systemProperty : commandLine) {
-          assertFalse(systemProperty.startsWith("-Dgemfire.".concat(propertyName).concat("=")));
+          assertFalse(systemProperty.startsWith("-D" + DistributionConfig.GEMFIRE_PREFIX + "".concat(propertyName).concat("=")));
         }
       } else {
-        assertTrue(commandLine.contains("-Dgemfire.".concat(propertyName).concat("=").concat(propertyValue)));
+        assertTrue(commandLine.contains("-D" + DistributionConfig.GEMFIRE_PREFIX + "".concat(propertyName).concat("=").concat(propertyValue)));
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
index 5f3bf1f..d03e211 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
@@ -16,31 +16,12 @@
  */
 package com.gemstone.gemfire.management.internal.configuration;
 
-import static com.gemstone.gemfire.cache.RegionShortcut.*;
-import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*;
-import static com.gemstone.gemfire.internal.AvailablePortHelper.*;
-import static com.gemstone.gemfire.internal.FileUtil.*;
-import static com.gemstone.gemfire.internal.lang.StringUtils.*;
-import static com.gemstone.gemfire.management.internal.cli.CliUtil.*;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.Host.*;
-import static com.gemstone.gemfire.test.dunit.IgnoredException.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
-import static com.gemstone.gemfire.test.dunit.Wait.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashSet;
-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.RegionShortcut;
 import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.distributed.Locator;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.InternalLocator;
 import com.gemstone.gemfire.internal.ClassBuilder;
 import com.gemstone.gemfire.internal.JarDeployer;
@@ -56,11 +37,32 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
-
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+
+import static com.gemstone.gemfire.cache.RegionShortcut.PARTITION;
+import static com.gemstone.gemfire.cache.RegionShortcut.REPLICATE;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
+import static com.gemstone.gemfire.internal.FileUtil.delete;
+import static com.gemstone.gemfire.internal.FileUtil.deleteMatching;
+import static com.gemstone.gemfire.internal.lang.StringUtils.isBlank;
+import static com.gemstone.gemfire.management.internal.cli.CliUtil.getAllNormalMembers;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.Host.getHost;
+import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
+
 @Category(DistributedTest.class)
 public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
 
@@ -343,15 +345,15 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
         final File locatorLogFile = new File(locatorLogPath);
 
         final Properties locatorProps = new Properties();
-        locatorProps.setProperty(NAME_NAME, locator1Name);
-        locatorProps.setProperty(MCAST_PORT_NAME, "0");
-        locatorProps.setProperty(LOG_LEVEL_NAME, "config");
-        locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
-        locatorProps.setProperty(JMX_MANAGER_NAME, "true");
-        locatorProps.setProperty(JMX_MANAGER_START_NAME, "true");
-        locatorProps.setProperty(JMX_MANAGER_BIND_ADDRESS_NAME, String.valueOf(jmxHost));
-        locatorProps.setProperty(JMX_MANAGER_PORT_NAME, String.valueOf(jmxPort));
-        locatorProps.setProperty(HTTP_SERVICE_PORT_NAME, String.valueOf(httpPort));
+        locatorProps.setProperty(SystemConfigurationProperties.NAME, locator1Name);
+        locatorProps.setProperty(MCAST_PORT, "0");
+        locatorProps.setProperty(SystemConfigurationProperties.LOG_LEVEL, "config");
+        locatorProps.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "true");
+        locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER, "true");
+        locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER_START, "true");
+        locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER_BIND_ADDRESS, String.valueOf(jmxHost));
+        locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER_PORT, String.valueOf(jmxPort));
+        locatorProps.setProperty(SystemConfigurationProperties.HTTP_SERVICE_PORT, String.valueOf(httpPort));
 
         final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps);
 
@@ -389,9 +391,9 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
       @Override
       public Object call() {
         Properties localProps = new Properties();
-        localProps.setProperty(MCAST_PORT_NAME, "0");
-        localProps.setProperty(LOCATORS_NAME, "localhost:" + locator1Port);
-        localProps.setProperty(NAME_NAME, "DataMember");
+        localProps.setProperty(MCAST_PORT, "0");
+        localProps.setProperty(SystemConfigurationProperties.LOCATORS, "localhost:" + locator1Port);
+        localProps.setProperty(SystemConfigurationProperties.NAME, "DataMember");
         getSystem(localProps);
         Cache cache = getCache();
         assertNotNull(cache);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
index c2a4cec..6861f64 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
@@ -16,42 +16,17 @@
  */
 package com.gemstone.gemfire.rest.internal.web;
 
-import static org.junit.Assert.*;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.annotation.Resource;
-
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.cache.RegionService;
+import com.gemstone.gemfire.cache.*;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.GemFireVersion;
 import com.gemstone.gemfire.internal.util.IOUtils;
 import com.gemstone.gemfire.management.internal.AgentUtil;
-import com.gemstone.gemfire.pdx.PdxInstance;
-import com.gemstone.gemfire.pdx.PdxReader;
-import com.gemstone.gemfire.pdx.PdxSerializable;
-import com.gemstone.gemfire.pdx.PdxWriter;
-import com.gemstone.gemfire.pdx.ReflectionBasedAutoSerializer;
+import com.gemstone.gemfire.pdx.*;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -68,6 +43,16 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.client.ResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.Resource;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.*;
+
 /**
  * The GemFireRestInterfaceTest class is a test suite of test cases testing the contract and functionality of the
  * GemFire Developer REST API, mixing Java clients, this test GemFire's Cache Region API, along with
@@ -124,12 +109,12 @@ public class RestInterfaceJUnitTest {
         .setPdxReadSerialized(true)
         .setPdxIgnoreUnreadFields(false)
         .set("name", getClass().getSimpleName())
-        .set("mcast-port", "0")
-        .set("log-level", "config")
-        .set("http-service-bind-address", "localhost")
-        .set("http-service-port", String.valueOf(getHttpServicePort()))
+          .set(MCAST_PORT, "0")
+          .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+          .set(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, "localhost")
+          .set(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(getHttpServicePort()))
         //.set("http-service-ssl-enabled", "false")
-        .set("start-dev-rest-api", "true")
+          .set(DistributionConfig.START_DEV_REST_API_NAME, "true")
         .create();
 
       RegionFactory<String, Object> peopleRegionFactory = gemfireCache.createRegionFactory();
@@ -149,11 +134,11 @@ public class RestInterfaceJUnitTest {
 
   protected synchronized int getHttpServicePort() {
     try {
-      return Integer.parseInt(StringUtils.trimWhitespace(gemfireProperties.getProperty("http-service-port")));
+      return Integer.parseInt(StringUtils.trimWhitespace(gemfireProperties.getProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME)));
     }
     catch (NumberFormatException ignore) {
       int httpServicePort = getHttpServicePort(DEFAULT_HTTP_SERVICE_PORT);
-      gemfireProperties.setProperty("http-service-port", String.valueOf(httpServicePort));
+      gemfireProperties.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(httpServicePort));
       return httpServicePort;
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
index 4d0abcd..2eddddc 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.rest.internal.web.controllers;
 
 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.FunctionService;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
@@ -110,7 +109,7 @@ public class RestAPITestBase extends DistributedTestCase {
     Properties props = new Properties();
 
     if (groups != null) {
-      props.put("groups", groups);
+      props.put(DistributionConfig.GROUPS_NAME, groups);
     }
 
     props.setProperty(DistributionConfig.START_DEV_REST_API_NAME, "true");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index aa61a17..8e0286a 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -50,6 +50,9 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.*;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+
 /**
  * Dunit Test containing inter - operations between REST Client and Gemfire cache client
  *
@@ -178,8 +181,8 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
       final ServerLoadProbe probe) {
 
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.MCAST_PORT_NAME, String.valueOf(0));
-    props.setProperty(DistributionConfig.LOCATORS_NAME, locators);
+    props.setProperty(MCAST_PORT, String.valueOf(0));
+    props.setProperty(LOCATORS, locators);
     props.setProperty(DistributionConfig.START_DEV_REST_API_NAME, "true");
     props.setProperty(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, hostName);
     props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(restServicerPort));
@@ -829,11 +832,11 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
       , final ServerLoadProbe probe) throws IOException {
     Properties props = new Properties();
     props
-        .setProperty(DistributionConfig.MCAST_PORT_NAME, String.valueOf(0));
-    props.setProperty(DistributionConfig.LOCATORS_NAME, locators);
+        .setProperty(MCAST_PORT, String.valueOf(0));
+    props.setProperty(LOCATORS, locators);
 
-    props.setProperty("jmx-manager", "true");
-    props.setProperty("jmx-manager-start", "true");
+    props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
+    props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
     props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
 
     final int httpPort = AvailablePortHelper.getRandomAvailableTCPPort();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index fd6b312..c650e27 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -21,11 +21,10 @@ import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.execute.FunctionContext;
 import com.gemstone.gemfire.cache.execute.FunctionService;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
-import com.gemstone.gemfire.test.dunit.LogWriterUtils;
-import com.gemstone.gemfire.test.dunit.VM;
 import org.apache.http.client.methods.CloseableHttpResponse;
 
 import java.util.Properties;
@@ -75,7 +74,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
     final int servicePort = AvailablePortHelper.getRandomAvailableTCPPort();
 
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.NAME_NAME, memberName);
+    props.setProperty(SystemConfigurationProperties.NAME, memberName);
     props.setProperty(DistributionConfig.START_DEV_REST_API_NAME, "true");
     props.setProperty(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, hostName);
     props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(servicePort));

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
index d6889a7..1789c98 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
@@ -16,56 +16,32 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import junit.framework.TestCase;
-
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.CacheLoader;
-import com.gemstone.gemfire.cache.CacheWriter;
-import com.gemstone.gemfire.cache.CacheWriterException;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.Declarable;
-import com.gemstone.gemfire.cache.EntryEvent;
-import com.gemstone.gemfire.cache.LoaderHelper;
-import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.cache.RegionDestroyedException;
-import com.gemstone.gemfire.cache.RegionEvent;
-import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.cache.RegionShortcut;
-import com.gemstone.gemfire.cache.TimeoutException;
+import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.execute.FunctionService;
 import com.gemstone.gemfire.distributed.ServerLauncher;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.GemFireVersion;
 import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.management.internal.AgentUtil;
 import com.gemstone.gemfire.management.internal.ManagementConstants;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-
+import junit.framework.TestCase;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.experimental.categories.Category;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.util.StringUtils;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.HttpServerErrorException;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+
 @Category(IntegrationTest.class)
 public class RestAPIsQueryAndFEJUnitTest extends TestCase {
 
@@ -1339,12 +1315,12 @@ public class RestAPIsQueryAndFEJUnitTest extends TestCase {
     String workingDirectory = System.getProperty("geode.build.dir", System.getProperty("user.dir"));
     
     ServerLauncher serverLauncher = new ServerLauncher.Builder()
-    .set("mcast-port", "0")
+        .set(MCAST_PORT, "0")
     .setServerBindAddress(this.hostName)
     .setServerPort(AvailablePortHelper.getRandomAvailableTCPPort())
-    .set("start-dev-rest-api", "true")
-    .set("http-service-port", String.valueOf(this.restServicePort))
-    .set("http-service-bind-address", this.hostName)
+        .set(DistributionConfig.START_DEV_REST_API_NAME, "true")
+        .set(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(this.restServicePort))
+        .set(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, this.hostName)
     .setPdxReadSerialized(true)
     .setWorkingDirectory(workingDirectory)
     .build();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index a311a26..604e3cf 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -29,7 +29,6 @@ import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.management.ManagementException;
-import com.gemstone.gemfire.management.ManagementTestBase;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
@@ -54,6 +53,9 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+
 /**
  * 
  * @since GemFire 8.0
@@ -94,8 +96,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
       final Properties sslProperties, boolean clusterLevel) {
 
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-    props.setProperty(DistributionConfig.LOCATORS_NAME, locators);
+    props.setProperty(MCAST_PORT, "0");
+    props.setProperty(LOCATORS, locators);
     props.setProperty(DistributionConfig.START_DEV_REST_API_NAME, "true");
     props.setProperty(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, hostName);
     props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(restServicePort));
@@ -273,18 +275,18 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
     IgnoredException.addIgnoredException("com.gemstone.gemfire.management.ManagementException");
 
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
-    props.setProperty(DistributionConfig.LOCATORS_NAME, locators);
-    props.setProperty("jmx-manager", "true");
-    props.setProperty("jmx-manager-start", "true");
+    props.setProperty(MCAST_PORT, "0");
+    props.setProperty(LOCATORS, locators);
+    props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
+    props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
 
     Cache cache = null;
     configureSSL(props, sslProperties, false);
     while (true) {
       try {
         DistributedSystem ds = getSystem(props);
-        System.out.println("Creating cache with http-service-port " + props.getProperty("http-service-port", "7070")
-            + " and jmx-manager-port " + props.getProperty("jmx-manager-port", "1099"));
+        System.out.println("Creating cache with http-service-port " + props.getProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, "7070")
+            + " and jmx-manager-port " + props.getProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "1099"));
         cache = CacheFactory.create(ds);
         System.out.println("Successfully created cache.");
         break;
@@ -304,8 +306,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
           //try a different port
           int httpServicePort = AvailablePortHelper.getRandomAvailableTCPPort();
           int jmxManagerPort = AvailablePortHelper.getRandomAvailableTCPPort();
-          props.setProperty("http-service-port", Integer.toString(httpServicePort));
-          props.setProperty("jmx-manager-port", Integer.toString(jmxManagerPort));
+          props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, Integer.toString(httpServicePort));
+          props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, Integer.toString(jmxManagerPort));
           System.out.println("Try a different http-service-port " + httpServicePort);
           System.out.println("Try a different jmx-manager-port " + jmxManagerPort);
         } else {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java b/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
index c221167..61d73af 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/SystemFailure.java
@@ -19,6 +19,7 @@
  */
 package com.gemstone.gemfire;
 
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.SystemFailureTestHook;
 import com.gemstone.gemfire.internal.admin.remote.RemoteGfManagerAgent;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -334,7 +335,7 @@ public final class SystemFailure {
    * <code>gemfire.WATCHDOG_WAIT</code>. The default is 15 sec.
    */
   static public final int WATCHDOG_WAIT = Integer
-      .getInteger("gemfire.WATCHDOG_WAIT", 15).intValue();
+      .getInteger(DistributionConfig.GEMFIRE_PREFIX + "WATCHDOG_WAIT", 15).intValue();
   
   /**
    * This is the watchdog thread
@@ -574,7 +575,7 @@ public final class SystemFailure {
    * @guarded.By {@link #memorySync}
    */
   static long minimumMemoryThreshold = Long.getLong(
-      "gemfire.SystemFailure.chronic_memory_threshold", 1048576).longValue();
+      DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.chronic_memory_threshold", 1048576).longValue();
   
   /**
    * This is the interval, in seconds, that the proctor
@@ -586,7 +587,7 @@ public final class SystemFailure {
    * @see #setFailureMemoryThreshold(long)
    */
   static final public long MEMORY_POLL_INTERVAL = Long.getLong(
-      "gemfire.SystemFailure.MEMORY_POLL_INTERVAL", 1).longValue();
+      DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MEMORY_POLL_INTERVAL", 1).longValue();
   
   /**
    * This is the maximum amount of time, in seconds, that the proctor thread
@@ -600,7 +601,7 @@ public final class SystemFailure {
    * @see #setFailureMemoryThreshold(long)
    */
   static final public long MEMORY_MAX_WAIT = Long.getLong(
-      "gemfire.SystemFailure.MEMORY_MAX_WAIT", 15).longValue();
+      DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MEMORY_MAX_WAIT", 15).longValue();
   
   /**
    * Flag that determines whether or not we monitor memory on our own.
@@ -613,7 +614,7 @@ public final class SystemFailure {
    * @since GemFire 6.5
    */
   static final public boolean MONITOR_MEMORY = Boolean.getBoolean(
-      "gemfire.SystemFailure.MONITOR_MEMORY");
+      DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MONITOR_MEMORY");
   
   /**
    * Start the proctor thread, if it isn't already running.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java
index 4416e42..49917b6 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystemFactory.java
@@ -16,15 +16,14 @@
  */
 package com.gemstone.gemfire.admin;
 
-import com.gemstone.gemfire.admin.internal.DistributedSystemConfigImpl;
 import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
+import com.gemstone.gemfire.admin.internal.DistributedSystemConfigImpl;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.i18n.LogWriterI18n;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.logging.LocalLogWriter;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
index 5131f3c..726b228 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
@@ -17,12 +17,16 @@
 package com.gemstone.gemfire.admin;
 
 import com.gemstone.gemfire.admin.internal.InetAddressUtil;
-//import com.gemstone.gemfire.admin.jmx.AgentConfig;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 
-//import java.net.InetAddress;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
+//import com.gemstone.gemfire.admin.jmx.AgentConfig;
+//import java.net.InetAddress;
+
 /**
  * Configuration for defining a GemFire distributed system to
  * administrate.  This configuration includes information about the
@@ -64,54 +68,53 @@ public interface DistributedSystemConfig extends Cloneable {
    * {@linkplain ManagedEntity managed entities} administered by the
    * <code>DistributedSystem</code>.  The XML file must conform to a
    * <a href="doc-files/ds5_0.dtd">dtd</a>. */
-  public static final String ENTITY_CONFIG_XML_FILE_NAME =
+  String ENTITY_CONFIG_XML_FILE_NAME =
     "entity-config-xml-file";
 
   /** The default value of the "entity-config-xml-file" property
    * ("distributed-system.xml"). */
-  public static final String DEFAULT_ENTITY_CONFIG_XML_FILE =
+  String DEFAULT_ENTITY_CONFIG_XML_FILE =
     "distributed-system.xml";
 
   /** The name of the "system-id" property */
-  public static final String SYSTEM_ID_NAME = "system-id";
+  String SYSTEM_ID_NAME = "system-id";
 
   /** The default value of the "system-id" property ("") */
-  public static final String DEFAULT_SYSTEM_ID = "Default System";
+  String DEFAULT_SYSTEM_ID = "Default System";
 
   /** The name of the "name" property. See {@link #getSystemName()}. */
-  public static final String NAME_NAME = DistributionConfig.NAME_NAME;
+  String NAME_NAME = SystemConfigurationProperties.NAME;
 
   /** The default value of the "name" property (""). See {@link #getSystemName()}. */
-  public static final String DEFAULT_NAME = "";
+  String DEFAULT_NAME = "";
 
   /** The name of the "mcastPort" property */
-  public static final String MCAST_PORT_NAME = 
-    DistributionConfig.MCAST_PORT_NAME;
+  String MCAST_PORT_NAME =
+      MCAST_PORT;
 
   /** The default value of the "mcastPort" property (10334) */
-  public static final int DEFAULT_MCAST_PORT =
+  int DEFAULT_MCAST_PORT =
     DistributionConfig.DEFAULT_MCAST_PORT;
 
   /** The minimum mcastPort (0) */
-  public static final int MIN_MCAST_PORT =
+  int MIN_MCAST_PORT =
     DistributionConfig.MIN_MCAST_PORT;
 
   /** The maximum mcastPort (65535) */
-  public static final int MAX_MCAST_PORT =
+  int MAX_MCAST_PORT =
     DistributionConfig.MAX_MCAST_PORT;
   
   /** The name of the "mcastAddress" property */
-  public static final String MCAST_ADDRESS_NAME = 
-    DistributionConfig.MCAST_ADDRESS_NAME;
+  String MCAST_ADDRESS_NAME = MCAST_ADDRESS;
 
   /** The default value of the "mcastAddress" property (239.192.81.1). */
-  public static final String DEFAULT_MCAST_ADDRESS = 
+  String DEFAULT_MCAST_ADDRESS = 
       InetAddressUtil.toString(DistributionConfig.DEFAULT_MCAST_ADDRESS);
   
   /** The name of the "membership-port-range" property
    * @since GemFire 6.5
    */
-  public static final String MEMBERSHIP_PORT_RANGE_NAME = 
+  String MEMBERSHIP_PORT_RANGE_NAME = 
     DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME;
 
   /**
@@ -119,36 +122,36 @@ public interface DistributedSystemConfig extends Cloneable {
    * <p> Actual value is <code>[1024,65535]</code>.
    * @since GemFire 6.5
    */
-  public static final int[] DEFAULT_MEMBERSHIP_PORT_RANGE = 
+  int[] DEFAULT_MEMBERSHIP_PORT_RANGE = 
     DistributionConfig.DEFAULT_MEMBERSHIP_PORT_RANGE;
   
   /** settings for tcp-port
    * @since GemFire 6.5
    */
-  public static final String TCP_PORT_NAME = DistributionConfig.TCP_PORT_NAME;
+  String TCP_PORT_NAME = TCP_PORT;
   /** The default value of the "tcpPort" property.
    * <p> Actual value is <code>0</code>.
    * @since GemFire 6.5
    */
-  public static final int DEFAULT_TCP_PORT = DistributionConfig.DEFAULT_TCP_PORT;
+  int DEFAULT_TCP_PORT = DistributionConfig.DEFAULT_TCP_PORT;
 
   /**
    * The default AckWaitThreshold.
    * <p> Actual value of this constant is <code>15</code> seconds.
    */
-  public static final int DEFAULT_ACK_WAIT_THRESHOLD =
+  int DEFAULT_ACK_WAIT_THRESHOLD =
     DistributionConfig.DEFAULT_ACK_WAIT_THRESHOLD;
   /**
    * The minimum AckWaitThreshold.
    * <p> Actual value of this constant is <code>1</code> second.
    */
-  public static final int MIN_ACK_WAIT_THRESHOLD =
+  int MIN_ACK_WAIT_THRESHOLD =
     DistributionConfig.MIN_ACK_WAIT_THRESHOLD;
   /**
    * The maximum AckWaitThreshold.
    * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
    */
-  public static final int MAX_ACK_WAIT_THRESHOLD =
+  int MAX_ACK_WAIT_THRESHOLD =
     DistributionConfig.MIN_ACK_WAIT_THRESHOLD;
   
   /**
@@ -156,132 +159,130 @@ public interface DistributedSystemConfig extends Cloneable {
    * <p> Actual value of this constant is <code>0</code> seconds, which
    * turns off forced disconnects based on ack wait periods.
    */
-  public static final int DEFAULT_ACK_SEVERE_ALERT_THRESHOLD =
+  int DEFAULT_ACK_SEVERE_ALERT_THRESHOLD =
     DistributionConfig.DEFAULT_ACK_SEVERE_ALERT_THRESHOLD;
   /**
    * The minimum ackSevereAlertThreshold.
    * <p> Actual value of this constant is <code>0</code> second,
    * which turns off forced disconnects based on ack wait periods.
    */
-  public static final int MIN_ACK_SEVERE_ALERT_THRESHOLD =
+  int MIN_ACK_SEVERE_ALERT_THRESHOLD =
     DistributionConfig.MIN_ACK_SEVERE_ALERT_THRESHOLD;
   /**
    * The maximum ackSevereAlertThreshold.
    * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
    */
-  public static final int MAX_ACK_SEVERE_ALERT_THRESHOLD =
+  int MAX_ACK_SEVERE_ALERT_THRESHOLD =
     DistributionConfig.MAX_ACK_SEVERE_ALERT_THRESHOLD;
 
   /** The name of the "locators" property (comma-delimited host[port] list) */
-  public static final String LOCATORS_NAME = 
-    DistributionConfig.LOCATORS_NAME;
+  String LOCATORS_NAME = LOCATORS;
 
   /** The default value of the "locators" property ("") */
-  public static final String DEFAULT_LOCATORS =
+  String DEFAULT_LOCATORS =
     DistributionConfig.DEFAULT_LOCATORS;
 
   /** The name of the "bindAddress" property */
-  public static final String BIND_ADDRESS_NAME =
-    DistributionConfig.BIND_ADDRESS_NAME;
+  String BIND_ADDRESS_NAME = BIND_ADDRESS;
 
   /** The default value of the "bindAddress" property */
-  public static final String DEFAULT_BIND_ADDRESS =
+  String DEFAULT_BIND_ADDRESS =
     DistributionConfig.DEFAULT_BIND_ADDRESS;
 
   /** The name of the remote-command property */
-  public static final String REMOTE_COMMAND_NAME = "remote-command";
+  String REMOTE_COMMAND_NAME = "remote-command";
 
   /** The default value of the remote-command property */
-  public static final String DEFAULT_REMOTE_COMMAND =
+  String DEFAULT_REMOTE_COMMAND =
     "rsh -n {HOST} {CMD}";
 
   /** The name of the "SSLEnabled" property */
-  public static final String SSL_ENABLED_NAME = 
+  String SSL_ENABLED_NAME = 
     DistributionConfig.SSL_ENABLED_NAME;
 
   /** The default ssl-enabled state (<code>false</code>) */
-  public static final boolean DEFAULT_SSL_ENABLED =
+  boolean DEFAULT_SSL_ENABLED =
     DistributionConfig.DEFAULT_SSL_ENABLED;
  
   /** The name of the "SSLProtocols" property */
-  public static final String SSL_PROTOCOLS_NAME =
+  String SSL_PROTOCOLS_NAME =
     DistributionConfig.SSL_PROTOCOLS_NAME;
 
   /** The default ssl-protocols value (<code>any</code>) */
-  public static final String DEFAULT_SSL_PROTOCOLS =
+  String DEFAULT_SSL_PROTOCOLS =
     DistributionConfig.DEFAULT_SSL_PROTOCOLS;
    
   /** The name of the "SSLCiphers" property */
-  public static final String SSL_CIPHERS_NAME = 
+  String SSL_CIPHERS_NAME = 
     DistributionConfig.SSL_CIPHERS_NAME;
 
   /** The default ssl-ciphers value. (<code>any</code>) */
-  public static final String DEFAULT_SSL_CIPHERS =
+  String DEFAULT_SSL_CIPHERS =
     DistributionConfig.DEFAULT_SSL_CIPHERS; 
   
   /** The name of the "SSLRequireAuthentication" property */
-  public static final String SSL_REQUIRE_AUTHENTICATION_NAME =
+  String SSL_REQUIRE_AUTHENTICATION_NAME =
     DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME;
 
   /** The default ssl-require-authentication value (<code>true</code>) */
-  public static final boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION =
+  boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION =
     DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION; 
 
   /** The default disable-tcp value (<code>false</code>) */
-  public static final boolean DEFAULT_DISABLE_TCP = DistributionConfig.DEFAULT_DISABLE_TCP;
+  boolean DEFAULT_DISABLE_TCP = DistributionConfig.DEFAULT_DISABLE_TCP;
   
   /** The default enable-network-partition-detection setting (<code>false</code>) */
-  public static final boolean DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION = DistributionConfig.DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION;
+  boolean DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION = DistributionConfig.DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION;
   
   /** The default disable-auto-reconnect setting (<code>false</code>) */
-  public static final boolean DEFAULT_DISABLE_AUTO_RECONNECT = DistributionConfig.DEFAULT_DISABLE_AUTO_RECONNECT;
+  boolean DEFAULT_DISABLE_AUTO_RECONNECT = DistributionConfig.DEFAULT_DISABLE_AUTO_RECONNECT;
 
   /** The default failure-detection timeout period for member heart-beat responses */
-  public static final int DEFAULT_MEMBER_TIMEOUT = DistributionConfig.DEFAULT_MEMBER_TIMEOUT;
+  int DEFAULT_MEMBER_TIMEOUT = DistributionConfig.DEFAULT_MEMBER_TIMEOUT;
   
   /** The name of the "logFile" property */
-  public static final String LOG_FILE_NAME = "log-file";
+  String LOG_FILE_NAME = DistributionConfig.LOG_FILE_NAME;
 
   /** The default log-file value ("" which directs logging to standard
    * output) */
-  public static final String DEFAULT_LOG_FILE = "";
+  String DEFAULT_LOG_FILE = "";
 
   /** The name of the "logLevel" property */
-  public static final String LOG_LEVEL_NAME = "log-level";
+  String LOG_LEVEL_NAME = DistributionConfig.LOG_LEVEL_NAME;
 
   /** The default log level ("config") */
-  public static final String DEFAULT_LOG_LEVEL = "config";
+  String DEFAULT_LOG_LEVEL = "config";
 
   /** The name of the "LogDiskSpaceLimit" property */
-  public static final String LOG_DISK_SPACE_LIMIT_NAME =
-    "log-disk-space-limit";
+  String LOG_DISK_SPACE_LIMIT_NAME =
+      DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME;
 
   /** The default log disk space limit in megabytes (0) */
-  public static final int DEFAULT_LOG_DISK_SPACE_LIMIT =
+  int DEFAULT_LOG_DISK_SPACE_LIMIT =
     DistributionConfig.DEFAULT_LOG_DISK_SPACE_LIMIT;
 
   /** The minimum log disk space limit in megabytes (0) */
-  public static final int MIN_LOG_DISK_SPACE_LIMIT = 
+  int MIN_LOG_DISK_SPACE_LIMIT = 
     DistributionConfig.MIN_LOG_DISK_SPACE_LIMIT;
 
   /** The minimum log disk space limit in megabytes (1000000) */
-  public static final int MAX_LOG_DISK_SPACE_LIMIT =
+  int MAX_LOG_DISK_SPACE_LIMIT =
     DistributionConfig.MAX_LOG_DISK_SPACE_LIMIT;
     
   /** The name of the "LogFileSizeLimit" property */
-  public static final String LOG_FILE_SIZE_LIMIT_NAME =
-    "log-file-size-limit";
+  String LOG_FILE_SIZE_LIMIT_NAME =
+      DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME;
 
   /** The default log file size limit in megabytes (0) */
-  public static final int DEFAULT_LOG_FILE_SIZE_LIMIT =
+  int DEFAULT_LOG_FILE_SIZE_LIMIT =
     DistributionConfig.DEFAULT_LOG_FILE_SIZE_LIMIT;
 
   /** The minimum log file size limit in megabytes (0) */
-  public static final int MIN_LOG_FILE_SIZE_LIMIT =
+  int MIN_LOG_FILE_SIZE_LIMIT =
     DistributionConfig.MIN_LOG_FILE_SIZE_LIMIT;
 
   /** The minimum log file size limit in megabytes (1000000) */
-  public static final int MAX_LOG_FILE_SIZE_LIMIT =
+  int MAX_LOG_FILE_SIZE_LIMIT =
     DistributionConfig.MAX_LOG_FILE_SIZE_LIMIT;
 
   /**
@@ -293,14 +294,14 @@ public interface DistributedSystemConfig extends Cloneable {
    * when the config is created. Note that the resource MBeans actually refresh
    * and hit the DS only if there is an RMI client connected
    * */
-  public static final String REFRESH_INTERVAL_NAME =
+  String REFRESH_INTERVAL_NAME =
     "refresh-interval";
 
   /**
    * The default "refreshInterval" in seconds which will apply to
    * REFRESH_INTERVAL_NAME property. The default value is 15 secs
    * */
-  public static final int DEFAULT_REFRESH_INTERVAL = 15;
+  int DEFAULT_REFRESH_INTERVAL = 15;
 
   //////////////////////  Instance Methods  //////////////////////
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
index 0e3f4f5..1b544a8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/GemFireMemberStatus.java
@@ -16,16 +16,6 @@
  */
 package com.gemstone.gemfire.admin;
 
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.client.PoolManager;
@@ -39,16 +29,15 @@ import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedM
 import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.internal.admin.ClientHealthMonitoringRegion;
 import com.gemstone.gemfire.internal.admin.remote.ClientHealthStats;
-import com.gemstone.gemfire.internal.cache.CacheClientStatus;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.cache.HARegion;
-import com.gemstone.gemfire.internal.cache.LocalRegion;
-import com.gemstone.gemfire.internal.cache.PartitionedRegion;
-import com.gemstone.gemfire.internal.cache.PartitionedRegionStatus;
-import com.gemstone.gemfire.internal.cache.RegionStatus;
+import com.gemstone.gemfire.internal.cache.*;
 import com.gemstone.gemfire.internal.cache.tier.InternalClientMembership;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.util.*;
+
 /**
  * Class <code>GemFireMemberStatus</code> provides the status of a specific
  * GemFire member VM. This VM can be a peer, a client, a server and/or a

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
index 4a78c0a..9438d91 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
@@ -16,64 +16,20 @@
  */
 package com.gemstone.gemfire.admin.internal;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-
-import com.gemstone.gemfire.distributed.internal.*;
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.admin.AdminException;
+import com.gemstone.gemfire.admin.*;
 import com.gemstone.gemfire.admin.Alert;
-import com.gemstone.gemfire.admin.AlertLevel;
 import com.gemstone.gemfire.admin.AlertListener;
-import com.gemstone.gemfire.admin.BackupStatus;
-import com.gemstone.gemfire.admin.CacheServer;
-import com.gemstone.gemfire.admin.CacheServerConfig;
-import com.gemstone.gemfire.admin.CacheVm;
-import com.gemstone.gemfire.admin.ConfigurationParameter;
-import com.gemstone.gemfire.admin.DistributedSystemConfig;
-import com.gemstone.gemfire.admin.DistributionLocator;
-import com.gemstone.gemfire.admin.DistributionLocatorConfig;
-import com.gemstone.gemfire.admin.GemFireHealth;
-import com.gemstone.gemfire.admin.ManagedEntity;
-import com.gemstone.gemfire.admin.ManagedEntityConfig;
-import com.gemstone.gemfire.admin.OperationCancelledException;
-import com.gemstone.gemfire.admin.RuntimeAdminException;
-import com.gemstone.gemfire.admin.SystemMember;
-import com.gemstone.gemfire.admin.SystemMemberCacheListener;
-import com.gemstone.gemfire.admin.SystemMembershipEvent;
-import com.gemstone.gemfire.admin.SystemMembershipListener;
 import com.gemstone.gemfire.cache.persistence.PersistentID;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.FutureCancelledException;
+import com.gemstone.gemfire.distributed.internal.*;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.Assert;
 import com.gemstone.gemfire.internal.Banner;
-import com.gemstone.gemfire.internal.admin.ApplicationVM;
-import com.gemstone.gemfire.internal.admin.GemFireVM;
-import com.gemstone.gemfire.internal.admin.GfManagerAgent;
-import com.gemstone.gemfire.internal.admin.GfManagerAgentConfig;
-import com.gemstone.gemfire.internal.admin.GfManagerAgentFactory;
-import com.gemstone.gemfire.internal.admin.SSLConfig;
-import com.gemstone.gemfire.internal.admin.remote.CompactRequest;
-import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
-import com.gemstone.gemfire.internal.admin.remote.MissingPersistentIDsRequest;
-import com.gemstone.gemfire.internal.admin.remote.PrepareRevokePersistentIDRequest;
-import com.gemstone.gemfire.internal.admin.remote.RemoteApplicationVM;
-import com.gemstone.gemfire.internal.admin.remote.RemoteTransportConfig;
-import com.gemstone.gemfire.internal.admin.remote.RevokePersistentIDRequest;
-import com.gemstone.gemfire.internal.admin.remote.ShutdownAllRequest;
+import com.gemstone.gemfire.internal.admin.*;
+import com.gemstone.gemfire.internal.admin.remote.*;
 import com.gemstone.gemfire.internal.cache.persistence.PersistentMemberPattern;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
@@ -84,6 +40,16 @@ import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppender;
 import com.gemstone.gemfire.internal.logging.log4j.LogWriterAppenders;
 import com.gemstone.gemfire.internal.util.concurrent.FutureResult;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.*;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * Represents a GemFire distributed system for remote administration/management.
@@ -598,13 +564,13 @@ implements com.gemstone.gemfire.admin.AdminDistributedSystem,
     // set some config parms to match this system...
     ConfigurationParameter[] configParms = new ConfigurationParameter[] {
         new ConfigurationParameterImpl(
-            DistributionConfig.MCAST_PORT_NAME, 
+            MCAST_PORT,
             Integer.valueOf(this.config.getMcastPort())),
         new ConfigurationParameterImpl(
-            DistributionConfig.LOCATORS_NAME, 
+            LOCATORS,
             this.config.getLocators()),
         new ConfigurationParameterImpl(
-            DistributionConfig.MCAST_ADDRESS_NAME, 
+            MCAST_ADDRESS,
             InetAddressUtil.toInetAddress(this.config.getMcastAddress())),
         new ConfigurationParameterImpl(
             DistributionConfig.DISABLE_TCP_NAME,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
index 8a3d707..524578d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java
@@ -18,10 +18,10 @@ package com.gemstone.gemfire.admin.internal;
 
 import com.gemstone.gemfire.admin.*;
 import com.gemstone.gemfire.distributed.internal.DM;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.DistributionManager;
 import com.gemstone.gemfire.internal.admin.GemFireVM;
 import com.gemstone.gemfire.internal.admin.remote.RemoteApplicationVM;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 /**
  * Implements the administrative interface to a cache server.
@@ -142,7 +142,7 @@ public class CacheServerImpl extends ManagedSystemMemberImpl
     String file = this.getConfig().getCacheXMLFile();
     if (file != null && file.length() > 0) {
       sb.append(" ");
-      sb.append(com.gemstone.gemfire.distributed.internal.DistributionConfig.CACHE_XML_FILE_NAME);
+      sb.append(DistributionConfig.CACHE_XML_FILE_NAME);
       sb.append("=");
       sb.append(file);
     }


Mime
View raw message