You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by hi...@apache.org on 2016/06/07 19:06:21 UTC

[02/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
index 6b9b228..b7f2bcf 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/DataSourceJTAJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import com.gemstone.gemfire.util.test.TestUtil;
@@ -37,8 +36,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * This test case is to test the following test scenarios: 1) Get Simple DS
@@ -93,7 +91,7 @@ public class DataSourceJTAJUnitTest {
     try {
       Properties props = new Properties();
       String path= TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml");
-      props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+      props.setProperty(CACHE_XML_FILE, path);
       ds = connect(props);
       tableName = CacheUtils.init(ds, "JTATest");
       // System.out.println ("Table name: " + tableName);
@@ -274,7 +272,7 @@ public class DataSourceJTAJUnitTest {
     try {
       Properties props = new Properties();
       String path= TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml");
-      props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+      props.setProperty(CACHE_XML_FILE, path);
       ds = connect(props);
       tableName = CacheUtils.init(ds, "JTATest");
       System.out.println("Table name: " + tableName);
@@ -585,7 +583,7 @@ public class DataSourceJTAJUnitTest {
     try {
       Properties props = new Properties();
       String path= TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml");
-      props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+      props.setProperty(CACHE_XML_FILE, path);
       ds = connect(props);
       tableName = CacheUtils.init(ds, "JTATest");
       // System.out.println ("Table name: " + tableName);
@@ -749,7 +747,7 @@ public class DataSourceJTAJUnitTest {
     try {
       Properties props = new Properties();
       String path= TestUtil.getResourcePath(CacheUtils.class, "cachejta.xml");
-      props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+      props.setProperty(CACHE_XML_FILE, path);
       ds = connect(props);
       tableName = CacheUtils.init(ds, "JTATest");
       // System.out.println ("Table name: " + tableName);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
index b78cdf7..58cde28 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/GlobalTransactionJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.datasource.GemFireBasicDataSource;
 import com.gemstone.gemfire.internal.datasource.GemFireTransactionDataSource;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -33,7 +32,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 @Category(IntegrationTest.class)
 public class GlobalTransactionJUnitTest extends TestCase {
@@ -49,7 +48,7 @@ public class GlobalTransactionJUnitTest extends TestCase {
     props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     String path = TestUtil.getResourcePath(GlobalTransactionJUnitTest.class, "/jta/cachejta.xml");
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+    props.setProperty(CACHE_XML_FILE, path);
     ds1 = DistributedSystem.connect(props);
     cache = CacheFactory.create(ds1);
     utx = new UserTransactionImpl();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
index 2bd6790..9ac3f39 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/TransactionTimeOutJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.datasource.GemFireTransactionDataSource;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import com.gemstone.gemfire.util.test.TestUtil;
@@ -38,7 +37,7 @@ import java.sql.Statement;
 import java.util.Properties;
 import java.util.Random;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 //import java.sql.SQLException;
 
@@ -65,8 +64,8 @@ public class TransactionTimeOutJUnitTest extends TestCase {
     wr.write(modified_file_str);
     wr.flush();
     wr.close();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
-    // props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME,"D:\\projects\\JTA\\cachejta.xml");
+    props.setProperty(CACHE_XML_FILE, path);
+    // props.setProperty(cacheXmlFile,"D:\\projects\\JTA\\cachejta.xml");
     ds1 = DistributedSystem.connect(props);
     cache = CacheFactory.create(ds1);
     cache.getLogger().fine("SWAP:running test:"+getName());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
index 874a04d..f5cd573 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/ExceptionsDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.OSProcess;
 import com.gemstone.gemfire.internal.jta.CacheUtils;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
@@ -35,6 +34,8 @@ import java.io.*;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class ExceptionsDUnitTest extends DistributedTestCase {
 
   static DistributedSystem ds;
@@ -125,7 +126,7 @@ public class ExceptionsDUnitTest extends DistributedTestCase {
     wr.write(modified_file_str);
     wr.flush();
     wr.close();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+    props.setProperty(CACHE_XML_FILE, path);
 //    String tableName = "";
     //		  props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
     try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
index 9dd4dbe..fc6d02a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/IdleTimeOutDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.OSProcess;
 import com.gemstone.gemfire.internal.jta.CacheUtils;
 import com.gemstone.gemfire.test.dunit.*;
@@ -34,6 +33,8 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class IdleTimeOutDUnitTest extends DistributedTestCase {
 
   static DistributedSystem ds;
@@ -128,7 +129,7 @@ public class IdleTimeOutDUnitTest extends DistributedTestCase {
     wr.write(modified_file_str);
     wr.flush();
     wr.close();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+    props.setProperty(CACHE_XML_FILE, path);
     String tableName = "";
     //	        props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
     try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
index 644809f..7d66a41 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/LoginTimeOutDUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.OSProcess;
 import com.gemstone.gemfire.internal.jta.CacheUtils;
@@ -36,7 +35,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 public class LoginTimeOutDUnitTest extends DistributedTestCase {
   private static final Logger logger = LogService.getLogger();
@@ -132,7 +131,7 @@ public class LoginTimeOutDUnitTest extends DistributedTestCase {
     wr.write(modified_file_str);
     wr.flush();
     wr.close();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+    props.setProperty(CACHE_XML_FILE, path);
     props.setProperty(MCAST_PORT, "0");
     String tableName = "";
     cache = new CacheFactory(props).create();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
index ca5f6f7..a6ce3bd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/MaxPoolSizeDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.OSProcess;
 import com.gemstone.gemfire.internal.jta.CacheUtils;
 import com.gemstone.gemfire.test.dunit.*;
@@ -34,6 +33,8 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class MaxPoolSizeDUnitTest extends DistributedTestCase {
 
   static DistributedSystem ds;
@@ -126,7 +127,7 @@ public class MaxPoolSizeDUnitTest extends DistributedTestCase {
     wr.write(modified_file_str);
     wr.flush();
     wr.close();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+    props.setProperty(CACHE_XML_FILE, path);
     String tableName = "";
     //	        props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
     try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
index 710b7dc..1d3dde8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TransactionTimeOutDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.jta.dunit;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.OSProcess;
 import com.gemstone.gemfire.internal.datasource.GemFireTransactionDataSource;
 import com.gemstone.gemfire.internal.jta.CacheUtils;
@@ -36,6 +35,8 @@ import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
 *This test tests TransactionTimeOut functionality
 */
@@ -61,7 +62,7 @@ public class TransactionTimeOutDUnitTest extends DistributedTestCase {
     wr.flush();
     wr.close();
 
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+    props.setProperty(CACHE_XML_FILE, path);
     //    props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10321");
     try {
 //      ds = DistributedSystem.connect(props);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
index 109c316..3cd06e5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnManagerMultiThreadDUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.OSProcess;
 import com.gemstone.gemfire.internal.jta.CacheUtils;
 import com.gemstone.gemfire.internal.jta.JTAUtils;
@@ -38,6 +37,8 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * This test case is to test the following test scenarios: 1) Behaviour of
  * Transaction Manager in multy threaded thransactions. We will have around five
@@ -184,7 +185,7 @@ public class TxnManagerMultiThreadDUnitTest extends DistributedTestCase {
     wr.write(modified_file_str1);
     wr.flush();
     wr.close();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+    props.setProperty(CACHE_XML_FILE, path);
     String tableName = "";
     //    props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10339");
     try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
index fa835be..6cb3ce5 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/jta/dunit/TxnTimeOutDUnitTest.java
@@ -32,6 +32,8 @@ import java.io.*;
 import java.sql.SQLException;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
 *This test sees if the TransactionTimeOut works properly
 */
@@ -57,9 +59,9 @@ public class TxnTimeOutDUnitTest extends DistributedTestCase {
     wr.write(modified_file_str);
     wr.flush();
     wr.close();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, path);
+    props.setProperty(CACHE_XML_FILE, path);
     //    props.setProperty(DistributionConfig.SystemConfigurationProperties.MCAST_PORT, "10321");
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+    props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     try {
 //      ds = DistributedSystem.connect(props);
       ds = (new TxnTimeOutDUnitTest("temp")).getSystem(props);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
index d4ef01b..7c186cd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/DistributedSystemLogFileJUnitTest.java
@@ -41,8 +41,7 @@ import java.io.FileNotFoundException;
 import java.util.Properties;
 import java.util.Scanner;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**
@@ -81,14 +80,14 @@ public class DistributedSystemLogFileJUnitTest {
     final String logFileName = name.getMethodName() + "-system-0.log";
 
     final Properties properties = new Properties();
-    properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
-    properties.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+    properties.put(LOG_FILE, logFileName);
+    properties.put(LOG_LEVEL, "config");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
-    properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+    properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
     properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
-    properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
-    properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    properties.put(MEMBER_TIMEOUT, "2000");
+    properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
     final File logFile = new File(logFileName);
     if (logFile.exists()) {
@@ -469,14 +468,14 @@ public class DistributedSystemLogFileJUnitTest {
     final String logFileName = name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
 
     final Properties properties = new Properties();
-    properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
-    properties.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    properties.put(LOG_FILE, logFileName);
+    properties.put(LOG_LEVEL, "fine");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
-    properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+    properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
     properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
-    properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
-    properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    properties.put(MEMBER_TIMEOUT, "2000");
+    properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
     final File logFile = new File(logFileName);
     if (logFile.exists()) {
@@ -685,14 +684,14 @@ public class DistributedSystemLogFileJUnitTest {
     final String logFileName = name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
 
     final Properties properties = new Properties();
-    properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
-    properties.put(DistributionConfig.LOG_LEVEL_NAME, "debug");
+    properties.put(LOG_FILE, logFileName);
+    properties.put(LOG_LEVEL, "debug");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
-    properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+    properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
     properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
-    properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
-    properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    properties.put(MEMBER_TIMEOUT, "2000");
+    properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
     final File logFile = new File(logFileName);
     if (logFile.exists()) {
@@ -902,15 +901,15 @@ public class DistributedSystemLogFileJUnitTest {
     final String securityLogFileName = "security" + name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
 
     final Properties properties = new Properties();
-    properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
-    properties.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    properties.put(LOG_FILE, logFileName);
+    properties.put(LOG_LEVEL, "fine");
     properties.put(DistributionConfig.SECURITY_LOG_FILE_NAME, securityLogFileName);
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
-    properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+    properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
     properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
-    properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
-    properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    properties.put(MEMBER_TIMEOUT, "2000");
+    properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
     final File securityLogFile = new File(securityLogFileName);
     if (securityLogFile.exists()) {
@@ -1020,16 +1019,16 @@ public class DistributedSystemLogFileJUnitTest {
     final String securityLogFileName = "security" + name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
 
     final Properties properties = new Properties();
-    properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
-    properties.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    properties.put(LOG_FILE, logFileName);
+    properties.put(LOG_LEVEL, "fine");
     properties.put(DistributionConfig.SECURITY_LOG_FILE_NAME, securityLogFileName);
     properties.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "fine");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
-    properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+    properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
     properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
-    properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
-    properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    properties.put(MEMBER_TIMEOUT, "2000");
+    properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
     final File securityLogFile = new File(securityLogFileName);
     if (securityLogFile.exists()) {
@@ -1199,15 +1198,15 @@ public class DistributedSystemLogFileJUnitTest {
     final String logFileName = name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
 
     final Properties properties = new Properties();
-    properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
-    properties.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    properties.put(LOG_FILE, logFileName);
+    properties.put(LOG_LEVEL, "fine");
     properties.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "info");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
-    properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+    properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
     properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
-    properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
-    properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    properties.put(MEMBER_TIMEOUT, "2000");
+    properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
     final File logFile = new File(logFileName);
     if (logFile.exists()) {
@@ -1348,15 +1347,15 @@ public class DistributedSystemLogFileJUnitTest {
     final String logFileName = name.getMethodName() + "-system-"+ System.currentTimeMillis()+".log";
 
     final Properties properties = new Properties();
-    properties.put(DistributionConfig.LOG_FILE_NAME, logFileName);
-    properties.put(DistributionConfig.LOG_LEVEL_NAME, "info");
+    properties.put(LOG_FILE, logFileName);
+    properties.put(LOG_LEVEL, "info");
     properties.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "fine");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
-    properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+    properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
     properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
-    properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
-    properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    properties.put(MEMBER_TIMEOUT, "2000");
+    properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
     final File logFile = new File(logFileName);
     if (logFile.exists()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
index f5baa9c..f6bf465 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LocatorLogFileJUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.internal.logging;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.distributed.Locator;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
@@ -70,13 +72,13 @@ public class LocatorLogFileJUnitTest {
     final String locators = "localhost[" + port + "]";
 
     final Properties properties = new Properties();
-    properties.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+    properties.put(LOG_LEVEL, "config");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, locators);
-    properties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "false");
+    properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
     properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
-    properties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
-    properties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    properties.put(MEMBER_TIMEOUT, "2000");
+    properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
     final File logFile = new File(name.getMethodName() + "-locator-" + port + ".log");
     if (logFile.exists()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
index d767e98..ee43682 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
@@ -29,6 +29,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Tests performance of logging when level is OFF.
  * 
@@ -45,8 +47,8 @@ public class LogWriterPerformanceTest extends LoggingPerformanceTestCase {
     final Properties props = new Properties();
     this.logFile = new File(this.configDirectory, DistributionConfig.GEMFIRE_PREFIX + "log");
     final String logFilePath = IOUtils.tryGetCanonicalPathElseGetAbsolutePath(logFile);
-    props.setProperty(DistributionConfig.LOG_FILE_NAME, logFilePath);
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
+    props.setProperty(LOG_FILE, logFilePath);
+    props.setProperty(LOG_LEVEL, "info");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
index 2e86404..f9eed64 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/CustomConfigWithCacheIntegrationTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.logging.log4j.custom;
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.log4j.Configurator;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
@@ -40,8 +39,7 @@ import org.junit.rules.TestName;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.logging.log4j.custom.CustomConfiguration.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -84,7 +82,7 @@ public class CustomConfigWithCacheIntegrationTest {
     Properties gemfireProperties = new Properties();
     gemfireProperties.put(LOCATORS, "");
     gemfireProperties.put(MCAST_PORT, "0");
-    gemfireProperties.put(DistributionConfig.LOG_LEVEL_NAME, "info");
+    gemfireProperties.put(LOG_LEVEL, "info");
     this.cache = new CacheFactory(gemfireProperties).create();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
index 3b57d7c..861209d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/offheap/OutOfOffHeapMemoryDUnitTest.java
@@ -43,7 +43,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static com.jayway.awaitility.Awaitility.with;
 import static org.hamcrest.CoreMatchers.equalTo;
 
@@ -116,7 +116,7 @@ public class OutOfOffHeapMemoryDUnitTest extends CacheTestCase {
   public Properties getDistributedSystemProperties() {
     final Properties props = new Properties();
     props.put(MCAST_PORT, "0");
-    props.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+    props.put(STATISTIC_SAMPLING_ENABLED, "true");
     if (isSmallerVM.get()) {
       props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, getSmallerOffHeapMemorySize());
     } else {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
index 8aa78af..3482f20 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/statistics/StatisticsDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.internal.statistics;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.*;
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
@@ -23,7 +25,6 @@ import com.gemstone.gemfire.cache.util.RegionMembershipListenerAdapter;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.*;
@@ -125,9 +126,9 @@ public class StatisticsDUnitTest extends CacheTestCase {
         public void run2() throws CacheException {
           new File(dir).mkdir();
           final Properties props = new Properties();
-          props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-          props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "1000");
-          props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, pubArchives[pubVM]);
+          props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+          props.setProperty(STATISTIC_SAMPLE_RATE, "1000");
+          props.setProperty(STATISTIC_ARCHIVE_FILE, pubArchives[pubVM]);
           final InternalDistributedSystem system = getSystem(props);
   
           // assert that sampler is working as expected
@@ -179,9 +180,9 @@ public class StatisticsDUnitTest extends CacheTestCase {
       public Object call() throws Exception {
         new File(dir).mkdir();
         final Properties props = new Properties();
-        props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-        props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "1000");
-        props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, subArchive);
+        props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+        props.setProperty(STATISTIC_SAMPLE_RATE, "1000");
+        props.setProperty(STATISTIC_ARCHIVE_FILE, subArchive);
         final InternalDistributedSystem system = getSystem(props);
         
         final PubSubStats statistics = new PubSubStats(system, "sub-1", 1);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
index ee59e8a..eb2201f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/stats50/AtomicStatsJUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.Statistics;
 import com.gemstone.gemfire.StatisticsType;
 import com.gemstone.gemfire.StatisticsTypeFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.Test;
@@ -32,7 +31,7 @@ import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -52,7 +51,7 @@ public class AtomicStatsJUnitTest {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     //    props.setProperty("statistic-sample-rate", "60000");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
     DistributedSystem ds = DistributedSystem.connect(props);
     
     String statName = "TestStats";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
index fcb9862..d0ffdd0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ClientHealthStatsDUnitTest.java
@@ -34,6 +34,8 @@ import java.util.Collection;
 import java.util.Iterator;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Client health stats check
  * 
@@ -242,14 +244,14 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
   public static void createClientCache(Host host, Integer port, int clientNum, boolean subscriptionEnabled, boolean durable) throws Exception {
 
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, "durable-"+clientNum);
-    props.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "300000");
+    props.setProperty(DURABLE_CLIENT_ID, "durable-"+clientNum);
+    props.setProperty(DURABLE_CLIENT_TIMEOUT, "300000");
 
 //    props.setProperty("log-file", getTestMethodName()+"_client_" + clientNum + ".log");
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
-    props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, getTestMethodName() + "_client_" + clientNum
+    props.setProperty(LOG_LEVEL, "info");
+    props.setProperty(STATISTIC_ARCHIVE_FILE, getTestMethodName() + "_client_" + clientNum
         + ".gfs");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
 
     ClientCacheFactory ccf = new ClientCacheFactory(props);
     if(subscriptionEnabled){
@@ -259,8 +261,8 @@ public class ClientHealthStatsDUnitTest extends DistributedTestCase {
     }
     
     if(durable){
-      ccf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, "DurableClientId_" + clientNum);
-      ccf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "" + 300);
+      ccf.set(DURABLE_CLIENT_ID, "DurableClientId_" + clientNum);
+      ccf.set(DURABLE_CLIENT_TIMEOUT, "" + 300);
     }
 
     ccf.addPoolServer(host.getHostName(), port);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
index 5dda3da..a4c0d84 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/DataBrowserJSONValidationJUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.management;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.query.data.Position;
@@ -90,9 +92,9 @@ public class DataBrowserJSONValidationJUnitTest {
 
     final Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "60000");
+    props.setProperty(ENABLE_TIME_STATISTICS, "true");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
+    props.setProperty(STATISTIC_SAMPLE_RATE, "60000");
     props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
     props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
     props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
index ca56c07..4335af3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/LocatorManagementDUnitTest.java
@@ -31,8 +31,7 @@ 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 com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 
 /**
@@ -211,7 +210,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
         props.setProperty(MCAST_PORT, "0");
 
         props.setProperty(LOCATORS, "");
-        props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+        props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
 
         InetAddress bindAddr = null;
         try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
index d699727..ffa9e72 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/ManagementTestBase.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.management;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.DistributedMember;
@@ -202,7 +204,7 @@ public class ManagementTestBase extends DistributedTestCase {
 
   public Cache createCache(Properties props) {
     System.setProperty("dunitLogPerTest", "true");
-    props.setProperty(DistributionConfig.LOG_FILE_NAME, getTestMethodName() + "-.log");
+    props.setProperty(LOG_FILE, getTestMethodName() + "-.log");
     ds = (new ManagementTestBase("temp")).getSystem(props);
     cache = CacheFactory.create(ds);
     managementService = ManagementService.getManagementService(cache);
@@ -224,9 +226,9 @@ public class ManagementTestBase extends DistributedTestCase {
       props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
       props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
     }
-    props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-    props.setProperty(DistributionConfig.LOG_FILE_NAME, getTestMethodName() + "-.log");
+    props.setProperty(ENABLE_TIME_STATISTICS, "true");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+    props.setProperty(LOG_FILE, getTestMethodName() + "-.log");
     ds = (new ManagementTestBase("temp")).getSystem(props);
     cache = CacheFactory.create(ds);
     managementService = ManagementService.getManagementService(cache);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
index 7816cc3..583e48f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -42,8 +42,7 @@ import org.junit.experimental.categories.Category;
 import java.io.IOException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * Tests the UniversalMembershipListenerAdapter.
@@ -832,10 +831,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     final Properties serverProperties = getSystem().getProperties();
 
     //Below removed properties are already got copied as cluster SSL properties 
-    serverProperties.remove(DistributionConfig.SSL_ENABLED_NAME);
-    serverProperties.remove(DistributionConfig.SSL_CIPHERS_NAME);
-    serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME);
-    serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME);
+    serverProperties.remove(SSL_ENABLED);
+    serverProperties.remove(SSL_CIPHERS);
+    serverProperties.remove(SSL_PROTOCOLS);
+    serverProperties.remove(SSL_REQUIRE_AUTHENTICATION);
 
     com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]);
     com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId);
@@ -1524,10 +1523,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
     final String serverMemberId = serverMember.toString();
     final Properties serverProperties = getSystem().getProperties();
 
-    serverProperties.remove(DistributionConfig.SSL_ENABLED_NAME);
-    serverProperties.remove(DistributionConfig.SSL_CIPHERS_NAME);
-    serverProperties.remove(DistributionConfig.SSL_PROTOCOLS_NAME);
-    serverProperties.remove(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME);
+    serverProperties.remove(SSL_ENABLED);
+    serverProperties.remove(SSL_CIPHERS);
+    serverProperties.remove(SSL_PROTOCOLS);
+    serverProperties.remove(SSL_REQUIRE_AUTHENTICATION);
     
     com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]);
     com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
index c5b0e8f..8525c90 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/DistributedSystemStatsJUnitTest.java
@@ -35,7 +35,7 @@ import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -59,9 +59,9 @@ public class DistributedSystemStatsJUnitTest {
 
     final Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "60000");
+    props.setProperty(ENABLE_TIME_STATISTICS, "true");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
+    props.setProperty(STATISTIC_SAMPLE_RATE, "60000");
     props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
     props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
     // set JMX_MANAGER_UPDATE_RATE to practically an infinite value, so that

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
index 8481bcd..3bba787 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/bean/stats/MBeanStatsTestCase.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.management.bean.stats;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -48,11 +50,11 @@ public abstract class MBeanStatsTestCase {
     //System.setProperty("gemfire.stats.debug.debugSampleCollector", "true");
 
     final Properties props = new Properties();
-    //props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "finest");
+    //props.setProperty(LOG_LEVEL, "finest");
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "60000");
+    props.setProperty(ENABLE_TIME_STATISTICS, "true");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
+    props.setProperty(STATISTIC_SAMPLE_RATE, "60000");
     
     this.system = (InternalDistributedSystem) DistributedSystem.connect(props);
     assertNotNull(this.system.getStatSampler());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 43c67e4..8a2aab7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -139,7 +139,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
       assertEquals(true, cmdResult.getStatus().equals(Status.OK));
       assertEquals(true, resultStr.contains("G1"));
       assertEquals(true, resultStr.contains(controllerName));
-      assertEquals(true, resultStr.contains(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME));
+      assertEquals(true, resultStr.contains(ARCHIVE_FILE_SIZE_LIMIT));
       assertEquals(true, !resultStr.contains("copy-on-read"));
 
       cmdResult = executeCommand(command + " --" + CliStrings.DESCRIBE_CONFIG__HIDE__DEFAULTS + "=false");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index 11d4c49..e0ce006 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -60,8 +60,7 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 import static com.jayway.awaitility.Awaitility.waitAtMost;
@@ -773,8 +772,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
       final Properties locatorProps = new Properties();
       locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
       locatorProps.setProperty(MCAST_PORT, "0");
-      locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
-      locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+      locatorProps.setProperty(LOG_LEVEL, "fine");
+      locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
       try {
         final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
             locatorProps);
@@ -836,7 +835,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
       localProps.setProperty(MCAST_PORT, "0");
       localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
       localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
-      localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+      localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
       getSystem(localProps);
       cache = getCache();
       assertNotNull(cache);
@@ -878,7 +877,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
         localProps.setProperty(MCAST_PORT, "0");
         localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
         localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
-        localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+        localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
         cache = getCache();
         assertNotNull(cache);
@@ -907,8 +906,8 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
       final Properties locatorProps = new Properties();
       locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
       locatorProps.setProperty(MCAST_PORT, "0");
-      locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
-      locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+      locatorProps.setProperty(LOG_LEVEL, "fine");
+      locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
       try {
         final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
             locatorProps);
@@ -988,7 +987,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
       localProps.setProperty(MCAST_PORT, "0");
       localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
       localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
-      localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+      localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
       getSystem(localProps);
       cache = getCache();
       assertNotNull(cache);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 4ed7821..804314b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -41,8 +41,7 @@ import java.io.IOException;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 /**
@@ -340,8 +339,8 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
         final Properties locatorProps = new Properties();
         locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
         locatorProps.setProperty(MCAST_PORT, "0");
-        locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
-        locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+        locatorProps.setProperty(LOG_LEVEL, "fine");
+        locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
 
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null, locatorProps);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index fcfd16e..60d80c9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -441,10 +441,10 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
 
         final File locatorLogFile = new File("locator-" + locatorPort + ".log");
         final Properties locatorProps = new Properties();
-        locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
+        locatorProps.setProperty(NAME, "Locator");
         locatorProps.setProperty(MCAST_PORT, "0");
-        locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
-        locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+        locatorProps.setProperty(LOG_LEVEL, "fine");
+        locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
               locatorProps);
@@ -524,7 +524,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         localProps.setProperty(MCAST_PORT, "0");
         localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
         localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
-        localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+        localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
         Cache cache = getCache();
         assertNotNull(cache);
@@ -576,7 +576,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         localProps.setProperty(MCAST_PORT, "0");
         localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
         localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
-        localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+        localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
         Cache cache = getCache();
         assertNotNull(cache);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
index 0be65d2..8683ef3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HTTPServiceSSLSupportJUnitTest.java
@@ -29,7 +29,7 @@ import org.junit.experimental.categories.Category;
 import java.io.File;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 
 /**
@@ -74,14 +74,14 @@ public class HTTPServiceSSLSupportJUnitTest {
 
     Properties localProps = new Properties();
     localProps.setProperty(MCAST_PORT, "0");
-    localProps.setProperty(DistributionConfig.CLUSTER_SSL_ENABLED_NAME, "true");
-    localProps.setProperty(DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
-    localProps.setProperty(DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME, "password");
-    localProps.setProperty(DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME, "JKS");
-    localProps.setProperty(DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME, "SSL");
-    localProps.setProperty(DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME, "true");
-    localProps.setProperty(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME, jks.getCanonicalPath());
-    localProps.setProperty(DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME, "password");
+    localProps.setProperty(CLUSTER_SSL_ENABLED, "true");
+    localProps.setProperty(CLUSTER_SSL_KEYSTORE, jks.getCanonicalPath());
+    localProps.setProperty(CLUSTER_SSL_KEYSTORE_PASSWORD, "password");
+    localProps.setProperty(CLUSTER_SSL_KEYSTORE_TYPE, "JKS");
+    localProps.setProperty(CLUSTER_SSL_PROTOCOLS, "SSL");
+    localProps.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, "true");
+    localProps.setProperty(CLUSTER_SSL_TRUSTSTORE, jks.getCanonicalPath());
+    localProps.setProperty(CLUSTER_SSL_TRUSTSTORE_PASSWORD, "password");
 
     DistributionConfigImpl config = new DistributionConfigImpl(localProps);
 
@@ -101,12 +101,12 @@ public class HTTPServiceSSLSupportJUnitTest {
 
     Properties localProps = new Properties();
     localProps.setProperty(MCAST_PORT, "0");
-    localProps.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true");
+    localProps.setProperty(SSL_ENABLED, "true");
     System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStore", jks.getCanonicalPath());
     System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.keyStorePassword", "password");
 
-    localProps.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME, "SSL");
-    localProps.setProperty(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true");
+    localProps.setProperty(SSL_PROTOCOLS, "SSL");
+    localProps.setProperty(SSL_REQUIRE_AUTHENTICATION, "true");
     System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStore", jks.getCanonicalPath());
     System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "javax.net.ssl.trustStorePassword", "password");
 
@@ -129,10 +129,10 @@ public class HTTPServiceSSLSupportJUnitTest {
 
     Properties localProps = new Properties();
     localProps.setProperty(MCAST_PORT, "0");
-    localProps.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true");
+    localProps.setProperty(SSL_ENABLED, "true");
 
-    localProps.setProperty(DistributionConfig.SSL_PROTOCOLS_NAME, "SSL");
-    localProps.setProperty(DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true");
+    localProps.setProperty(SSL_PROTOCOLS, "SSL");
+    localProps.setProperty(SSL_REQUIRE_AUTHENTICATION, "true");
 
     Properties sslProps = new Properties();
     sslProps.setProperty("javax.net.ssl.keyStore", jks.getCanonicalPath());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index 456da75..88ba958 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -40,8 +40,7 @@ import java.io.File;
 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 com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 @Category(DistributedTest.class)
@@ -600,10 +599,10 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
 
         final File locatorLogFile = new File("locator-" + locatorPort + ".log");
         final Properties locatorProps = new Properties();
-        locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
+        locatorProps.setProperty(NAME, "Locator");
         locatorProps.setProperty(MCAST_PORT, "0");
-        locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
-        locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+        locatorProps.setProperty(LOG_LEVEL, "fine");
+        locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
               locatorProps);
@@ -684,7 +683,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
         localProps.setProperty(MCAST_PORT, "0");
         localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
         localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
-        localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+        localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
         Cache cache = getCache();
         assertNotNull(cache);
@@ -729,7 +728,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
         localProps.setProperty(MCAST_PORT, "0");
         localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
         localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
-        localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+        localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
         Cache cache = getCache();
         assertNotNull(cache);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index e190dba..385d200 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.compression.SnappyCompressor;
@@ -62,9 +64,9 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
   private Properties createProperties(String name, String groups) {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-    props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
+    props.setProperty(LOG_LEVEL, "info");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+    props.setProperty(ENABLE_TIME_STATISTICS, "true");
     props.setProperty(SystemConfigurationProperties.NAME, name);
     props.setProperty(DistributionConfig.GROUPS_NAME, groups);
     return props;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
index fb50491..931cdbe 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.query.IndexStatistics;
 import com.gemstone.gemfire.cache.query.IndexType;
 import com.gemstone.gemfire.cache.query.SelectResults;
 import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.lang.MutableIdentifiable;
 import com.gemstone.gemfire.internal.lang.ObjectUtils;
 import com.gemstone.gemfire.internal.lang.StringUtils;
@@ -45,6 +44,8 @@ import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * The ListIndexCommandDUnitTest class is distributed test suite of test cases for testing the index-based GemFire shell
  * (Gfsh) commands.
@@ -126,7 +127,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase {
   private Properties createDistributedSystemProperties(final String gemfireName) {
     final Properties distributedSystemProperties = new Properties();
 
-    distributedSystemProperties.setProperty(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+    distributedSystemProperties.setProperty(LOG_LEVEL, getDUnitLogLevel());
     distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, gemfireName);
 
     return distributedSystemProperties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
index fb21bf3..28ae887 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
@@ -41,8 +41,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
 import static com.gemstone.gemfire.test.dunit.NetworkUtils.getServerHostName;
@@ -78,9 +77,9 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase {
   private Properties createProperties(String name, String groups) {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-    props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
+    props.setProperty(LOG_LEVEL, "info");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+    props.setProperty(ENABLE_TIME_STATISTICS, "true");
     props.setProperty(SystemConfigurationProperties.NAME, name);
     props.setProperty(DistributionConfig.GROUPS_NAME, groups);
     return props;
@@ -171,10 +170,10 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase {
 
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, getServerHostName(host) + "[" + locatorPort + "]");
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-    props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
-    props.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+    props.setProperty(LOG_LEVEL, "info");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+    props.setProperty(ENABLE_TIME_STATISTICS, "true");
+    props.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
 
     return props;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index a4d5496..689d33a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -58,7 +60,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
     invokeInEveryVM(new SerializableRunnable("reset log level") {
       public void run() {
         if (cachedLogLevel != null) {
-          System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, cachedLogLevel);
+          System.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_LEVEL, cachedLogLevel);
           cachedLogLevel = null;
         }
       }
@@ -124,7 +126,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
   public void testShowLogDefault() throws IOException {
     Properties props = new Properties();
     try {
-      props.setProperty(DistributionConfig.LOG_FILE_NAME, "testShowLogDefault.log");
+      props.setProperty(LOG_FILE, "testShowLogDefault.log");
       setUpJmxManagerOnVm0ThenConnect(props);
       final VM vm1 = Host.getHost(0).getVM(0);
       final String vm1MemberId = (String) vm1.invoke(() -> getMemberId());
@@ -146,7 +148,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
   @Test
   public void testShowLogNumLines() {
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.LOG_FILE_NAME, "testShowLogNumLines.log");
+    props.setProperty(LOG_FILE, "testShowLogNumLines.log");
     try {
       setUpJmxManagerOnVm0ThenConnect(props);
       final VM vm1 = Host.getHost(0).getVM(0);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index d58a226..d1ee565 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
 import com.gemstone.gemfire.distributed.Locator;
@@ -261,8 +263,8 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
         final Properties locatorProps = new Properties();
         locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator");
         locatorProps.setProperty(MCAST_PORT, "0");
-        locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
-        locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
+        locatorProps.setProperty(LOG_LEVEL, "fine");
+        locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
               locatorProps);
@@ -365,7 +367,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
         localProps.setProperty(MCAST_PORT, "0");
         localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
         localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
-        localProps.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "true");
+        localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
         cache = getCache();
         assertNotNull(cache);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
index 42ef6eb..e94aa5a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowDeadlockDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.execute.Function;
 import com.gemstone.gemfire.cache.execute.FunctionContext;
@@ -164,10 +166,10 @@ public class ShowDeadlockDUnitTest extends JUnit4CacheTestCase {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
 //    props.setProperty(DistributionConfig.LOCATORS_NAME, getServerHostName(host) + "[" + locatorPort + "]");
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-    props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
-    props.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
+    props.setProperty(LOG_LEVEL, "info");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+    props.setProperty(ENABLE_TIME_STATISTICS, "true");
+    props.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
     return props;
   }