geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [57/67] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public
Date Thu, 02 Jun 2016 00:08:43 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
index 8e6221a..ee430f1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticatorJUnitTest.java
@@ -39,6 +39,7 @@ import java.util.Properties;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 @Category({ UnitTest.class, SecurityTest.class })
 public class GMSAuthenticatorJUnitTest {
@@ -69,19 +70,19 @@ public class GMSAuthenticatorJUnitTest {
 
   @Test
   public void testGetSecurityProps() throws Exception {
-    props.setProperty(DistributionConfig.GEMFIRE_PREFIX + "sys.security-peer-auth-init", "dummy1");
-    props.setProperty(DistributionConfig.GEMFIRE_PREFIX + "sys.security-peer-authenticator", "dummy2");
+    props.setProperty(DistributionConfig.GEMFIRE_PREFIX + "sys."+SECURITY_PEER_AUTH_INIT, "dummy1");
+    props.setProperty(DistributionConfig.GEMFIRE_PREFIX + "sys."+SECURITY_PEER_AUTHENTICATOR, "dummy2");
     props.setProperty("security-auth-init", "dummy3");
     System.setProperties(props);
     Properties secProps = authenticator.getSecurityProps();
     assertEquals("wrong size", 2, secProps.size());
-    assertEquals("wrong value", "dummy1", secProps.getProperty(DistributionConfig.SECURITY_PEER_AUTH_INIT_NAME));
-    assertEquals("wrong value", "dummy2", secProps.getProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME));
+    assertEquals("wrong value", "dummy1", secProps.getProperty(SECURITY_PEER_AUTH_INIT));
+    assertEquals("wrong value", "dummy2", secProps.getProperty(SECURITY_PEER_AUTHENTICATOR));
   }
 
   @Test
   public void testGetCredentialNormal() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTH_INIT_NAME, prefix + "TestAuthInit2.create");
+    props.setProperty(SECURITY_PEER_AUTH_INIT, prefix + "TestAuthInit2.create");
     TestAuthInit2 auth = new TestAuthInit2();
     assertFalse(auth.isClosed());
     TestAuthInit2.setAuthInitialize(auth);
@@ -99,32 +100,32 @@ public class GMSAuthenticatorJUnitTest {
 
   @Test
   public void testGetCredentialWithEmptyAuth() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTH_INIT_NAME, "");
+    props.setProperty(SECURITY_PEER_AUTH_INIT, "");
     Properties credential = authenticator.getCredentials(member, props);
     assertNull(credential);
   }
 
   @Test
   public void testGetCredentialWithNotExistAuth() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTH_INIT_NAME, prefix + "NotExistAuth.create");
+    props.setProperty(SECURITY_PEER_AUTH_INIT, prefix + "NotExistAuth.create");
     verifyNegativeGetCredential(props, "Failed to acquire AuthInitialize method");
   }
 
   @Test
   public void testGetCredentialWithNullAuth() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTH_INIT_NAME, prefix + "TestAuthInit1.create");
+    props.setProperty(SECURITY_PEER_AUTH_INIT, prefix + "TestAuthInit1.create");
     verifyNegativeGetCredential(props, "AuthInitialize instance could not be obtained");
   }
 
   @Test
   public void testGetCredentialWithInitError() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTH_INIT_NAME, prefix + "TestAuthInit3.create");
+    props.setProperty(SECURITY_PEER_AUTH_INIT, prefix + "TestAuthInit3.create");
     verifyNegativeGetCredential(props, "expected init error");
   }
 
   @Test
   public void testGetCredentialWithError() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTH_INIT_NAME, prefix + "TestAuthInit4.create");
+    props.setProperty(SECURITY_PEER_AUTH_INIT, prefix + "TestAuthInit4.create");
     verifyNegativeGetCredential(props, "expected get credential error");
   }
 
@@ -139,7 +140,7 @@ public class GMSAuthenticatorJUnitTest {
 
   @Test
   public void testAuthenticatorNormal() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, prefix + "TestAuthenticator4.create");
+    props.setProperty(SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator4.create");
     TestAuthenticator4 auth = new TestAuthenticator4();
     assertFalse(auth.isClosed());
     TestAuthenticator4.setAuthenticator(auth);
@@ -157,38 +158,38 @@ public class GMSAuthenticatorJUnitTest {
 
   @Test
   public void testAuthenticatorWithEmptyAuth() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, "");
+    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, "");
     String result = authenticator.authenticate(member, props, props, member);
     assertNull(result);
   }
 
   @Test
   public void testAuthenticatorWithNotExistAuth() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, prefix + "NotExistAuth.create");
+    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "NotExistAuth.create");
     verifyNegativeAuthenticate(props, props, "Authentication failed. See coordinator");
   }
 
   @Test
   public void testAuthenticatorWithNullAuth() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, prefix + "TestAuthenticator1.create");
+    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator1.create");
     verifyNegativeAuthenticate(props, props, "Authentication failed. See coordinator");
   }
 
   @Test
   public void testAuthenticatorWithNullCredential() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, prefix + "TestAuthenticator1.create");
+    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator1.create");
     verifyNegativeAuthenticate(null, props, "Failed to find credentials from");
   }
 
   @Test
   public void testAuthenticatorWithAuthInitFailure() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, prefix + "TestAuthenticator2.create");
