geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hiteshkhame...@apache.org
Subject [09/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public
Date Tue, 07 Jun 2016 19:06:28 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
index be511d9..3e62372 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/GetMemberConfigInformationFunction.java
@@ -35,6 +35,8 @@ import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.*;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /****
  * 
  *
@@ -110,7 +112,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
         cacheServerAttributes.put("message-time-to-live", Integer.toString(cacheServer.getMessageTimeToLive()));
         cacheServerAttributes.put("notify-by-subscription", Boolean.toString(cacheServer.getNotifyBySubscription()));
         cacheServerAttributes.put("port", Integer.toString(cacheServer.getPort()));
-        cacheServerAttributes.put(DistributionConfig.SOCKET_BUFFER_SIZE_NAME, Integer.toString(cacheServer.getSocketBufferSize()));
+        cacheServerAttributes.put(SOCKET_BUFFER_SIZE, Integer.toString(cacheServer.getSocketBufferSize()));
         cacheServerAttributes.put("load-poll-interval", Long.toString(cacheServer.getLoadPollInterval()));
         cacheServerAttributes.put("tcp-no-delay", Boolean.toString(cacheServer.getTcpNoDelay()));
 
@@ -160,7 +162,7 @@ public class GetMemberConfigInformationFunction extends FunctionAdapter implemen
     csAttributesDefault.put("message-time-to-live", Integer.toString(CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE));
     csAttributesDefault.put("notify-by-subscription", Boolean.toString(CacheServer.DEFAULT_NOTIFY_BY_SUBSCRIPTION));
     csAttributesDefault.put("port", Integer.toString(CacheServer.DEFAULT_PORT));
-    csAttributesDefault.put(DistributionConfig.SOCKET_BUFFER_SIZE_NAME, Integer.toString(CacheServer.DEFAULT_SOCKET_BUFFER_SIZE));
+    csAttributesDefault.put(SOCKET_BUFFER_SIZE, Integer.toString(CacheServer.DEFAULT_SOCKET_BUFFER_SIZE));
     csAttributesDefault.put("load-poll-interval", Long.toString(CacheServer.DEFAULT_LOAD_POLL_INTERVAL));
     return csAttributesDefault;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
index 88a4044..59554f5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/i18n/CliStrings.java
@@ -944,7 +944,7 @@ public class CliStrings {
   public static final String EXPORT_LOGS__GROUP = "group";
   public static final String EXPORT_LOGS__GROUP__HELP = "Group of members whose log files will be exported.";
   public static final String EXPORT_LOGS__MSG__CANNOT_EXECUTE = "Cannot execute";
-  public static final String EXPORT_LOGS__LOGLEVEL = DistributionConfig.LOG_LEVEL_NAME;
+  public static final String EXPORT_LOGS__LOGLEVEL = LOG_LEVEL;
   public static final String EXPORT_LOGS__LOGLEVEL__HELP = "Minimum level of log entries to export. Valid values are: none, error, info, config , fine, finer and finest.  The default is \"info\".";
   public static final String EXPORT_LOGS__UPTO_LOGLEVEL = "only-log-level";
   public static final String EXPORT_LOGS__UPTO_LOGLEVEL__HELP = "Whether to only include those entries that exactly match the --log-level specified.";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
index 47402a7..8649375 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/redis/GemFireRedisServer.java
@@ -16,10 +16,11 @@
  */
 package com.gemstone.gemfire.redis;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -383,7 +384,7 @@ public class GemFireRedisServer {
         if (c == null) {
           CacheFactory cacheFactory = new CacheFactory();
           if (logLevel != null)
-            cacheFactory.set(DistributionConfig.LOG_LEVEL_NAME, logLevel);
+            cacheFactory.set(LOG_LEVEL, logLevel);
           c = cacheFactory.create();
         }
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
index bccf229..dce254a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/DiskInstantiatorsJUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.InternalInstantiator;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.After;
@@ -32,8 +31,8 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import static org.junit.Assert.fail;
 
 /**
@@ -77,7 +76,7 @@ public class DiskInstantiatorsJUnitTest {
     Properties cfg = new Properties();
     cfg.setProperty(MCAST_PORT, "0");
     cfg.setProperty(LOCATORS, "");
-    cfg.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
+    cfg.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
 
     this.ds = DistributedSystem.connect(cfg);
     this.c = CacheFactory.create(ds);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
index 5ccbc98..dccdf79 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java
@@ -18,14 +18,12 @@ package com.gemstone.gemfire;
 
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.experimental.categories.Category;
 
 import java.util.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.*;
 
 /**
  * Tests the functionality of JOM {@link Statistics}.
@@ -40,8 +38,8 @@ public class LocalStatisticsJUnitTest extends StatisticsTestCase {
   protected DistributedSystem getSystem() {
     if (this.system == null) {
       Properties props = new Properties();
-      props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-      props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "StatisticsTestCase-localTest.gfs");
+      props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+      props.setProperty(STATISTIC_ARCHIVE_FILE, "StatisticsTestCase-localTest.gfs");
       props.setProperty(MCAST_PORT, "0");
       props.setProperty(LOCATORS, "");
       props.setProperty(SystemConfigurationProperties.NAME, getName());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
index bbc485f..09605c7 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java
@@ -33,8 +33,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.*;
 import static org.junit.Assert.*;
 
 /**
@@ -62,7 +61,7 @@ public class LonerDMJUnitTest {
     Properties cfg = new Properties();
     cfg.setProperty(MCAST_PORT, "0");
     cfg.setProperty(LOCATORS, "");
-    cfg.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "false");
+    cfg.setProperty(STATISTIC_SAMPLING_ENABLED, "false");
 
     for (int i=0; i < 2; i++) {
       start = System.currentTimeMillis();
@@ -115,8 +114,8 @@ public class LonerDMJUnitTest {
     Properties cfg = new Properties();
     cfg.setProperty(MCAST_PORT, "0");
     cfg.setProperty(LOCATORS, "");
-    cfg.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-    cfg.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "lonerStats.gfs");
+    cfg.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+    cfg.setProperty(STATISTIC_ARCHIVE_FILE, "lonerStats.gfs");
 
     for (int i=0; i < 1; i++) {
       start = System.currentTimeMillis();
@@ -168,7 +167,7 @@ public class LonerDMJUnitTest {
     Properties cfg = new Properties();
     cfg.setProperty(MCAST_PORT, "0");
     cfg.setProperty(LOCATORS, "");
-    cfg.setProperty(DistributionConfig.ROLES_NAME, "lonelyOne");
+    cfg.setProperty(ROLES, "lonelyOne");
     cfg.setProperty(SystemConfigurationProperties.NAME, name);
     DistributedSystem ds = DistributedSystem.connect(cfg);
     System.out.println("MemberId = " + ds.getMemberId());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
index de34b2b..5e7671a 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/DistributedSystemTestCase.java
@@ -17,14 +17,12 @@
 package com.gemstone.gemfire.admin.internal;
 
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import org.junit.After;
 import org.junit.Before;
 
 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.*;
 
 /**
  * Provides common setUp and tearDown for testing the Admin API.
@@ -63,7 +61,7 @@ public abstract class DistributedSystemTestCase {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "true");
+    props.setProperty(CONSERVE_SOCKETS, "true");
     return props;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
index 55f10a4..2ed2241 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/admin/internal/HealthEvaluatorTestCase.java
@@ -17,15 +17,13 @@
 package com.gemstone.gemfire.admin.internal;
 
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import org.junit.After;
 import org.junit.Before;
 
 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.*;
 
 /**
  * Superclass of tests for the {@linkplain
@@ -70,7 +68,7 @@ public abstract class HealthEvaluatorTestCase {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
 
     return props;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
index b5ea652..f782d66 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/ConnectionPoolFactoryJUnitTest.java
@@ -31,8 +31,7 @@ import org.junit.experimental.categories.Category;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)
@@ -46,7 +45,7 @@ public class ConnectionPoolFactoryJUnitTest {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info"); // to keep diskPerf logs smaller
+    props.setProperty(LOG_LEVEL, "info"); // to keep diskPerf logs smaller
     this.ds = DistributedSystem.connect(props);
     this.cache = CacheFactory.create(this.ds);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
index c870091..4f87adc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/RegionFactoryJUnitTest.java
@@ -373,7 +373,7 @@ public class RegionFactoryJUnitTest {
       final Properties gemfireProperties = createGemFireProperties();
       gemfireProperties.put(MCAST_TTL, "64");
       final String xmlFileName = getName() + "-cache.xml";
-      gemfireProperties.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileName);
+      gemfireProperties.put(CACHE_XML_FILE, xmlFileName);
       xmlFile = new File(xmlFileName);
       xmlFile.delete();
       xmlFile.createNewFile();
@@ -400,8 +400,8 @@ public class RegionFactoryJUnitTest {
       r1 = factory.create(this.r1Name);
       assertBasicRegionFunctionality(r1, r1Name);
       assertEquals(gemfireProperties.get(MCAST_TTL), r1.getCache().getDistributedSystem().getProperties().get(MCAST_TTL));
-      assertEquals(gemfireProperties.get(DistributionConfig.CACHE_XML_FILE_NAME),
-          r1.getCache().getDistributedSystem().getProperties().get(DistributionConfig.CACHE_XML_FILE_NAME));
+      assertEquals(gemfireProperties.get(CACHE_XML_FILE),
+          r1.getCache().getDistributedSystem().getProperties().get(CACHE_XML_FILE));
       RegionAttributes ra = r1.getAttributes();
       assertEquals(ra.getStatisticsEnabled(), true);
       assertEquals(ra.getScope().isDistributedAck(), true);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
index 5abddf4..b64a517 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientCacheFactoryJUnitTest.java
@@ -52,8 +52,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 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 org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import static org.junit.runners.MethodSorters.NAME_ASCENDING;
@@ -106,7 +105,7 @@ public class ClientCacheFactoryJUnitTest {
     }
 
     try {
-      new ClientCacheFactory().set(DistributionConfig.LOG_LEVEL_NAME, "severe").create();
+      new ClientCacheFactory().set(LOG_LEVEL, "severe").create();
       fail("expected create to fail");
     } catch (IllegalStateException expected) {
     }
@@ -125,7 +124,7 @@ public class ClientCacheFactoryJUnitTest {
     URL url = ClientCacheFactoryJUnitTest.class.getResource("ClientCacheFactoryJUnitTest_single_pool.xml");;
     FileUtil.copy(url, this.tmpFile);
     this.cc = new ClientCacheFactory()
-        .set(DistributionConfig.CACHE_XML_FILE_NAME, this.tmpFile.getAbsolutePath())
+        .set(CACHE_XML_FILE, this.tmpFile.getAbsolutePath())
       .create();
     GemFireCacheImpl gfc = (GemFireCacheImpl)this.cc;
     assertEquals(true, gfc.isClient());
@@ -217,13 +216,13 @@ public class ClientCacheFactoryJUnitTest {
 
   @Test
   public void test004SetMethod() throws Exception {
-    this.cc = new ClientCacheFactory().set(DistributionConfig.LOG_LEVEL_NAME, "severe").create();
+    this.cc = new ClientCacheFactory().set(LOG_LEVEL, "severe").create();
     GemFireCacheImpl gfc = (GemFireCacheImpl)this.cc;
     assertEquals(true, gfc.isClient());
     Properties dsProps = this.cc.getDistributedSystem().getProperties();
     assertEquals("0", dsProps.getProperty(MCAST_PORT));
     assertEquals("", dsProps.getProperty(LOCATORS));
-    assertEquals("severe", dsProps.getProperty(DistributionConfig.LOG_LEVEL_NAME));
+    assertEquals("severe", dsProps.getProperty(LOG_LEVEL));
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
index 44d03ce..67675d0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/ClientServerRegisterInterestsDUnitTest.java
@@ -30,7 +30,7 @@ import java.util.Stack;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * The ClientServerRegisterInterestsDUnitTest class is a test suite of test cases testing the interaction between a
@@ -86,8 +86,8 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
           Cache cache = new CacheFactory()
             .set("name", "ClientServerRegisterInterestsTestGemFireServer")
               .set(MCAST_PORT, "0")
-              .set(DistributionConfig.LOG_FILE_NAME, "clientServerRegisterInterestsTest.log")
-              .set(DistributionConfig.LOG_LEVEL_NAME, "config")
+              .set(LOG_FILE, "clientServerRegisterInterestsTest.log")
+              .set(LOG_LEVEL, "config")
             //.set("jmx-manager", "true")
             //.set("jmx-manager-http-port", "0")
             //.set("jmx-manager-port", "1199")
@@ -140,7 +140,7 @@ public class ClientServerRegisterInterestsDUnitTest extends DistributedTestCase
 
   private ClientCache setupGemFireClientCache() {
     ClientCache clientCache = new ClientCacheFactory()
-        .set(DistributionConfig.DURABLE_CLIENT_ID_NAME, "TestDurableClientId")
+        .set(DURABLE_CLIENT_ID, "TestDurableClientId")
       .create();
 
     PoolFactory poolFactory = PoolManager.createFactory();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
index ee17818..1ca6a81 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/client/internal/LocatorTestBase.java
@@ -98,8 +98,8 @@ public abstract class LocatorTestBase extends DistributedTestCase {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, String.valueOf(0));
     props.setProperty(LOCATORS, otherLocators);
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
-    props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+    props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
     try {
       File logFile = new File(testName + "-locator" + locatorPort + ".log");
       InetAddress bindAddr = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
index 6edc675..ab0a980 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/PartitionedRegionCompactRangeIndexDUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.query.QueryService;
 import com.gemstone.gemfire.cache.query.QueryTestUtils;
 import com.gemstone.gemfire.cache.query.SelectResults;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.dunit.*;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.util.test.TestUtil;
@@ -34,7 +33,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.stream.IntStream;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 @Category(DistributedTest.class)
 public class PartitionedRegionCompactRangeIndexDUnitTest extends DistributedTestCase {
@@ -46,7 +45,7 @@ public class PartitionedRegionCompactRangeIndexDUnitTest extends DistributedTest
   private Properties getSystemProperties(String cacheXML) {
     Properties props = new Properties();
     props.setProperty(LOCATORS, "localhost[" + DistributedTestUtils.getDUnitLocatorPort() + "]");
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), cacheXML));
+    props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(getClass(), cacheXML));
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
index a35ef27..2bdcb88 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryParamsAuthorizationDUnitTest.java
@@ -38,7 +38,7 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable;
 import com.gemstone.gemfire.test.dunit.VM;
 import org.junit.Ignore;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * Test for accessing query bind parameters from authorization callbacks
@@ -87,9 +87,9 @@ public class QueryParamsAuthorizationDUnitTest extends CacheTestCase {
       public Object call() throws Exception {
         ClientCacheFactory ccf = new ClientCacheFactory()
             .addPoolServer(NetworkUtils.getServerHostName(server1.getHost()), port)
-            .set(DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME, UserPasswordAuthInit.class.getName() + ".create")
-            .set("security-username", "root")
-            .set("security-password", "root");
+            .set(SECURITY_CLIENT_AUTH_INIT, UserPasswordAuthInit.class.getName() + ".create")
+            .set(SECURITY_PREFIX+"username", "root")
+            .set(SECURITY_PREFIX+"password", "root");
 
         ClientCache cache = getClientCache(ccf);
         Region r1 = cache.createClientRegionFactory(

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
index ca2fe2f..3128dc7 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java
@@ -26,6 +26,8 @@
  */
 package com.gemstone.gemfire.cache.query.functional;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.query.*;
 import com.gemstone.gemfire.cache.query.data.ComparableWrapper;
@@ -849,7 +851,7 @@ public class IndexCreationJUnitTest{
       Properties props = new Properties();
       props.setProperty(SystemConfigurationProperties.NAME, "test");
       props.setProperty(MCAST_PORT, "0");
-      props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-creation-with-eviction.xml").toURI().getPath());
+      props.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-with-eviction.xml").toURI().getPath());
       DistributedSystem ds = DistributedSystem.connect(props);
 
       // Create the cache which causes the cache-xml-file to be parsed
@@ -875,7 +877,7 @@ public class IndexCreationJUnitTest{
       props.setProperty(MCAST_PORT, "0");
       //Using a different cache.xml that changes some region properties
       //That will force the disk code to copy the region entries.
-      props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME,
+      props.setProperty(CACHE_XML_FILE,
           IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
       DistributedSystem ds = DistributedSystem.connect(props);
       Cache cache = CacheFactory.create(ds);
@@ -900,7 +902,7 @@ public class IndexCreationJUnitTest{
     props.setProperty(SystemConfigurationProperties.NAME, "test");
     props.setProperty(MCAST_PORT, "0");
     props
-        .setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
+        .setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
     DistributedSystem ds = DistributedSystem.connect(props);
     Cache cache = CacheFactory.create(ds);
     Region localRegion = cache.getRegion("localRegion");
@@ -928,7 +930,7 @@ public class IndexCreationJUnitTest{
     props.setProperty(SystemConfigurationProperties.NAME, "test");
     props.setProperty(MCAST_PORT, "0");
     props
-        .setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
+        .setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath());
     DistributedSystem ds = DistributedSystem.connect(props);
     Cache cache = CacheFactory.create(ds);
     Region localDiskRegion = cache.getRegion("localDiskRegion");
@@ -956,9 +958,9 @@ public class IndexCreationJUnitTest{
       Properties props = new Properties();
       props.setProperty(SystemConfigurationProperties.NAME, "test");
       props.setProperty(MCAST_PORT, "0");
-      props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-      props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
-      props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath());
+      props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+      props.setProperty(ENABLE_TIME_STATISTICS, "true");
+      props.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath());
       DistributedSystem ds = DistributedSystem.connect(props);
 
       // Create the cache which causes the cache-xml-file to be parsed
@@ -990,9 +992,9 @@ public class IndexCreationJUnitTest{
       Properties props = new Properties();
       props.setProperty(SystemConfigurationProperties.NAME, "test");
       props.setProperty(MCAST_PORT, "0");
-      props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-      props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true");
-      props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath());
+      props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
+      props.setProperty(ENABLE_TIME_STATISTICS, "true");
+      props.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-recovery-overflow.xml").toURI().getPath());
       DistributedSystem ds = DistributedSystem.connect(props);
       Cache cache = CacheFactory.create(ds);
       QueryService qs = cache.getQueryService();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
index 55358f6..a64180e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/DeclarativeIndexCreationJUnitTest.java
@@ -26,7 +26,6 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.query.CacheUtils;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import com.gemstone.gemfire.util.test.TestUtil;
 import junit.framework.Assert;
@@ -38,7 +37,7 @@ import org.junit.experimental.categories.Category;
 import java.util.Collection;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * 
@@ -54,7 +53,7 @@ public class DeclarativeIndexCreationJUnitTest {
   @Before
   public void setUp() throws Exception {
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml"));
+    props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml"));
     props.setProperty(MCAST_PORT, "0");
     ds = DistributedSystem.connect(props);
     cache = CacheFactory.create(ds);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
index 457dcb3..1764849 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/NewDeclarativeIndexCreationJUnitTest.java
@@ -21,7 +21,6 @@ package com.gemstone.gemfire.cache.query.internal.index;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import com.gemstone.gemfire.util.test.TestUtil;
 import org.junit.After;
@@ -35,7 +34,7 @@ import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  *
@@ -50,7 +49,7 @@ public class NewDeclarativeIndexCreationJUnitTest {
   public void setUp() throws Exception {
     //Read the Cache.xml placed in test.lib folder
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml"));
+    props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(getClass(), "cachequeryindex.xml"));
     props.setProperty(MCAST_PORT, "0");
     DistributedSystem ds = DistributedSystem.connect(props);
     cache = CacheFactory.create(ds);
@@ -154,7 +153,7 @@ public class NewDeclarativeIndexCreationJUnitTest {
   public void testIndexCreationExceptionOnRegionWithNewDTD() throws IOException, URISyntaxException {
     if (cache != null && !cache.isClosed()) cache.close();
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, TestUtil.getResourcePath(getClass(), "cachequeryindexwitherror.xml"));
+    props.setProperty(CACHE_XML_FILE, TestUtil.getResourcePath(getClass(), "cachequeryindexwitherror.xml"));
     props.setProperty(MCAST_PORT, "0");
     DistributedSystem ds = DistributedSystem.connect(props);
     try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
index 27c0616..a0b6e65 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/ProgRegionCreationIndexUpdateTypeJUnitTest.java
@@ -22,7 +22,6 @@ package com.gemstone.gemfire.cache.query.internal.index;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.After;
 import org.junit.Before;
@@ -31,7 +30,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.fail;
 
 /**
@@ -59,7 +58,7 @@ public class ProgRegionCreationIndexUpdateTypeJUnitTest{
   public void testProgrammaticIndexUpdateType() throws Exception  {
   	Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config");
+    props.setProperty(LOG_LEVEL, "config");
     DistributedSystem  ds = DistributedSystem.connect(props);
     cache = CacheFactory.create(ds);
     //Create a Region with index maintenance type as explicit synchronous

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
index 1749d43..1d94573 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/RegionSnapshotJUnitTest.java
@@ -38,7 +38,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 @Category(IntegrationTest.class)
@@ -244,7 +244,7 @@ public class RegionSnapshotJUnitTest extends SnapshotTestCase {
     cache.close();
 
     CacheFactory cf = new CacheFactory().set(MCAST_PORT, "0")
-        .set(DistributionConfig.LOG_LEVEL_NAME, "error")
+        .set(LOG_LEVEL, "error")
         .setPdxSerializer(new MyPdxSerializer())
         .set(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1");
     cache = cf.create();
@@ -264,7 +264,7 @@ public class RegionSnapshotJUnitTest extends SnapshotTestCase {
 
     // change the DSID from 1 -> 100
     CacheFactory cf2 = new CacheFactory().set(MCAST_PORT, "0")
-        .set(DistributionConfig.LOG_LEVEL_NAME, "error")
+        .set(LOG_LEVEL, "error")
         .setPdxSerializer(new MyPdxSerializer())
         .set(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "100");
     cache = cf2.create();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
index 3804ee4..381e3ee 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/snapshot/SnapshotTestCase.java
@@ -16,12 +16,13 @@
  */
 package com.gemstone.gemfire.cache.snapshot;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.examples.snapshot.MyObject;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.DiskStore;
 import com.gemstone.gemfire.cache.snapshot.RegionGenerator.SerializationType;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import org.junit.After;
 import org.junit.Before;
 
@@ -52,7 +53,7 @@ public class SnapshotTestCase {
 
     CacheFactory cf = new CacheFactory()
         .set(MCAST_PORT, "0")
-        .set(DistributionConfig.LOG_LEVEL_NAME, "error");
+        .set(LOG_LEVEL, "error");
     cache = cf.create();
     
     ds = cache.createDiskStoreFactory()

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
index 38e79cb..d7dd994 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.After;
 import org.junit.Before;
@@ -32,8 +31,7 @@ import org.junit.experimental.categories.Category;
 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 org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
@@ -74,7 +72,7 @@ public class Bug40255JUnitTest {
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
     System.setProperty("gemfirePropertyFile", BUG_40255_PROPS);
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, BUG_40255_XML);
+    props.setProperty(CACHE_XML_FILE, BUG_40255_XML);
     System.setProperty(NESTED_ATTR_PROPERTY_STRING, NESTED_ATTR_PROPERTY_VALUE);
     System.setProperty(ATTR_PROPERTY_STRING, ATTR_PROPERTY_VALUE);
     System.setProperty(ELEMENT_PROPERTY_STRING, ELEMENT_PROPERTY_VALUE);
@@ -104,7 +102,7 @@ public class Bug40255JUnitTest {
     props.setProperty(MCAST_PORT, "10333");
     props.setProperty(LOCATORS, "");
     System.setProperty("gemfirePropertyFile", BUG_40255_PROPS);
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, BUG_40255_XML);
+    props.setProperty(CACHE_XML_FILE, BUG_40255_XML);
     System.setProperty(NESTED_ATTR_PROPERTY_STRING, NESTED_ATTR_PROPERTY_VALUE);
     System.setProperty(ATTR_PROPERTY_STRING, ATTR_PROPERTY_VALUE);
     System.setProperty(ELEMENT_PROPERTY_STRING, ELEMENT_PROPERTY_VALUE);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
index 9e9b2f5..93a94cd 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.cache30;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.After;
 import org.junit.Before;
@@ -27,8 +26,7 @@ import org.junit.experimental.categories.Category;
 
 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 org.junit.Assert.assertEquals;
 
 /**
@@ -77,7 +75,7 @@ public class Bug40662JUnitTest {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME, BUG_40662_XML);
+    props.setProperty(CACHE_XML_FILE, BUG_40662_XML);
     this.ds = DistributedSystem.connect(props);
     this.cache = CacheFactory.create(this.ds);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
index d595ab8..aaa585a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheLogRollDUnitTest.java
@@ -27,6 +27,8 @@ import java.io.*;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Test to make sure cache close is working.
  *
@@ -218,10 +220,10 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
     Properties props = new Properties();
     String baseLogName = "diskarito";
     String logfile = baseLogName+".log";
-    props.put(DistributionConfig.LOG_FILE_NAME, logfile);
-    props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
+    props.put(LOG_FILE, logfile);
+    props.put(LOG_FILE_SIZE_LIMIT, "1");
     DistributedSystem ds = this.getSystem(props);
-    props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "200");
+    props.put(LOG_DISK_SPACE_LIMIT, "200");
     for(int i=0;i<10;i++) {
      ds = this.getSystem(props);
      ds.disconnect();
@@ -237,10 +239,10 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
     Properties props = new Properties();
     String baseLogName = "restarto";
     String logfile = baseLogName+".log";
-    props.put(DistributionConfig.LOG_FILE_NAME, logfile);
-    props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
-    props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "200");
-    props.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+    props.put(LOG_FILE, logfile);
+    props.put(LOG_FILE_SIZE_LIMIT, "1");
+    props.put(LOG_DISK_SPACE_LIMIT, "200");
+    props.put(LOG_LEVEL, "config");
     InternalDistributedSystem ids = getSystem(props);
     assertEquals(InternalLogWriter.INFO_LEVEL, ((InternalLogWriter)ids.getLogWriter()).getLogWriterLevel());
     ids.disconnect();
@@ -297,9 +299,9 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
     Properties props = new Properties();
     String baseLogName = "biscuits";
     String logfile = baseLogName+".log";
-    props.put(DistributionConfig.LOG_FILE_NAME, logfile);
-    props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
-    props.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+    props.put(LOG_FILE, logfile);
+    props.put(LOG_FILE_SIZE_LIMIT, "1");
+    props.put(LOG_LEVEL, "config");
     DistributedSystem ds = getSystem(props);
     InternalDistributedSystem ids = (InternalDistributedSystem) ds;
     assertEquals(InternalLogWriter.INFO_LEVEL, ((InternalLogWriter)ids.getLogWriter()).getLogWriterLevel());
@@ -324,7 +326,7 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
      * Ok now we have rolled and yada yada. Let's disconnect and reconnect with same name!
      */
     int dsId = System.identityHashCode(ds);
-    props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "200");
+    props.put(LOG_DISK_SPACE_LIMIT, "200");
     
     File f1m = new File(logfile);
     assertTrue(f1m.exists());
@@ -374,9 +376,9 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
       Properties props = new Properties();
       
       String logfile = baseLogName+".log";
-    props.put(DistributionConfig.LOG_FILE_NAME, logfile);
-    props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
-    props.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+    props.put(LOG_FILE, logfile);
+    props.put(LOG_FILE_SIZE_LIMIT, "1");
+    props.put(LOG_LEVEL, "config");
       
       DistributedSystem ds = getSystem(props);
       InternalDistributedSystem ids = (InternalDistributedSystem) ds;
@@ -409,9 +411,9 @@ public class CacheLogRollDUnitTest extends CacheTestCase {
       
       String logfile = baseLogName+".log";
       String sec_logfile = "sec_"+baseLogName+".log";
-    props.put(DistributionConfig.LOG_FILE_NAME, logfile);
-    props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "1");
-    props.put(DistributionConfig.LOG_LEVEL_NAME, "config");
+    props.put(LOG_FILE, logfile);
+    props.put(LOG_FILE_SIZE_LIMIT, "1");
+    props.put(LOG_LEVEL, "config");
     props.put(DistributionConfig.SECURITY_LOG_FILE_NAME, sec_logfile);
     props.put(DistributionConfig.SECURITY_LOG_LEVEL_NAME, "config");
       

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
index f5190f6..80e5da9 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheRegionsReliablityStatsCheckDUnitTest.java
@@ -17,7 +17,6 @@
 package com.gemstone.gemfire.cache30;
 
 import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.CachePerfStats;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.test.dunit.Host;
@@ -27,100 +26,97 @@ import com.gemstone.gemfire.test.dunit.VM;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class CacheRegionsReliablityStatsCheckDUnitTest extends CacheTestCase {
-	public CacheRegionsReliablityStatsCheckDUnitTest(String name) {
-	    super(name);
-	}
-	
-	/**The tests check to see if all the reliablity stats are working
-	 * fine and asserts their values to constants.
-	 * 
-	 * */
-	public void testRegionsReliablityStats() throws Exception, RegionExistsException{
-		final String rr1 = "roleA";
-		final String regionNoAccess = "regionNoAccess";
-		final String regionLimitedAccess = "regionLimitedAccess";
-		final String regionFullAccess = "regionFullAccess";
-		//final String regionNameRoleA = "roleA";
-		String requiredRoles[] = { rr1};
-		Cache myCache = getCache();
-		
-		MembershipAttributes ra = new MembershipAttributes(requiredRoles,
-		        LossAction.NO_ACCESS, ResumptionAction.NONE);
-		
-		AttributesFactory fac = new AttributesFactory();
-	    fac.setMembershipAttributes(ra);
-	    fac.setScope(Scope.DISTRIBUTED_ACK);
-	    fac.setDataPolicy(DataPolicy.REPLICATE);
-	    
-	    RegionAttributes attr = fac.create();
-	    myCache.createRegion(regionNoAccess, attr);
-	    
-	    ra = new MembershipAttributes(requiredRoles,
-		        LossAction.LIMITED_ACCESS, ResumptionAction.NONE);
-	    fac = new AttributesFactory();
-	    fac.setMembershipAttributes(ra);
-	    fac.setScope(Scope.DISTRIBUTED_ACK);
-	    fac.setDataPolicy(DataPolicy.REPLICATE);
-	    attr = fac.create();
-		myCache.createRegion(regionLimitedAccess, attr);
-		
-		ra = new MembershipAttributes(requiredRoles,
-		        LossAction.FULL_ACCESS, ResumptionAction.NONE);
-		fac = new AttributesFactory();
-	    fac.setMembershipAttributes(ra);
-	    fac.setScope(Scope.DISTRIBUTED_ACK);
-	    fac.setDataPolicy(DataPolicy.REPLICATE);
-	    attr = fac.create();
-		myCache.createRegion(regionFullAccess, attr);
-		
-		CachePerfStats stats = ((GemFireCacheImpl)myCache).getCachePerfStats();
-		
-		assertEquals(stats.getReliableRegionsMissingNoAccess(), 1);
-		assertEquals(stats.getReliableRegionsMissingLimitedAccess(), 1);
-		assertEquals(stats.getReliableRegionsMissingFullAccess(), 1);
-	    assertEquals(stats.getReliableRegionsMissing(), (stats.getReliableRegionsMissingNoAccess() + 
-	    		stats.getReliableRegionsMissingLimitedAccess() + stats.getReliableRegionsMissingFullAccess() ));
-		
-	    
-	    Host host = Host.getHost(0);
-	    VM vm1 = host.getVM(1);
-	    
-	    SerializableRunnable roleAPlayer = new CacheSerializableRunnable(
-	    "ROLEAPLAYER") {
-	      public void run2() throws CacheException
-	      {
-	        
-	        Properties props = new Properties();
-	        props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
-	        props.setProperty(DistributionConfig.ROLES_NAME, rr1);
-
-	        getSystem(props);
-	        Cache cache = getCache();
-	        AttributesFactory fac = new AttributesFactory();
-	        fac.setScope(Scope.DISTRIBUTED_ACK);
-	        fac.setDataPolicy(DataPolicy.REPLICATE);
-
-	        RegionAttributes attr = fac.create();
-	        cache.createRegion(regionNoAccess, attr);
-	        cache.createRegion(regionLimitedAccess, attr);
-	        cache.createRegion(regionFullAccess, attr);
-	        
-	                
-	      }
-
-	    };
-	    
-	    vm1.invoke(roleAPlayer);
-	    	    
-	    assertEquals(stats.getReliableRegionsMissingNoAccess(), 0);
-		assertEquals(stats.getReliableRegionsMissingLimitedAccess(), 0);
-		assertEquals(stats.getReliableRegionsMissingFullAccess(), 0);
-	    assertEquals(stats.getReliableRegionsMissing(), (stats.getReliableRegionsMissingNoAccess() + 
-	    		stats.getReliableRegionsMissingLimitedAccess() + stats.getReliableRegionsMissingFullAccess() ));
-		
-		
-	}
-	
+  public CacheRegionsReliablityStatsCheckDUnitTest(String name) {
+    super(name);
+  }
+
+  /**
+   * The tests check to see if all the reliablity stats are working
+   * fine and asserts their values to constants.
+   */
+  public void testRegionsReliablityStats() throws Exception, RegionExistsException {
+    final String rr1 = "roleA";
+    final String regionNoAccess = "regionNoAccess";
+    final String regionLimitedAccess = "regionLimitedAccess";
+    final String regionFullAccess = "regionFullAccess";
+    //final String regionNameRoleA = "roleA";
+    String requiredRoles[] = { rr1 };
+    Cache myCache = getCache();
+
+    MembershipAttributes ra = new MembershipAttributes(requiredRoles,
+        LossAction.NO_ACCESS, ResumptionAction.NONE);
+
+    AttributesFactory fac = new AttributesFactory();
+    fac.setMembershipAttributes(ra);
+    fac.setScope(Scope.DISTRIBUTED_ACK);
+    fac.setDataPolicy(DataPolicy.REPLICATE);
+
+    RegionAttributes attr = fac.create();
+    myCache.createRegion(regionNoAccess, attr);
+
+    ra = new MembershipAttributes(requiredRoles,
+        LossAction.LIMITED_ACCESS, ResumptionAction.NONE);
+    fac = new AttributesFactory();
+    fac.setMembershipAttributes(ra);
+    fac.setScope(Scope.DISTRIBUTED_ACK);
+    fac.setDataPolicy(DataPolicy.REPLICATE);
+    attr = fac.create();
+    myCache.createRegion(regionLimitedAccess, attr);
+
+    ra = new MembershipAttributes(requiredRoles,
+        LossAction.FULL_ACCESS, ResumptionAction.NONE);
+    fac = new AttributesFactory();
+    fac.setMembershipAttributes(ra);
+    fac.setScope(Scope.DISTRIBUTED_ACK);
+    fac.setDataPolicy(DataPolicy.REPLICATE);
+    attr = fac.create();
+    myCache.createRegion(regionFullAccess, attr);
+
+    CachePerfStats stats = ((GemFireCacheImpl) myCache).getCachePerfStats();
+
+    assertEquals(stats.getReliableRegionsMissingNoAccess(), 1);
+    assertEquals(stats.getReliableRegionsMissingLimitedAccess(), 1);
+    assertEquals(stats.getReliableRegionsMissingFullAccess(), 1);
+    assertEquals(stats.getReliableRegionsMissing(), (stats.getReliableRegionsMissingNoAccess() +
+        stats.getReliableRegionsMissingLimitedAccess() + stats.getReliableRegionsMissingFullAccess()));
+
+    Host host = Host.getHost(0);
+    VM vm1 = host.getVM(1);
+
+    SerializableRunnable roleAPlayer = new CacheSerializableRunnable(
+        "ROLEAPLAYER") {
+      public void run2() throws CacheException {
+
+        Properties props = new Properties();
+        props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+        props.setProperty(ROLES, rr1);
+
+        getSystem(props);
+        Cache cache = getCache();
+        AttributesFactory fac = new AttributesFactory();
+        fac.setScope(Scope.DISTRIBUTED_ACK);
+        fac.setDataPolicy(DataPolicy.REPLICATE);
+
+        RegionAttributes attr = fac.create();
+        cache.createRegion(regionNoAccess, attr);
+        cache.createRegion(regionLimitedAccess, attr);
+        cache.createRegion(regionFullAccess, attr);
+
+      }
+
+    };
+
+    vm1.invoke(roleAPlayer);
+
+    assertEquals(stats.getReliableRegionsMissingNoAccess(), 0);
+    assertEquals(stats.getReliableRegionsMissingLimitedAccess(), 0);
+    assertEquals(stats.getReliableRegionsMissingFullAccess(), 0);
+    assertEquals(stats.getReliableRegionsMissing(), (stats.getReliableRegionsMissingNoAccess() +
+        stats.getReliableRegionsMissingLimitedAccess() + stats.getReliableRegionsMissingFullAccess()));
+
+  }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
index 80a845a..b9893d2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXml45DUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.cache30;
 import com.company.app.DBLoader;
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.DistributedRegion;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheTransactionManagerCreation;
@@ -33,6 +32,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Tests the declarative caching functionality introduced in GemFire
  * 5.0 (i.e. congo1). Don't be confused by the 45 in my name :-)
@@ -163,7 +164,7 @@ public class CacheXml45DUnitTest extends CacheXml41DUnitTest {
       // make our system play the roles used by this test so the create regions
       // will not think the a required role is missing
       Properties config = new Properties();
-      config.setProperty(DistributionConfig.ROLES_NAME, MY_ROLES);
+      config.setProperty(ROLES, MY_ROLES);
       this.xmlProps = config;
     }
     DistributedRegion.ignoreReconnect = true;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
index eef0788..9869e2e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/CacheXmlTestCase.java
@@ -17,7 +17,6 @@
 package com.gemstone.gemfire.cache30;
 
 import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
@@ -28,8 +27,7 @@ import com.gemstone.gemfire.util.test.TestUtil;
 import java.io.*;
 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 CacheXmlTestCase extends CacheTestCase {
 
@@ -90,7 +88,7 @@ public class CacheXmlTestCase extends CacheTestCase {
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
     if (this.xmlFile != null) {
-      props.setProperty(DistributionConfig.CACHE_XML_FILE_NAME,
+      props.setProperty(CACHE_XML_FILE,
                         this.xmlFile.toString());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
index b1e6694..d38c83f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ClientServerCCEDUnitTest.java
@@ -16,6 +16,8 @@
  */
 package com.gemstone.gemfire.cache30;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.client.ClientCacheFactory;
@@ -570,7 +572,7 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
         ClientCacheFactory cf = new ClientCacheFactory();
         cf.addPoolServer(NetworkUtils.getServerHostName(vm.getHost()), port);
         cf.setPoolSubscriptionEnabled(true);
-        cf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+        cf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
         ClientCache cache = getClientCache(cf);
         ClientRegionFactory crf = cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
         crf.setConcurrencyChecksEnabled(ccEnabled);
@@ -594,9 +596,9 @@ public class ClientServerCCEDUnitTest extends CacheTestCase {
         cf.setPoolSubscriptionEnabled(true);
         cf.setPoolSubscriptionRedundancy(1);
         // bug #50683 - secondary durable queue retains all GC messages
-        cf.set(DistributionConfig.DURABLE_CLIENT_ID_NAME, "" + vm.getPid());
-        cf.set(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, "" + 200);
-        cf.set(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+        cf.set(DURABLE_CLIENT_ID, "" + vm.getPid());
+        cf.set(DURABLE_CLIENT_TIMEOUT, "" + 200);
+        cf.set(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
         ClientCache cache = getClientCache(cf);
         ClientRegionFactory crf = cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
         crf.setConcurrencyChecksEnabled(ccEnabled);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
index 7594cc2..3b7a065 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionCCEDUnitTest.java
@@ -40,6 +40,8 @@ import java.net.UnknownHostException;
 import java.util.Properties;
 import java.util.Set;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitTest {
 
   public DistributedAckRegionCCEDUnitTest(String name) {
@@ -54,7 +56,7 @@ public class DistributedAckRegionCCEDUnitTest extends DistributedAckRegionDUnitT
   @Override
   public Properties getDistributedSystemProperties() {
     Properties p = super.getDistributedSystemProperties();
-    p.put(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+    p.put(CONSERVE_SOCKETS, "false");
     if (distributedSystemID > 0) {
       p.put(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+distributedSystemID);
     }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
index 78d4138..2cd4961 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedAckRegionDUnitTest.java
@@ -16,8 +16,9 @@
  */
 package com.gemstone.gemfire.cache30;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.dunit.*;
 
 import java.util.Properties;
@@ -48,8 +49,8 @@ public class DistributedAckRegionDUnitTest extends MultiVMRegionTestCase {
 
   public Properties getDistributedSystemProperties() {
     Properties p = new Properties();
-    p.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-    p.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+    p.put(STATISTIC_SAMPLING_ENABLED, "true");
+    p.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     return p;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 816ef6f..3104892 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -237,12 +237,12 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
   
   public Properties getDistributedSystemProperties() {
     Properties p = new Properties();
-    p.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
-    p.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, "multicast");
+    p.put(STATISTIC_SAMPLING_ENABLED, "true");
+    p.put(STATISTIC_ARCHIVE_FILE, "multicast");
     p.put(MCAST_PORT, mcastport);
     p.put(MCAST_TTL, mcastttl);
     p.put(LOCATORS, "localhost[" + locatorPort + "]");
-    p.put(DistributionConfig.LOG_LEVEL_NAME, "info");
+    p.put(LOG_LEVEL, "info");
     return p;
   } 
   
@@ -274,7 +274,7 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase {
         locatorProps.setProperty(SystemConfigurationProperties.NAME, "LocatorWithMcast");
         locatorProps.setProperty(MCAST_PORT, mcastport);
         locatorProps.setProperty(MCAST_TTL, mcastttl);
-        locatorProps.setProperty(DistributionConfig.LOG_LEVEL_NAME, "info");
+        locatorProps.setProperty(LOG_LEVEL, "info");
         //locatorProps.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "true");
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, null, null,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
index 15a045c..969349f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedNoAckRegionCCEDUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.cache30;
 
 import com.gemstone.gemfire.cache.*;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.test.dunit.*;
@@ -28,6 +27,8 @@ import org.junit.experimental.categories.Category;
 import java.util.Map;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class DistributedNoAckRegionCCEDUnitTest extends DistributedNoAckRegionDUnitTest {
   
   static volatile boolean ListenerBlocking;
@@ -39,11 +40,11 @@ public class DistributedNoAckRegionCCEDUnitTest extends DistributedNoAckRegionDU
   @Override
   public Properties getDistributedSystemProperties() {
     Properties p = super.getDistributedSystemProperties();
-    p.put(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+    p.put(CONSERVE_SOCKETS, "false");
     if (distributedSystemID > 0) {
-      p.put(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+distributedSystemID);
+      p.put(DISTRIBUTED_SYSTEM_ID, ""+distributedSystemID);
     }
-    p.put(DistributionConfig.SOCKET_BUFFER_SIZE_NAME, ""+2000000);
+    p.put(SOCKET_BUFFER_SIZE, ""+2000000);
     return p;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
index d054c9f..f068360 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/GlobalRegionCCEDUnitTest.java
@@ -35,6 +35,8 @@ import org.junit.Ignore;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * This test is only for GLOBAL REPLICATE Regions. Tests are
  * similar to {@link DistributedAckRegionCCEDUnitTest}.
@@ -57,7 +59,7 @@ public class GlobalRegionCCEDUnitTest extends GlobalRegionDUnitTest {
   @Override
   public Properties getDistributedSystemProperties() {
     Properties p = super.getDistributedSystemProperties();
-    p.put(DistributionConfig.CONSERVE_SOCKETS_NAME, "false");
+    p.put(CONSERVE_SOCKETS, "false");
     if (distributedSystemID > 0) {
       p.put(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""
           + distributedSystemID);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
index 3b6fbda..679a6be 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/QueueMsgDUnitTest.java
@@ -17,7 +17,6 @@
 package com.gemstone.gemfire.cache30;
 
 import com.gemstone.gemfire.cache.*;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.CachePerfStats;
 import com.gemstone.gemfire.internal.cache.DistributedRegion;
 import com.gemstone.gemfire.test.dunit.*;
@@ -27,6 +26,8 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.TreeMap;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Test to make sure message queuing works.
  *
@@ -79,7 +80,7 @@ public class QueueMsgDUnitTest extends ReliabilityTestCase {
     vm.invoke(new SerializableRunnable() {
         public void run() {
           Properties config = new Properties();
-          config.setProperty(DistributionConfig.ROLES_NAME, "missing");
+          config.setProperty(ROLES, "missing");
           getSystem(config);
         }
       });
@@ -219,7 +220,7 @@ public class QueueMsgDUnitTest extends ReliabilityTestCase {
     vm.invoke(new SerializableRunnable() {
         public void run() {
           Properties config = new Properties();
-          config.setProperty(DistributionConfig.ROLES_NAME, "pubFirst");
+          config.setProperty(ROLES, "pubFirst");
           getSystem(config);
         }
       });
@@ -257,7 +258,7 @@ public class QueueMsgDUnitTest extends ReliabilityTestCase {
     vm.invoke(new SerializableRunnable() {
         public void run() {
           Properties config = new Properties();
-          config.setProperty(DistributionConfig.ROLES_NAME, "subFirst");
+          config.setProperty(ROLES, "subFirst");
           getSystem(config);
         }
       });

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
index 9c3498d..18dab44 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/ReconnectDUnitTest.java
@@ -115,14 +115,14 @@ public class ReconnectDUnitTest extends CacheTestCase
   public Properties getDistributedSystemProperties() {
     if (dsProperties == null) {
       dsProperties = new Properties();
-      dsProperties.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "20000");
-      dsProperties.put(DistributionConfig.ENABLE_NETWORK_PARTITION_DETECTION_NAME, "true");
-      dsProperties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "false");
-      dsProperties.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+      dsProperties.put(MAX_WAIT_TIME_RECONNECT, "20000");
+      dsProperties.put(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+      dsProperties.put(DISABLE_AUTO_RECONNECT, "false");
+      dsProperties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
       dsProperties.put(LOCATORS, "localHost[" + locatorPort + "]");
       dsProperties.put(MCAST_PORT, "0");
-      dsProperties.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "1000");
-      dsProperties.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+      dsProperties.put(MEMBER_TIMEOUT, "1000");
+      dsProperties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     }
     return dsProperties;
   }
@@ -198,8 +198,8 @@ public class ReconnectDUnitTest extends CacheTestCase
         //      DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region");
         locatorPort = locPort;
         Properties props = getDistributedSystemProperties();
-        props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
-        props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+        props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
+        props.put(MAX_NUM_RECONNECT_TRIES, "2");
 //        props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log");
         Cache cache = new CacheFactory(props).create();
         IgnoredException.addIgnoredException("com.gemstone.gemfire.ForcedDisconnectException||Possible loss of quorum");
@@ -267,9 +267,9 @@ public class ReconnectDUnitTest extends CacheTestCase
         //      DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region");
         locatorPort = locPort;
         Properties props = getDistributedSystemProperties();
-        props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
-        props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000");
-        props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+        props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
+        props.put(MAX_WAIT_TIME_RECONNECT, "1000");
+        props.put(MAX_NUM_RECONNECT_TRIES, "2");
 //        props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log");
         Cache cache = new CacheFactory(props).create();
         Region myRegion = cache.getRegion("root/myRegion");
@@ -287,9 +287,9 @@ public class ReconnectDUnitTest extends CacheTestCase
         //            DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region");
         locatorPort = locPort;
         final Properties props = getDistributedSystemProperties();
-        props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
-        props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "5000");
-        props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+        props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
+        props.put(MAX_WAIT_TIME_RECONNECT, "5000");
+        props.put(MAX_NUM_RECONNECT_TRIES, "2");
         props.put(START_LOCATOR, "localhost[" + secondLocPort + "]");
         props.put(LOCATORS, props.get(LOCATORS) + ",localhost[" + secondLocPort + "]");
 //        props.put("log-file", "autoReconnectVM"+VM.getCurrentVMNum()+"_"+getPID()+".log");
@@ -482,10 +482,10 @@ public class ReconnectDUnitTest extends CacheTestCase
       {
         locatorPort = locPort;
         Properties props = getDistributedSystemProperties();
-        props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000");
-        props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+        props.put(MAX_WAIT_TIME_RECONNECT, "1000");
+        props.put(MAX_NUM_RECONNECT_TRIES, "2");
         props.put(LOCATORS, props.get(LOCATORS) + ",localhost[" + locPort + "]");
-        props.put(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+        props.put(ENABLE_CLUSTER_CONFIGURATION, "false");
         try {
           Locator.startLocatorAndDS(secondLocPort, null, props);
         } catch (IOException e) {
@@ -506,9 +506,9 @@ public class ReconnectDUnitTest extends CacheTestCase
         //      DebuggerSupport.waitForJavaDebugger(getLogWriter(), " about to create region");
         locatorPort = locPort;
         Properties props = getDistributedSystemProperties();
-        props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
-        props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000");
-        props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "2");
+        props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "MyDisconnect-cache.xml");
+        props.put(MAX_WAIT_TIME_RECONNECT, "1000");
+        props.put(MAX_NUM_RECONNECT_TRIES, "2");
         ReconnectDUnitTest.savedSystem = getSystem(props);
         Cache cache = getCache();
         Region myRegion = cache.getRegion("root/myRegion");
@@ -626,8 +626,8 @@ public class ReconnectDUnitTest extends CacheTestCase
 
     locatorPort = locPort;
     Properties config = getDistributedSystemProperties();
-    config.put(DistributionConfig.ROLES_NAME, "");
-    config.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+    config.put(ROLES, "");
+    config.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
 //    config.put("log-file", "roleLossController.log");
     //creating the DS
     getSystem(config);
@@ -670,11 +670,11 @@ public class ReconnectDUnitTest extends CacheTestCase
         LogWriterUtils.getLogWriter().info("####### STARTING THE REAL TEST ##########");
         locatorPort = locPort;
         Properties props = getDistributedSystemProperties();
-        props.put(DistributionConfig.CACHE_XML_FILE_NAME, xmlFileLoc + fileSeparator + "RoleReconnect-cache.xml");
-        props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "200");
+        props.put(CACHE_XML_FILE, xmlFileLoc + fileSeparator + "RoleReconnect-cache.xml");
+        props.put(MAX_WAIT_TIME_RECONNECT, "200");
         final int timeReconnect = 3;
-        props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "3");
-        props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+        props.put(MAX_NUM_RECONNECT_TRIES, "3");
+        props.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
 //        props.put("log-file", "roleLossVM0.log");
 
         getSystem(props);
@@ -759,8 +759,8 @@ public class ReconnectDUnitTest extends CacheTestCase
 
     locatorPort = locPort;
     Properties config = getDistributedSystemProperties();
-    config.put(DistributionConfig.ROLES_NAME, "");
-    config.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+    config.put(ROLES, "");
+    config.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     //creating the DS
     getSystem(config);
 
@@ -892,10 +892,10 @@ public class ReconnectDUnitTest extends CacheTestCase
           LogWriterUtils.getLogWriter().info("Starting the test and creating the cache and regions etc ...");
           locatorPort = locPort;
           Properties props = getDistributedSystemProperties();
-          props.put(DistributionConfig.CACHE_XML_FILE_NAME, "RoleRegained.xml");
-          props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "3000");
-          props.put(DistributionConfig.MAX_NUM_RECONNECT_TRIES, "8");
-          props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
+          props.put(CACHE_XML_FILE, "RoleRegained.xml");
+          props.put(MAX_WAIT_TIME_RECONNECT, "3000");
+          props.put(MAX_NUM_RECONNECT_TRIES, "8");
+          props.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
 
           getSystem(props);
           basicGetSystem().getLogWriter().info("<ExpectedException action=add>"
@@ -1043,8 +1043,7 @@ public class ReconnectDUnitTest extends CacheTestCase
       public void run()  {
         locatorPort = locPort;
         final Properties props = getDistributedSystemProperties();
-        props.put(DistributionConfig.MAX_WAIT_TIME_FOR_RECONNECT_NAME, "1000");
-//        props.put("log-file", "");
+        props.put(MAX_WAIT_TIME_RECONNECT, "1000");
         dsProperties = props;
         ReconnectDUnitTest.savedSystem = getSystem(props);
         ReconnectDUnitTest.savedCache = (GemFireCacheImpl)getCache();
@@ -1094,8 +1093,8 @@ public class ReconnectDUnitTest extends CacheTestCase
         // getSystem().disconnect();
         locatorPort = locPort;
         Properties props = getDistributedSystemProperties();
-        props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
-        props.put(DistributionConfig.ROLES_NAME, "RoleA");
+        props.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+        props.put(ROLES, "RoleA");
 
         getSystem(props);
         getCache();
@@ -1144,8 +1143,8 @@ public class ReconnectDUnitTest extends CacheTestCase
         LogWriterUtils.getLogWriter().info(startupMessage);
         locatorPort = locPort;
         Properties props = getDistributedSystemProperties();
-        props.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel());
-        props.put(DistributionConfig.ROLES_NAME, "RoleA");
+        props.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+        props.put(ROLES, "RoleA");
 
         getSystem(props);
         getCache();



Mime
View raw message