+    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator2.create");
     verifyNegativeAuthenticate(props, props, "Authentication failed. See coordinator");
   }
 
   @Test
   public void testAuthenticatorWithAuthFailure() throws Exception {
-    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR_NAME, prefix + "TestAuthenticator3.create");
+    props.setProperty(DistributionConfig.SECURITY_PEER_AUTHENTICATOR, prefix + "TestAuthenticator3.create");
     verifyNegativeAuthenticate(props, props, "Authentication failed. See coordinator");
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
index a931fe8..6868acb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/SSLConfigIntegrationJUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.management.GemFireProperties;
 import com.gemstone.gemfire.management.ManagementService;
 import com.gemstone.gemfire.management.MemberMXBean;
@@ -26,7 +25,7 @@ import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -38,7 +37,7 @@ public class SSLConfigIntegrationJUnitTest {
 
   @Test
   public void testIsClusterSSLRequireAuthentication() {
-    Cache mCache = new CacheFactory().set(MCAST_PORT, "0").set(DistributionConfig.JMX_MANAGER_NAME, "true").create();
+    Cache mCache = new CacheFactory().set(MCAST_PORT, "0").set(JMX_MANAGER, "true").create();
     ManagementService mService = ManagementService.getManagementService(mCache);
     MemberMXBean mMemberBean = mService.getMemberMXBean();
     GemFireProperties mGemFireProperties = mMemberBean.listGemFireProperties();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
index 8da507b..bb8c119 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ClientServerGetAllDUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.ClientServerTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.offheap.MemoryAllocatorImpl;
@@ -30,8 +29,7 @@ import com.gemstone.gemfire.test.dunit.*;
 
 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.*;
 
 /**
  * Class <code>ClientServerGetAllDUnitTest</code> test client/server getAll.
@@ -655,7 +653,7 @@ import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCA
         Properties config = new Properties();
         config.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]");
         if (offheap) {
-          config.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "350m");
+          config.setProperty(OFF_HEAP_MEMORY_SIZE, "350m");
         }
         getSystem(config);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
index 5469948..0475e37 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DeltaPropagationStatsDUnitTest.java
@@ -27,7 +27,6 @@ import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.DistributionStats;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
@@ -37,8 +36,7 @@ import com.gemstone.gemfire.test.dunit.*;
 
 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.*;
 
 /**
  * 
@@ -553,7 +551,7 @@ public class DeltaPropagationStatsDUnitTest extends DistributedTestCase {
     Properties props = new Properties();
     if (!flag) {
       props
-          .setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false");
+          .setProperty(DELTA_PROPAGATION, "false");
     }
     cache = test.createCache(props);
     AttributesFactory factory = new AttributesFactory();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
index 5f4f4da..faad1d2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DistrbutedRegionProfileOffHeapDUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.cache;
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.IgnoredException;
 import com.gemstone.gemfire.test.dunit.Invoke;
@@ -27,6 +26,8 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
   private static final long serialVersionUID = 1L;
 
@@ -64,7 +65,7 @@ public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
       public void run2() throws CacheException {
         disconnectFromDS();
         Properties properties = new Properties();
-        properties.put(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "2m");
+        properties.put(OFF_HEAP_MEMORY_SIZE, "2m");
         getSystem(properties);
 
         GemFireCacheImpl cache = (GemFireCacheImpl) getCache();
@@ -121,7 +122,7 @@ public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
         public void run2() throws CacheException {
           disconnectFromDS();
           Properties properties = new Properties();
-          properties.put(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "2m");
+          properties.put(OFF_HEAP_MEMORY_SIZE, "2m");
           getSystem(properties);
 
           GemFireCacheImpl cache = (GemFireCacheImpl) getCache();
@@ -158,7 +159,7 @@ public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
       public void run2() throws CacheException {
         disconnectFromDS();
         Properties properties = new Properties();
-        properties.put(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "2m");
+        properties.put(OFF_HEAP_MEMORY_SIZE, "2m");
         getSystem(properties);
 
         GemFireCacheImpl cache = (GemFireCacheImpl) getCache();
@@ -179,7 +180,7 @@ public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
       public void run2() throws CacheException {
         disconnectFromDS();
         Properties properties = new Properties();
-        properties.put(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "2m");
+        properties.put(OFF_HEAP_MEMORY_SIZE, "2m");
         getSystem(properties);
 
         GemFireCacheImpl cache = (GemFireCacheImpl) getCache();
@@ -211,7 +212,7 @@ public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
       public void run2() throws CacheException {
         disconnectFromDS();
         Properties properties = new Properties();
-        properties.put(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "2m");
+        properties.put(OFF_HEAP_MEMORY_SIZE, "2m");
         getSystem(properties);
 
         GemFireCacheImpl cache = (GemFireCacheImpl) getCache();
@@ -232,7 +233,7 @@ public class DistrbutedRegionProfileOffHeapDUnitTest extends CacheTestCase {
       public void run2() throws CacheException {
         disconnectFromDS();
         Properties properties = new Properties();
-        properties.put(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "2m");
+        properties.put(OFF_HEAP_MEMORY_SIZE, "2m");
         getSystem(properties);
 
         GemFireCacheImpl cache = (GemFireCacheImpl) getCache();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
index f0bbb9b..55ae144 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GridAdvisorDUnitTest.java
@@ -630,7 +630,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
         Properties props = new Properties();
         props.setProperty(MCAST_PORT, "0");
         props.setProperty(LOCATORS, locators);
-        props.setProperty(DistributionConfig.GROUPS_NAME, "bs1Group1, bs1Group2");
+        props.setProperty(GROUPS, "bs1Group1, bs1Group2");
         props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
         CacheFactory.create(DistributedSystem.connect(props));
       }
@@ -640,7 +640,7 @@ public class GridAdvisorDUnitTest extends DistributedTestCase {
         Properties props = new Properties();
         props.setProperty(MCAST_PORT, "0");
         props.setProperty(LOCATORS, locators);
-        props.setProperty(DistributionConfig.GROUPS_NAME, "bs2Group1, bs2Group2");
+        props.setProperty(GROUPS, "bs2Group1, bs2Group2");
         props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
         CacheFactory.create(DistributedSystem.connect(props));
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
index e51a35c..f7bd838 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionDUnitTest.java
@@ -20,13 +20,14 @@ import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType;
 import com.gemstone.gemfire.internal.cache.lru.HeapEvictor;
 import com.gemstone.gemfire.test.dunit.*;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Performs eviction dunit tests for off-heap memory.
  */
@@ -53,7 +54,7 @@ public class OffHeapEvictionDUnitTest extends EvictionDUnitTest {
   @Override
   public Properties getDistributedSystemProperties() {
     Properties properties = super.getDistributedSystemProperties();
-    properties.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "200m");
+    properties.setProperty(OFF_HEAP_MEMORY_SIZE, "200m");
     
     return properties;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
index 1fa1fca..0994ed5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/OffHeapEvictionStatsDUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal.cache;
 
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.LogWriterUtils;
@@ -26,6 +25,8 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Performs eviction stat dunit tests for off-heap regions.
  * @since Geode 1.0
@@ -55,7 +56,7 @@ public class OffHeapEvictionStatsDUnitTest extends EvictionStatsDUnitTest {
   @Override
   public Properties getDistributedSystemProperties() {
     Properties properties = super.getDistributedSystemProperties();
-    properties.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "100m");
+    properties.setProperty(OFF_HEAP_MEMORY_SIZE, "100m");
     
     return properties;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
index 78b0d61..47b29e1 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/P2PDeltaPropagationDUnitTest.java
@@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.tcp.ConnectionTable;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
@@ -31,6 +30,8 @@ import com.gemstone.gemfire.test.dunit.VM;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * 
  * Tests the P2P delta propagation functionality.
@@ -438,7 +439,7 @@ public class P2PDeltaPropagationDUnitTest extends DistributedTestCase
     P2PDeltaPropagationDUnitTest test = new P2PDeltaPropagationDUnitTest("temp");
     Properties props = new Properties();
     if (!flag) {
-      props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false");
+      props.setProperty(DELTA_PROPAGATION, "false");
     }    
     cache = test.createCache(props);
     AttributesFactory factory = new AttributesFactory();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
index 597b7e8..a6e2e5f 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PRDataStoreMemoryOffHeapJUnitTest.java
@@ -17,12 +17,13 @@
 package com.gemstone.gemfire.internal.cache;
 
 import com.gemstone.gemfire.cache.RegionFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.experimental.categories.Category;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Tests PartitionedRegion DataStore currentAllocatedMemory operation.
  * 
@@ -34,7 +35,7 @@ public class PRDataStoreMemoryOffHeapJUnitTest extends PRDataStoreMemoryJUnitTes
   @Override
   protected Properties getDistributedSystemProperties() {
     Properties dsProps = super.getDistributedSystemProperties();
-    dsProps.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
+    dsProps.setProperty(OFF_HEAP_MEMORY_SIZE, "1m");
     return dsProps;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
index d2309cd..7fadf5e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionBucketCreationDistributionDUnitTest.java
@@ -25,8 +25,7 @@ import com.gemstone.gemfire.test.dunit.*;
 
 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.*;
 
 /**
  * 
@@ -509,8 +508,8 @@ public class PartitionedRegionBucketCreationDistributionDUnitTest extends
     Properties props = getDistributedSystemProperties();
     props.put(MCAST_PORT, "0");
     props.put(LOCATORS, "");
-    props.put(DistributionConfig.ENFORCE_UNIQUE_HOST_NAME, "true");
-    props.put(DistributionConfig.REDUNDANCY_ZONE_NAME, "zone1");
+    props.put(ENFORCE_UNIQUE_HOST, "true");
+    props.put(REDUNDANCY_ZONE, "zone1");
     return getSystem(props);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
index 246a862..4484fa9 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionLocalMaxMemoryOffHeapDUnitTest.java
@@ -19,12 +19,13 @@ package com.gemstone.gemfire.internal.cache;
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.EvictionAttributes;
 import com.gemstone.gemfire.cache.RegionAttributes;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Tests PartitionedRegion localMaxMemory with Off-Heap memory.
  * 
@@ -56,7 +57,7 @@ public class PartitionedRegionLocalMaxMemoryOffHeapDUnitTest extends Partitioned
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
     // test creates a bit more than 1m of off heap so we need to total off heap size to be >1m
-    props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "2m");
+    props.setProperty(OFF_HEAP_MEMORY_SIZE, "2m");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
index e1ae38a..6652120 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionOffHeapEvictionDUnitTest.java
@@ -17,7 +17,6 @@
 package com.gemstone.gemfire.internal.cache;
 
 import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType;
 import com.gemstone.gemfire.internal.cache.control.OffHeapMemoryMonitor;
 import com.gemstone.gemfire.internal.cache.lru.HeapEvictor;
@@ -26,6 +25,8 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class PartitionedRegionOffHeapEvictionDUnitTest extends
     PartitionedRegionEvictionDUnitTest {
   
@@ -51,7 +52,7 @@ public class PartitionedRegionOffHeapEvictionDUnitTest extends
   @Override
   public Properties getDistributedSystemProperties() {
     Properties properties = super.getDistributedSystemProperties();
-    properties.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "100m");
+    properties.setProperty(OFF_HEAP_MEMORY_SIZE, "100m");
     
     return properties;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
index b661b3e..b61e71e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionRedundancyZoneDUnitTest.java
@@ -20,7 +20,6 @@ import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
@@ -28,6 +27,8 @@ import com.gemstone.gemfire.test.dunit.VM;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class PartitionedRegionRedundancyZoneDUnitTest extends CacheTestCase {
 
   @Override
@@ -128,7 +129,7 @@ public class PartitionedRegionRedundancyZoneDUnitTest extends CacheTestCase {
     return (DistributedMember) vm.invoke(new SerializableCallable("set redundancy zone") {
       public Object call() {
         Properties props = new Properties();
-        props.setProperty(DistributionConfig.REDUNDANCY_ZONE_NAME, zone);
+        props.setProperty(REDUNDANCY_ZONE, zone);
         DistributedSystem system = getSystem(props);
         return system.getDistributedMember();
         

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
index e8f9864..fd161d7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/MemoryMonitorOffHeapJUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.internal.cache.control;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.control.InternalResourceManager.ResourceType;
@@ -33,7 +32,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.*;
 
 /**
@@ -50,7 +49,7 @@ public class MemoryMonitorOffHeapJUnitTest {
   public void setUp() throws Exception {
     Properties p = new Properties();
     p.setProperty(MCAST_PORT, "0");
-    p.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
+    p.setProperty(OFF_HEAP_MEMORY_SIZE, "1m");
     this.ds = DistributedSystem.connect(p);
     this.cache = (GemFireCacheImpl) CacheFactory.create(this.ds);
     logger.info(addExpectedAbove);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
index 7e355f3..6463e46 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/control/RebalanceOperationDUnitTest.java
@@ -46,6 +46,7 @@ import java.util.concurrent.TimeoutException;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  *
@@ -295,7 +296,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase {
     Invoke.invokeInEveryVM(new SerializableRunnable() {
       public void run() {
         Properties props = new Properties();
-        props.setProperty(DistributionConfig.ENFORCE_UNIQUE_HOST_NAME, "true");
+        props.setProperty(ENFORCE_UNIQUE_HOST, "true");
         getSystem(props); 
       }
     });
@@ -754,7 +755,7 @@ public class RebalanceOperationDUnitTest extends CacheTestCase {
       public Object call() {
         System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "resource.manager.threads", "2");
         Properties props = new Properties();
-        props.setProperty(DistributionConfig.REDUNDANCY_ZONE_NAME, zone);
+        props.setProperty(REDUNDANCY_ZONE, zone);
         DistributedSystem system = getSystem(props);
         return system.getDistributedMember();
         

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
index 991bf5d..43775c8 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java
@@ -889,7 +889,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends DistributedTest
   public static void createCacheInVm_41367() {
     Properties props = new Properties();
     props.put(SystemConfigurationProperties.NAME, "SecurityServer");
-    props.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, DummyAuthenticator.class.getName() + ".create");
+    props.put(SECURITY_CLIENT_AUTHENTICATOR, DummyAuthenticator.class.getName() + ".create");
     new DistributedRegionFunctionExecutionDUnitTest("temp").createCache(props);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
index ea6b8f9..6d36e83 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/OnGroupsFunctionExecutionDUnitTest.java
@@ -96,7 +96,7 @@ public class OnGroupsFunctionExecutionDUnitTest extends DistributedTestCase {
       @Override
       public Object call() throws Exception {
         Properties props = new Properties();
-        props.put(DistributionConfig.GROUPS_NAME, groups);
+        props.put(GROUPS, groups);
         if (regionName != null) {
           Cache c = null;
           try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
index f641199..ec90d80 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HASlowReceiverDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.client.internal.PoolImpl;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
 import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
@@ -33,8 +32,7 @@ import com.gemstone.gemfire.test.dunit.*;
 import java.net.SocketException;
 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.*;
 
 public class HASlowReceiverDUnitTest extends DistributedTestCase {
   protected static Cache cache = null;
@@ -107,7 +105,7 @@ public class HASlowReceiverDUnitTest extends DistributedTestCase {
       throws Exception {
 
     Properties prop = new Properties();
-    prop.setProperty(DistributionConfig.REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME,
+    prop.setProperty(REMOVE_UNRESPONSIVE_CLIENT,
         "true");
     new HASlowReceiverDUnitTest("temp").createCache(prop);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
index e58627a..a7cbe97 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientConflationDUnitTest.java
@@ -140,7 +140,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
    */
   private static Properties createProperties1(String conflation){
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false");
+    props.setProperty(DELTA_PROPAGATION, "false");
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
     props.setProperty(CONFLATE_EVENTS, conflation);
@@ -390,7 +390,7 @@ public class ClientConflationDUnitTest extends DistributedTestCase
   public static Integer createServerCache() throws Exception
   {
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false");
+    props.setProperty(DELTA_PROPAGATION, "false");
     ClientConflationDUnitTest test = new ClientConflationDUnitTest("temp");
     cacheServer = test.createCache(props);
     AttributesFactory factory = new AttributesFactory();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
index 0f2c519..ee10b2e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientInterestNotifyDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -34,8 +33,7 @@ import java.util.Iterator;
 import java.util.Properties;
 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.*;
 
 /**
  * This test verifies the per-client notify-by-subscription (NBS) override
@@ -148,12 +146,6 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
 
   private Cache createCache(Properties props) throws Exception
   {
-    /*
-    DistributedSystem ds = getSystem(props);
-    assertNotNull(ds);
-    ds.disconnect();
-    ds = getSystem(props);
-    */
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
     DistributedSystem ds = DistributedSystem.connect(props);
@@ -187,13 +179,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
     // Client 3 uses the default NBS which is false on the server.
     
     vm1.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( NetworkUtils.getServerHostName(host), new Integer(PORT), "ClientOn"));
-    /*
-    vm2.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( getServerHostName(Host.getHost(0)), new Integer(PORT), 
-      DistributionConfig.NOTIFY_BY_SUBSCRIPTION_OVERRIDE_PROP_VALUE_OFF, "ClientOff"));
-    vm3.invoke(() -> ClientInterestNotifyDUnitTest.createClientCache( getServerHostName(Host.getHost(0)), new Integer(PORT), 
-      DistributionConfig.NOTIFY_BY_SUBSCRIPTION_OVERRIDE_PROP_VALUE_DEFAULT, "ClientDefault"));
-      */
-    
+
     // Feeder doFeed does one put on one key for each of the 3 regions so
     // that the following client RI with ALL_KEYS and KEYS_VALUE result works.
     
@@ -202,21 +188,13 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
     // RI on ALL_KEYS with InterestResultPolicy KEYS_VALUES.
     
     vm1.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest());
-    /*
-    vm2.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest());
-    vm3.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest());
-    */
 
     // Get key for region 3 for all clients to check no unwanted notifications
     // arrive on client 1 region 3 since we do not register interest on any
     // client but notifications should arrive for client 2 and client 3.
     
     vm1.invoke(() -> ClientInterestNotifyDUnitTest.getEntries());
-    /*
-    vm2.invoke(() -> ClientInterestNotifyDUnitTest.getEntries());
-    vm3.invoke(() -> ClientInterestNotifyDUnitTest.getEntries());
-    */
-    
+
     // Feeder doEntryOps does 2 puts, 1 invalidate and 1 destroy on a
     // single key for each of the 3 regions.
     
@@ -227,11 +205,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
     // Unregister interest to check it works and no extra notifications received.
     
     vm1.invoke(() -> ClientInterestNotifyDUnitTest.unregisterInterest());
-    /*
-    vm2.invoke(() -> ClientInterestNotifyDUnitTest.unregisterInterest());
-    vm3.invoke(() -> ClientInterestNotifyDUnitTest.unregisterInterest());
-    */
-    
+
     // Feeder doEntryOps again does 2 puts, 1 invalidate and 1 destroy on a
     // single key for each of the 3 regions while no interest on the clients.
     
@@ -242,11 +216,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
     // Re-register interest on all clients except for region 3 again.
     
     vm1.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest());
-    /*
-    vm2.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest());
-    vm3.invoke(() -> ClientInterestNotifyDUnitTest.registerInterest());
-    */
-    
+
     // Feeder doEntryOps again does 2 puts, 1 invalidate and 1 destroy on a
     // single key for each of the 3 regions after clients re-register interest.
     
@@ -254,11 +224,6 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
     
     waitForQueuesToDrain();
     
-    /*
-    Thread.sleep(30000);
-    assertAllQueuesEmpty();
-    */
-    
     // doValidation on all listeners:
     
     // Client invokes listeners as follows:
@@ -290,15 +255,6 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
     vm1.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME2, 0, 0, 1, 1));
     vm1.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME3, 1, 0, 0, 0));
     
-    /*
-    vm2.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME1, 0, 0, 1, 1));
-    vm2.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME2, 0, 0, 1, 1));
-    vm2.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME3, 1, 0, 1, 1));
-    
-    vm3.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME1, 0, 0, 1, 1));
-    vm3.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME2, 0, 0, 1, 1));
-    vm3.invoke(() -> ClientInterestNotifyDUnitTest.doValidation(REGION_NAME3, 1, 0, 1, 1));
-        */
   }
   
   /**
@@ -308,7 +264,6 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    //props.setProperty(DistributionConfig.NOTIFY_BY_SUBSCRIPTION_OVERRIDE_PROP_NAME, nbs);
     return props;
   }
 
@@ -459,7 +414,7 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
   {
     ClientInterestNotifyDUnitTest test = new ClientInterestNotifyDUnitTest("temp");
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false");
+    props.setProperty(DELTA_PROPAGATION, "false");
     cacheServer = test.createCache(props);
     AttributesFactory factory = new AttributesFactory();
     factory.setScope(Scope.DISTRIBUTED_ACK);
@@ -623,10 +578,6 @@ public class ClientInterestNotifyDUnitTest extends DistributedTestCase
   public final void preTearDown() throws Exception {
     vm0.invoke(() -> ClientInterestNotifyDUnitTest.closeCache());
     vm1.invoke(() -> ClientInterestNotifyDUnitTest.closeCache());
-    /*
-    vm2.invoke(() -> ClientInterestNotifyDUnitTest.closeCache());
-    vm3.invoke(() -> ClientInterestNotifyDUnitTest.closeCache());
-    */
     closeCacheServer();
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
index 9271285..fcbaf83 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ForceInvalidateOffHeapEvictionDUnitTest.java
@@ -16,13 +16,14 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Runs force invalidate eviction tests with off-heap regions.
  * @since Geode 1.0
@@ -52,7 +53,7 @@ public class ForceInvalidateOffHeapEvictionDUnitTest extends
   @Override
   public Properties getDistributedSystemProperties() {
     Properties properties = super.getDistributedSystemProperties();
-    properties.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "100m");
+    properties.setProperty(OFF_HEAP_MEMORY_SIZE, "100m");
     
     return properties;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
index 7014582..38b3f48 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/InterestListDUnitTest.java
@@ -24,7 +24,6 @@ import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.test.dunit.*;
@@ -36,8 +35,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * Test Scenario :
@@ -501,7 +499,7 @@ public class InterestListDUnitTest extends DistributedTestCase
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false");
+    props.setProperty(DELTA_PROPAGATION, "false");
 
     new InterestListDUnitTest("temp").createCache(props);
     PoolFactory pfactory = PoolManager.createFactory()
@@ -534,7 +532,7 @@ public class InterestListDUnitTest extends DistributedTestCase
 
   private static void createCache(boolean addReplicatedRegion) throws Exception {
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME, "false");
+    props.setProperty(DELTA_PROPAGATION, "false");
     new InterestListDUnitTest("temp").createCache(props);
     if (addReplicatedRegion) {
       addReplicatedRegion();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
index 2da8391..bc558ef 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/wan/AsyncEventQueueTestBase.java
@@ -123,7 +123,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(MCAST_PORT, "0");
-    //props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "" + dsId);
+    //props.setProperty(DISTRIBUTED_SYSTEM_ID, "" + dsId);
     props.setProperty(LOCATORS, "localhost[" + port
         + "]");
     props.setProperty(START_LOCATOR, "localhost["
@@ -137,13 +137,12 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
     int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
     Properties props = test.getDistributedSystemProperties();
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "" + dsId);
+    props.setProperty(DISTRIBUTED_SYSTEM_ID, "" + dsId);
     props.setProperty(LOCATORS, "localhost[" + port
         + "]");
     props.setProperty(START_LOCATOR, "localhost["
         + port + "],server=true,peer=true,hostname-for-clients=localhost");
-    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost["
-        + remoteLocPort + "]");
+    props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
     test.getSystem(props);
     return port;
   }
@@ -1546,7 +1545,7 @@ public class AsyncEventQueueTestBase extends DistributedTestCase {
     // of WANTestBase (instead of instances of the subclass). So we can't override
     // this method so that only the off-heap subclasses allocate off heap memory.
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "300m");
+    props.setProperty(OFF_HEAP_MEMORY_SIZE, "300m");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
index 6f64bd1..9d48c16 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionCacheListenerOffHeapDUnitTest.java
@@ -24,6 +24,8 @@ import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 @SuppressWarnings("serial")
 public class CompressionCacheListenerOffHeapDUnitTest extends
     CompressionCacheListenerDUnitTest {
@@ -57,7 +59,7 @@ public class CompressionCacheListenerOffHeapDUnitTest extends
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
-    props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
+    props.setProperty(OFF_HEAP_MEMORY_SIZE, "1m");
     return props;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
index efd8e57..854cf27 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/compression/CompressionRegionOperationsOffHeapDUnitTest.java
@@ -18,11 +18,11 @@ package com.gemstone.gemfire.internal.compression;
 
 import com.gemstone.gemfire.compression.Compressor;
 import com.gemstone.gemfire.compression.SnappyCompressor;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.OffHeapTestUtil;
 import com.gemstone.gemfire.test.dunit.Invoke;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import java.util.Properties;
 
 public class CompressionRegionOperationsOffHeapDUnitTest extends
@@ -50,7 +50,7 @@ public class CompressionRegionOperationsOffHeapDUnitTest extends
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
-    props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
+    props.setProperty(OFF_HEAP_MEMORY_SIZE, "1m");
     return props;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/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 7c186cd..1bf75b8 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
@@ -85,7 +85,7 @@ public class DistributedSystemLogFileJUnitTest {
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
     properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
-    properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+    properties.put(DISABLE_AUTO_RECONNECT, "true");
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
@@ -473,7 +473,7 @@ public class DistributedSystemLogFileJUnitTest {
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
     properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
-    properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+    properties.put(DISABLE_AUTO_RECONNECT, "true");
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
@@ -689,7 +689,7 @@ public class DistributedSystemLogFileJUnitTest {
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
     properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
-    properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+    properties.put(DISABLE_AUTO_RECONNECT, "true");
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
@@ -903,11 +903,11 @@ public class DistributedSystemLogFileJUnitTest {
     final Properties properties = new Properties();
     properties.put(LOG_FILE, logFileName);
     properties.put(LOG_LEVEL, "fine");
-    properties.put(DistributionConfig.SECURITY_LOG_FILE_NAME, securityLogFileName);
+    properties.put(SECURITY_LOG_FILE, securityLogFileName);
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
     properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
-    properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+    properties.put(DISABLE_AUTO_RECONNECT, "true");
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
@@ -1021,12 +1021,12 @@ public class DistributedSystemLogFileJUnitTest {
     final Properties properties = new Properties();
     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(SECURITY_LOG_FILE, securityLogFileName);
+    properties.put(SECURITY_LOG_LEVEL, "fine");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
     properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
-    properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+    properties.put(DISABLE_AUTO_RECONNECT, "true");
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
@@ -1200,11 +1200,11 @@ public class DistributedSystemLogFileJUnitTest {
     final Properties properties = new Properties();
     properties.put(LOG_FILE, logFileName);
     properties.put(LOG_LEVEL, "fine");
-    properties.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "info");
+    properties.put(SECURITY_LOG_LEVEL, "info");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
     properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
-    properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+    properties.put(DISABLE_AUTO_RECONNECT, "true");
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     
@@ -1349,11 +1349,11 @@ public class DistributedSystemLogFileJUnitTest {
     final Properties properties = new Properties();
     properties.put(LOG_FILE, logFileName);
     properties.put(LOG_LEVEL, "info");
-    properties.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "fine");
+    properties.put(SECURITY_LOG_LEVEL, "fine");
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, "");
     properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
-    properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+    properties.put(DISABLE_AUTO_RECONNECT, "true");
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/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 f6bf465..8f2a6f9 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
@@ -76,7 +76,7 @@ public class LocatorLogFileJUnitTest {
     properties.put(MCAST_PORT, "0");
     properties.put(LOCATORS, locators);
     properties.put(ENABLE_NETWORK_PARTITION_DETECTION, "false");
-    properties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+    properties.put(DISABLE_AUTO_RECONNECT, "true");
     properties.put(MEMBER_TIMEOUT, "2000");
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/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 861209d..f8c3d1a 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
@@ -118,9 +118,9 @@ public class OutOfOffHeapMemoryDUnitTest extends CacheTestCase {
     props.put(MCAST_PORT, "0");
     props.put(STATISTIC_SAMPLING_ENABLED, "true");
     if (isSmallerVM.get()) {
-      props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, getSmallerOffHeapMemorySize());
+      props.setProperty(OFF_HEAP_MEMORY_SIZE, getSmallerOffHeapMemorySize());
     } else {
-      props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, getOffHeapMemorySize());
+      props.setProperty(OFF_HEAP_MEMORY_SIZE, getOffHeapMemorySize());
     }
     return props;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
index 30a4255..59c36f5 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/CacheManagementDUnitTest.java
@@ -35,6 +35,8 @@ import static com.jayway.awaitility.Awaitility.to;
 import static com.jayway.awaitility.Awaitility.waitAtMost;
 import static org.hamcrest.Matchers.equalTo;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * This class checks and verifies various data and operations exposed through
  * MemberMXBean interface.
@@ -756,7 +758,7 @@ public class CacheManagementDUnitTest extends ManagementTestBase {
     VM node2 = managedNodeList.get(1);
     VM node3 = managedNodeList.get(2);
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.REDUNDANCY_ZONE_NAME, "ARMY_ZONE");
+    props.setProperty(REDUNDANCY_ZONE, "ARMY_ZONE");
     
     createCache(node1,props);
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/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 a4c0d84..15c1b50 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
@@ -95,10 +95,10 @@ public class DataBrowserJSONValidationJUnitTest {
     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");
-    props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
+    props.setProperty(JMX_MANAGER, "true");
+    props.setProperty(JMX_MANAGER_START, "true");
+    props.setProperty(JMX_MANAGER_HTTP_PORT, "0");
+    props.setProperty(JMX_MANAGER_PORT, "0");
 
     this.system = (InternalDistributedSystem) DistributedSystem.connect(props);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/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 4335af3..6e45705 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
@@ -88,10 +88,10 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, host0 + "[" + locPort
         + "]");
-    props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
-    props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false");
-    props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
-    props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
+    props.setProperty(JMX_MANAGER, "true");
+    props.setProperty(JMX_MANAGER_START, "false");
+    props.setProperty(JMX_MANAGER_PORT, "0");
+    props.setProperty(JMX_MANAGER_HTTP_PORT, "0");
     createCache(managingNode, props);
     startManagingNode(managingNode);
     DistributedMember locatorMember = getMember(locator);
@@ -110,10 +110,10 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, host0 + "[" + locPort
         + "]");
-    props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
-    props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false");
-    props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
-    props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
+    props.setProperty(JMX_MANAGER, "true");
+    props.setProperty(JMX_MANAGER_START, "false");
+    props.setProperty(JMX_MANAGER_PORT, "0");
+    props.setProperty(JMX_MANAGER_HTTP_PORT, "0");
     createCache(managingNode, props);
     startManagingNode(managingNode);
     DistributedMember locatorMember = getMember(locator);
@@ -165,7 +165,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, host0 + "[" + locPort
         + "]");
-    props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
+    props.setProperty(JMX_MANAGER, "true");
 
     createCache(managedNode2, props);
     createCache(managedNode3, props);
@@ -183,7 +183,7 @@ public class LocatorManagementDUnitTest extends ManagementTestBase {
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, host0 + "[" + locPort
         + "]");
-    props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
+    props.setProperty(JMX_MANAGER, "true");
 
     createCache(managedNode2, props);
     createCache(managedNode3, props);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/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 ffa9e72..a4a2ed2 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
@@ -221,10 +221,10 @@ public class ManagementTestBase extends DistributedTestCase {
   public Cache createCache(boolean management) {
     System.setProperty("dunitLogPerTest", "true");
     if (management) {
-      props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
-      props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false");
-      props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
-      props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
+      props.setProperty(JMX_MANAGER, "true");
+      props.setProperty(JMX_MANAGER_START, "false");
+      props.setProperty(JMX_MANAGER_PORT, "0");
+      props.setProperty(JMX_MANAGER_HTTP_PORT, "0");
     }
     props.setProperty(ENABLE_TIME_STATISTICS, "true");
     props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
index 522a142..1bcdb36 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/OffHeapManagementDUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.offheap.OffHeapMemoryStats;
@@ -37,6 +36,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Tests the off-heap additions to the RegionMXBean and MemberMXBean JMX interfaces.
  */
@@ -628,10 +629,10 @@ public class OffHeapManagementDUnitTest extends CacheTestCase {
   protected Properties getSystemProperties() {
     Properties props = getDistributedSystemProperties();
 
-    props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "1m");
-    props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
-    props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
-    props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
+    props.setProperty(OFF_HEAP_MEMORY_SIZE, "1m");
+    props.setProperty(JMX_MANAGER, "true");
+    props.setProperty(JMX_MANAGER_START, "true");
+    props.setProperty(JMX_MANAGER_PORT, "0");
 
     return props;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/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 8525c90..0b65874 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
@@ -62,12 +62,12 @@ public class DistributedSystemStatsJUnitTest {
     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(JMX_MANAGER, "true");
+    props.setProperty(JMX_MANAGER_START, "true");
     // set JMX_MANAGER_UPDATE_RATE to practically an infinite value, so that
     // LocalManager wont try to run ManagementTask
-    props.setProperty(DistributionConfig.JMX_MANAGER_UPDATE_RATE_NAME, "60000");
-    props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
+    props.setProperty(JMX_MANAGER_UPDATE_RATE, "60000");
+    props.setProperty(JMX_MANAGER_PORT, "0");
 
     this.system = (InternalDistributedSystem) DistributedSystem.connect(props);
     assertNotNull(this.system.getStatSampler());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
index 55d937e..f7fc8ea 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/CliUtilDUnitTest.java
@@ -20,8 +20,6 @@ import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.execute.*;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.management.DistributedRegionMXBean;
 import com.gemstone.gemfire.management.ManagementService;
@@ -32,6 +30,8 @@ import com.gemstone.gemfire.test.dunit.*;
 import java.util.Properties;
 import java.util.Set;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * 
  *
@@ -203,12 +203,12 @@ public class CliUtilDUnitTest extends CacheTestCase {
   
   public void createCacheWithMemberIdAndGroup(String memberName, String groupName){
     Properties localProps = new Properties();
-    localProps.setProperty(SystemConfigurationProperties.NAME, memberName);
-    localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
-    localProps.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
-    localProps.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false");    
+    localProps.setProperty(NAME, memberName);
+    localProps.setProperty(GROUPS, groupName);
+    localProps.setProperty(JMX_MANAGER, "true");
+    localProps.setProperty(JMX_MANAGER_START, "false");
     int jmxPort = AvailablePortHelper.getRandomAvailableTCPPort();
-    localProps.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, ""+jmxPort);
+    localProps.setProperty(JMX_MANAGER_PORT, ""+jmxPort);
     LogWriterUtils.getLogWriter().info("Set jmx-port="+ jmxPort);
     getSystem(localProps);
     getCache();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index 5b058b8..e82768f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.management.internal.cli.commands;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.management.ManagementService;
 import com.gemstone.gemfire.management.internal.cli.CommandManager;
@@ -45,6 +44,7 @@ import java.util.regex.Pattern;
 
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * Base class for all the CLI/gfsh command dunit tests.
@@ -143,11 +143,11 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase {
       jmxPort = ports[0];
       httpPort = ports[1];
 
-      localProps.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
-      localProps.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
-      localProps.setProperty(DistributionConfig.JMX_MANAGER_BIND_ADDRESS_NAME, String.valueOf(jmxHost));
-      localProps.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(jmxPort));
-      localProps.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(httpPort));
+      localProps.setProperty(JMX_MANAGER, "true");
+      localProps.setProperty(JMX_MANAGER_START, "true");
+      localProps.setProperty(JMX_MANAGER_BIND_ADDRESS, String.valueOf(jmxHost));
+      localProps.setProperty(JMX_MANAGER_PORT, String.valueOf(jmxPort));
+      localProps.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpPort));
 
       getSystem(localProps);
       verifyManagementServiceStarted(getCache());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/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 e0ce006..d3f8b11 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
@@ -402,7 +402,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
     this.alterVm1.invoke(() -> {
       Properties localProps = new Properties();
       localProps.setProperty(SystemConfigurationProperties.NAME, alterVm1Name);
-      localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+      localProps.setProperty(GROUPS, "Group1");
       getSystem(localProps);
       Cache cache = getCache();
 
@@ -435,7 +435,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
     this.alterVm2.invoke(() -> {
       Properties localProps = new Properties();
       localProps.setProperty(SystemConfigurationProperties.NAME, alterVm2Name);
-      localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1,Group2");
+      localProps.setProperty(GROUPS, "Group1,Group2");
       getSystem(localProps);
       Cache cache = getCache();
 
@@ -796,7 +796,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
       Properties localProps = new Properties();
       localProps.setProperty(MCAST_PORT, "0");
       localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
-      localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+      localProps.setProperty(GROUPS, groupName);
       getSystem(localProps);
       assertNotNull(getCache());
     });
@@ -834,7 +834,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
       Properties localProps = new Properties();
       localProps.setProperty(MCAST_PORT, "0");
       localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
-      localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+      localProps.setProperty(GROUPS, groupName);
       localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
       getSystem(localProps);
       cache = getCache();
@@ -876,7 +876,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
         localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
-        localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+        localProps.setProperty(GROUPS, groupName);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
         cache = getCache();
@@ -930,7 +930,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
       Properties localProps = new Properties();
       localProps.setProperty(MCAST_PORT, "0");
       localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
-      localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+      localProps.setProperty(GROUPS, groupName);
       getSystem(localProps);
       assertNotNull(getCache());
     });
@@ -986,7 +986,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas
       Properties localProps = new Properties();
       localProps.setProperty(MCAST_PORT, "0");
       localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
-      localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+      localProps.setProperty(GROUPS, groupName);
       localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
       getSystem(localProps);
       cache = getCache();



Mime
View raw message