geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hiteshkhame...@apache.org
Subject [07/55] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public
Date Tue, 07 Jun 2016 19:06:26 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
index ea1df6a..ed5a60f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -168,7 +168,7 @@ public class InternalDistributedSystemJUnitTest
   public void testMemberTimeout() {
     Properties props = new Properties();
     int memberTimeout = 100;
-    props.put(DistributionConfig.MEMBER_TIMEOUT_NAME, String.valueOf(memberTimeout));
+    props.put(MEMBER_TIMEOUT, String.valueOf(memberTimeout));
     props.put(MCAST_PORT, "0");
 
     DistributionConfig config = createSystem(props).getOriginalConfig();
@@ -301,7 +301,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.LOG_LEVEL_NAME, logLevel.toString());
+    props.put(LOG_LEVEL, logLevel.toString());
 
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(logLevel.intValue(), config.getLogLevel());
@@ -311,7 +311,7 @@ public class InternalDistributedSystemJUnitTest
   public void testInvalidLogLevel() {
     try {
       Properties props = new Properties();
-      props.put(DistributionConfig.LOG_LEVEL_NAME, "blah blah blah");
+      props.put(LOG_LEVEL, "blah blah blah");
       createSystem(props);
       fail("Should have thrown an IllegalArgumentException");
 
@@ -326,7 +326,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true");
+    props.put(STATISTIC_SAMPLING_ENABLED, "true");
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(true, config.getStatisticSamplingEnabled());
   }
@@ -338,7 +338,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, rate);
+    props.put(STATISTIC_SAMPLE_RATE, rate);
     DistributionConfig config = createSystem(props).getConfig();
     // The fix for 48228 causes the rate to be 1000 even if we try to set it less
     assertEquals(1000, config.getStatisticSampleRate());
@@ -349,7 +349,7 @@ public class InternalDistributedSystemJUnitTest
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME, "5100-5200");
+    props.setProperty(MEMBERSHIP_PORT_RANGE, "5100-5200");
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(5100, config.getMembershipPortRange()[0]);
     assertEquals(5200, config.getMembershipPortRange()[1]);
@@ -360,7 +360,7 @@ public class InternalDistributedSystemJUnitTest
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME, "5200-5100");
+    props.setProperty(MEMBERSHIP_PORT_RANGE, "5200-5100");
     Object exception = null;
     try {
       createSystem(props).getConfig();
@@ -377,7 +377,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, fileName);
+    props.put(STATISTIC_ARCHIVE_FILE, fileName);
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(fileName, config.getStatisticArchiveFile().getName());
   }
@@ -393,7 +393,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, time);
+    props.put(ACK_WAIT_THRESHOLD, time);
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(Integer.parseInt(time), config.getAckWaitThreshold());
   }
@@ -405,7 +405,7 @@ public class InternalDistributedSystemJUnitTest
    */
   public void _testInvalidAckWaitThreshold() {
     Properties props = new Properties();
-    props.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "blah");
+    props.put(ACK_WAIT_THRESHOLD, "blah");
     try {
       createSystem(props);
       fail("Should have thrown an IllegalArgumentException");
@@ -422,7 +422,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.CACHE_XML_FILE_NAME, fileName);
+    props.put(CACHE_XML_FILE, fileName);
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(fileName, config.getCacheXmlFile().getPath());
   }
@@ -434,7 +434,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, value);
+    props.put(ARCHIVE_DISK_SPACE_LIMIT, value);
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(Integer.parseInt(value), config.getArchiveDiskSpaceLimit());
   }
@@ -442,7 +442,7 @@ public class InternalDistributedSystemJUnitTest
   @Test
   public void testInvalidArchiveDiskSpaceLimit() {
     Properties props = new Properties();
-    props.put(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, "blah");
+    props.put(ARCHIVE_DISK_SPACE_LIMIT, "blah");
     try {
       createSystem(props);
       fail("Should have thrown an IllegalArgumentException");
@@ -459,7 +459,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, value);
+    props.put(ARCHIVE_FILE_SIZE_LIMIT, value);
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(Integer.parseInt(value), config.getArchiveFileSizeLimit());
   }
@@ -467,7 +467,7 @@ public class InternalDistributedSystemJUnitTest
   @Test
   public void testInvalidArchiveFileSizeLimit() {
     Properties props = new Properties();
-    props.put(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, "blah");
+    props.put(ARCHIVE_FILE_SIZE_LIMIT, "blah");
     try {
       createSystem(props);
       fail("Should have thrown an IllegalArgumentException");
@@ -484,7 +484,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, value);
+    props.put(LOG_DISK_SPACE_LIMIT, value);
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(Integer.parseInt(value), config.getLogDiskSpaceLimit());
   }
@@ -492,7 +492,7 @@ public class InternalDistributedSystemJUnitTest
   @Test
   public void testInvalidLogDiskSpaceLimit() {
     Properties props = new Properties();
-    props.put(DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME, "blah");
+    props.put(LOG_DISK_SPACE_LIMIT, "blah");
     try {
       createSystem(props);
       fail("Should have thrown an IllegalArgumentException");
@@ -509,7 +509,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, value);
+    props.put(LOG_FILE_SIZE_LIMIT, value);
     DistributionConfig config = createSystem(props).getConfig();
     assertEquals(Integer.parseInt(value), config.getLogFileSizeLimit());
   }
@@ -517,7 +517,7 @@ public class InternalDistributedSystemJUnitTest
   @Test
   public void testInvalidLogFileSizeLimit() {
     Properties props = new Properties();
-    props.put(DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME, "blah");
+    props.put(LOG_FILE_SIZE_LIMIT, "blah");
     try {
       createSystem(props);
       fail("Should have thrown an IllegalArgumentException");
@@ -566,7 +566,7 @@ public class InternalDistributedSystemJUnitTest
     File spropFile = new File("gfsecurity.properties");
     boolean spropFileExisted = spropFile.exists();
     try {
-      System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.LOG_LEVEL_NAME, "finest");
+      System.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_LEVEL, "finest");
       Properties apiProps = new Properties();
       apiProps.setProperty(DistributionConfig.GROUPS_NAME, "foo, bar");
       {
@@ -584,7 +584,7 @@ public class InternalDistributedSystemJUnitTest
           spropFile.renameTo(new File("gfsecurity.properties.sav"));
         }
         Properties fileProps = new Properties();
-        fileProps.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, "999");
+        fileProps.setProperty(STATISTIC_SAMPLE_RATE, "999");
         FileWriter fw = new FileWriter("gfsecurity.properties");
         fileProps.store(fw, null);
         fw.close();
@@ -592,9 +592,9 @@ public class InternalDistributedSystemJUnitTest
       DistributionConfigImpl dci = new DistributionConfigImpl(apiProps);
       assertEquals(null, dci.getAttributeSource(MCAST_PORT));
       assertEquals(ConfigSource.api(), dci.getAttributeSource(DistributionConfig.GROUPS_NAME));
-      assertEquals(ConfigSource.sysprop(), dci.getAttributeSource(DistributionConfig.LOG_LEVEL_NAME));
+      assertEquals(ConfigSource.sysprop(), dci.getAttributeSource(LOG_LEVEL));
       assertEquals(ConfigSource.Type.FILE, dci.getAttributeSource("name").getType());
-      assertEquals(ConfigSource.Type.SECURE_FILE, dci.getAttributeSource(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME).getType());
+      assertEquals(ConfigSource.Type.SECURE_FILE, dci.getAttributeSource(STATISTIC_SAMPLE_RATE).getType());
     } finally {
       System.clearProperty(DistributionConfig.GEMFIRE_PREFIX + "log-level");
       propFile.delete();
@@ -629,7 +629,7 @@ public class InternalDistributedSystemJUnitTest
     // a loner is all this test needs
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.put(DistributionConfig.LOG_LEVEL_NAME, level.toString());
+    props.put(LOG_LEVEL, level.toString());
     InternalDistributedSystem system = createSystem(props);
     assertEquals(level.intValue(), system.getConfig().getLogLevel());
     assertEquals(level.intValue(), ((InternalLogWriter) system.getLogWriter()).getLogWriterLevel());
@@ -688,7 +688,7 @@ public class InternalDistributedSystemJUnitTest
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(DistributionConfig.SSL_ENABLED_NAME, "true");
+    props.setProperty(SSL_ENABLED, "true");
     Config config1 = new DistributionConfigImpl(props, false);
     Properties props1 = config1.toProperties();
     // For the deprecated ssl-* properties a decision was made
@@ -697,12 +697,12 @@ public class InternalDistributedSystemJUnitTest
     // and its use in toProperties.
     // The other thing that is done is the ssl-* props are copied to cluster-ssl-*.
     // The following two assertions demonstrate this.
-    assertEquals(null, props1.getProperty(DistributionConfig.SSL_ENABLED_NAME));
-    assertEquals("true", props1.getProperty(DistributionConfig.CLUSTER_SSL_ENABLED_NAME));
+    assertEquals(null, props1.getProperty(SSL_ENABLED));
+    assertEquals("true", props1.getProperty(CLUSTER_SSL_ENABLED));
     Config config2 = new DistributionConfigImpl(props1, false);
     assertEquals(true, config1.sameAs(config2));
     Properties props3 = new Properties(props1);
-    props3.setProperty(DistributionConfig.SSL_ENABLED_NAME, "false");
+    props3.setProperty(SSL_ENABLED, "false");
     Config config3 = new DistributionConfigImpl(props3, false);
     assertEquals(false, config1.sameAs(config3));
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
index 0185e03..e7b225b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/ProductUseLogDUnitTest.java
@@ -34,7 +34,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 
 public class ProductUseLogDUnitTest extends CacheTestCase {
@@ -51,7 +51,7 @@ public class ProductUseLogDUnitTest extends CacheTestCase {
   @Override
   public Properties getDistributedSystemProperties() {
     Properties p = super.getDistributedSystemProperties();
-    p.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+    p.put(USE_CLUSTER_CONFIGURATION, "false");
     return p;
   }
   
@@ -64,7 +64,7 @@ public class ProductUseLogDUnitTest extends CacheTestCase {
     int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     Properties p = new Properties();
     p.put(START_LOCATOR, "localhost[" + locatorPort + "],peer=false");
-    p.put(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+    p.put(USE_CLUSTER_CONFIGURATION, "false");
     InternalDistributedSystem system = getSystem(p);
     
     InternalLocator locator = (InternalLocator)Locator.getLocator();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
index 05f498e..da8e8de 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/MembershipJUnitTest.java
@@ -40,8 +40,7 @@ import java.io.File;
 import java.net.InetAddress;
 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.*;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.*;
@@ -100,12 +99,12 @@ public class MembershipJUnitTest {
 
       // create configuration objects
       Properties nonDefault = new Properties();
-      nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+      nonDefault.put(DISABLE_TCP, "true");
       nonDefault.put(MCAST_PORT, String.valueOf(mcastPort));
-      nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
-      nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+      nonDefault.put(LOG_FILE, "");
+      nonDefault.put(LOG_LEVEL, "fine");
       nonDefault.put(DistributionConfig.GROUPS_NAME, "red, blue");
-      nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
+      nonDefault.put(MEMBER_TIMEOUT, "2000");
       nonDefault.put(LOCATORS, localHost.getHostName() + '[' + port + ']');
       DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
       RemoteTransportConfig transport = new RemoteTransportConfig(config,
@@ -205,7 +204,7 @@ public class MembershipJUnitTest {
   public void testJoinTimeoutSetting() throws Exception {
     long timeout = 30000;
     Properties nonDefault = new Properties();
-    nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, ""+timeout);
+    nonDefault.put(MEMBER_TIMEOUT, ""+timeout);
     DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
     RemoteTransportConfig transport = new RemoteTransportConfig(config,
         DistributionManager.NORMAL_DM_TYPE);
@@ -246,10 +245,10 @@ public class MembershipJUnitTest {
   @Test
   public void testMulticastDiscoveryNotAllowed() {
     Properties nonDefault = new Properties();
-    nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+    nonDefault.put(DISABLE_TCP, "true");
     nonDefault.put(MCAST_PORT, "12345");
-    nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
-    nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    nonDefault.put(LOG_FILE, "");
+    nonDefault.put(LOG_LEVEL, "fine");
     nonDefault.put(LOCATORS, "");
     DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
     RemoteTransportConfig transport = new RemoteTransportConfig(config,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index 2786508..5ac830b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -87,14 +87,14 @@ public class GMSHealthMonitorJUnitTest {
     Stopper stopper = mock(Stopper.class); 
     
     Properties nonDefault = new Properties();
-    nonDefault.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "1");
-    nonDefault.put(DistributionConfig.ACK_SEVERE_ALERT_THRESHOLD_NAME, "10");
-    nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+    nonDefault.put(ACK_WAIT_THRESHOLD, "1");
+    nonDefault.put(ACK_SEVERE_ALERT_THRESHOLD, "10");
+    nonDefault.put(DISABLE_TCP, "true");
     nonDefault.put(MCAST_PORT, "0");
     nonDefault.put(MCAST_TTL, "0");
-    nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
-    nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
-    nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
+    nonDefault.put(LOG_FILE, "");
+    nonDefault.put(LOG_LEVEL, "fine");
+    nonDefault.put(MEMBER_TIMEOUT, "2000");
     nonDefault.put(LOCATORS, "localhost[10344]");
     DM dm = mock(DM.class);    
     InternalDistributedSystem system = InternalDistributedSystem.newInstanceForTesting(dm, nonDefault);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
index 806b8cb..7d2ab74 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/GMSLocatorRecoveryJUnitTest.java
@@ -141,10 +141,10 @@ public class GMSLocatorRecoveryJUnitTest {
       
       // create configuration objects
       Properties nonDefault = new Properties();
-      nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+      nonDefault.put(DISABLE_TCP, "true");
       nonDefault.put(MCAST_PORT, "0");
-      nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
-      nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+      nonDefault.put(LOG_FILE, "");
+      nonDefault.put(LOG_LEVEL, "fine");
       nonDefault.put(LOCATORS, localHost.getHostAddress() + '[' + port + ']');
       nonDefault.put(BIND_ADDRESS, localHost.getHostAddress());
       DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
index c3239b2..aff0e1e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/messenger/JGroupsMessengerJUnitTest.java
@@ -85,13 +85,13 @@ public class JGroupsMessengerJUnitTest {
       messenger = null;
     }
     Properties nonDefault = new Properties();
-    nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+    nonDefault.put(DISABLE_TCP, "true");
     nonDefault.put(MCAST_PORT, enableMcast ? "" + AvailablePortHelper.getRandomAvailableUDPPort() : "0");
     nonDefault.put(MCAST_TTL, "0");
-    nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
-    nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    nonDefault.put(LOG_FILE, "");
+    nonDefault.put(LOG_LEVEL, "fine");
     nonDefault.put(LOCATORS, "localhost[10344]");
-    nonDefault.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "1");
+    nonDefault.put(ACK_WAIT_THRESHOLD, "1");
     DistributionConfigImpl config = new DistributionConfigImpl(nonDefault);
     RemoteTransportConfig tconfig = new RemoteTransportConfig(config,
         DistributionManager.NORMAL_DM_TYPE);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
index 1bc4ed2..fdfb46e 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManagerJUnitTest.java
@@ -75,14 +75,14 @@ public class GMSMembershipManagerJUnitTest {
   @Before
   public void initMocks() throws Exception {
     Properties nonDefault = new Properties();
-    nonDefault.put(DistributionConfig.ACK_WAIT_THRESHOLD_NAME, "1");
-    nonDefault.put(DistributionConfig.ACK_SEVERE_ALERT_THRESHOLD_NAME, "10");
-    nonDefault.put(DistributionConfig.DISABLE_TCP_NAME, "true");
+    nonDefault.put(ACK_WAIT_THRESHOLD, "1");
+    nonDefault.put(ACK_SEVERE_ALERT_THRESHOLD, "10");
+    nonDefault.put(DISABLE_TCP, "true");
     nonDefault.put(MCAST_PORT, "0");
     nonDefault.put(MCAST_TTL, "0");
-    nonDefault.put(DistributionConfig.LOG_FILE_NAME, "");
-    nonDefault.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
-    nonDefault.put(DistributionConfig.MEMBER_TIMEOUT_NAME, "2000");
+    nonDefault.put(LOG_FILE, "");
+    nonDefault.put(LOG_LEVEL, "fine");
+    nonDefault.put(MEMBER_TIMEOUT, "2000");
     nonDefault.put(LOCATORS, "localhost[10344]");
     distConfig = new DistributionConfigImpl(nonDefault);
     distProperties = nonDefault;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
index 897fafd..f312d3c 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServerBackwardCompatDUnitTest.java
@@ -38,8 +38,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 /**
  * This tests the rolling upgrade for locators with
@@ -110,8 +109,8 @@ public class TcpServerBackwardCompatDUnitTest extends DistributedTestCase {
     final Properties props = new Properties();
     props.setProperty(LOCATORS, locators);
     props.setProperty(MCAST_PORT, "0");
-    props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
-    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "finest");
+    props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+    props.setProperty(LOG_LEVEL, "finest");
     
     // Start locator0 with props.
     //props.setProperty(DistributionConfig.START_LOCATOR_NAME, host.getHostName() + "["+port0+"]");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
index f0ea16d..217ebf8 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/CacheMapDistTXDUnitTest.java
@@ -17,10 +17,11 @@
 package com.gemstone.gemfire.disttx;
 
 import com.gemstone.gemfire.cache30.CacheMapTxnDUnitTest;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.VM;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 
 /**
  * Same tests as that of {@link CacheMapTxnDUnitTest} after setting
@@ -59,8 +60,8 @@ public class CacheMapDistTXDUnitTest extends CacheMapTxnDUnitTest {
   }
 
   public static void setDistributedTX() {
-    props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-//    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+//    props.setProperty(LOG_LEVEL, "fine");
   }
 
   public static void checkIsDistributedTX() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
index ead27d1..7f1a37a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXJUnitTest.java
@@ -50,7 +50,7 @@ public class DistTXJUnitTest extends TXJUnitTest {
     Properties p = new Properties();
     p.setProperty(MCAST_PORT, "0"); // loner
     p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
-    //    p.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    //    p.setProperty(LOG_LEVEL, "fine");
     this.cache = (GemFireCacheImpl)CacheFactory.create(DistributedSystem.connect(p));
     createRegion();
     this.txMgr = this.cache.getCacheTransactionManager();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
index 71d82a9..a6a8a0f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXOrderDUnitTest.java
@@ -18,8 +18,8 @@ package com.gemstone.gemfire.disttx;
 
 import com.gemstone.gemfire.cache.CacheException;
 import com.gemstone.gemfire.cache30.TXOrderDUnitTest;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import java.util.Properties;
 
 
@@ -36,8 +36,8 @@ public class DistTXOrderDUnitTest extends TXOrderDUnitTest {
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
-    props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-//    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
index a935950..78a648a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXRestrictionsDUnitTest.java
@@ -17,8 +17,7 @@
 package com.gemstone.gemfire.disttx;
 
 import com.gemstone.gemfire.cache30.TXRestrictionsDUnitTest;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import java.util.Properties;
 
 /**
@@ -35,8 +34,8 @@ public class DistTXRestrictionsDUnitTest extends TXRestrictionsDUnitTest {
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
 //    props.put("distributed-transactions", "true");
-    props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-//    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
index befeca7..b22d37e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistTXWithDeltaDUnitTest.java
@@ -16,10 +16,9 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.TransactionsWithDeltaDUnitTest;
-
 import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 
 public class DistTXWithDeltaDUnitTest extends TransactionsWithDeltaDUnitTest {
 
@@ -30,8 +29,8 @@ public class DistTXWithDeltaDUnitTest extends TransactionsWithDeltaDUnitTest {
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
-    props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-    // props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+    // props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
index 9b40e48..8aecf6b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/DistributedTransactionDUnitTest.java
@@ -151,7 +151,7 @@ public class DistributedTransactionDUnitTest extends CacheTestCase {
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
     //props.put("distributed-transactions", "true");
-//    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
index 7f75cae..66535bb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXDUnitTest.java
@@ -16,9 +16,8 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.execute.PRTransactionDUnitTest;
-
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import java.util.Properties;
 
 public class PRDistTXDUnitTest extends PRTransactionDUnitTest {
@@ -30,8 +29,8 @@ public class PRDistTXDUnitTest extends PRTransactionDUnitTest {
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
-    props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-//    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
index 2e539e3..e50755e 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXJUnitTest.java
@@ -48,7 +48,7 @@ public class PRDistTXJUnitTest extends PRTXJUnitTest {
     Properties p = new Properties();
     p.setProperty(MCAST_PORT, "0"); // loner
     p.setProperty(SystemConfigurationProperties.DISTRIBUTED_TRANSACTIONS, "true");
-    // p.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    // p.setProperty(LOG_LEVEL, "fine");
     this.cache = (GemFireCacheImpl) CacheFactory.create(DistributedSystem
         .connect(p));
     createRegion();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
index f02ade9..934aef2 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PRDistTXWithVersionsDUnitTest.java
@@ -16,11 +16,12 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.execute.PRTransactionWithVersionsDUnitTest;
 
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 public class PRDistTXWithVersionsDUnitTest extends
     PRTransactionWithVersionsDUnitTest {
 
@@ -31,8 +32,8 @@ public class PRDistTXWithVersionsDUnitTest extends
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
-    props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-//    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
index d9b8ed7..c514b60 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/disttx/PersistentPartitionedRegionWithDistTXDUnitTest.java
@@ -16,9 +16,8 @@
  */
 package com.gemstone.gemfire.disttx;
 
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.partitioned.PersistentPartitionedRegionWithTransactionDUnitTest;
-
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import java.util.Properties;
 
 
@@ -33,8 +32,8 @@ public class PersistentPartitionedRegionWithDistTXDUnitTest extends
   @Override
   public Properties getDistributedSystemProperties() {
     Properties props = super.getDistributedSystemProperties();
-    props.setProperty(DistributionConfig.DISTRIBUTED_TRANSACTIONS_NAME, "true");
-//    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    props.setProperty(DISTRIBUTED_TRANSACTIONS, "true");
+//    props.setProperty(LOG_LEVEL, "fine");
     return props;
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
index 48fa764..287ab86 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/AbstractConfigJUnitTest.java
@@ -24,69 +24,70 @@ import org.junit.experimental.categories.Category;
 import java.lang.reflect.Method;
 import java.util.Map;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 @Category(UnitTest.class)
 public class AbstractConfigJUnitTest {
 
-	@Test
-	public void testDisplayPropertyValue() throws Exception {
-		AbstractConfigTestClass actc = new AbstractConfigTestClass();
-		Method method = actc.getClass().getSuperclass().getDeclaredMethod("okToDisplayPropertyValue", String.class);
-		method.setAccessible(true);
-		assertFalse((Boolean) method.invoke(actc, "password"));
-		assertFalse((Boolean) method.invoke(actc, DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME));
-		assertTrue((Boolean) method.invoke(actc, DistributionConfig.CLUSTER_SSL_ENABLED_NAME));
-		assertFalse((Boolean) method.invoke(actc, DistributionConfig.GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME));
-		assertFalse((Boolean) method.invoke(actc, DistributionConfig.SERVER_SSL_KEYSTORE_PASSWORD_NAME));
-		assertTrue((Boolean) method.invoke(actc, DistributionConfig.SSL_ENABLED_NAME));
-		assertTrue((Boolean) method.invoke(actc, DistributionConfig.CONSERVE_SOCKETS_NAME));
-		assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStorePassword"));
-		assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStoreType"));
-		assertFalse((Boolean) method.invoke(actc, "sysprop-value"));
-	}
+  @Test
+  public void testDisplayPropertyValue() throws Exception {
+    AbstractConfigTestClass actc = new AbstractConfigTestClass();
+    Method method = actc.getClass().getSuperclass().getDeclaredMethod("okToDisplayPropertyValue", String.class);
+    method.setAccessible(true);
+    assertFalse((Boolean) method.invoke(actc, "password"));
+    assertFalse((Boolean) method.invoke(actc,CLUSTER_SSL_TRUSTSTORE_PASSWORD));
+    assertTrue((Boolean) method.invoke(actc, CLUSTER_SSL_ENABLED));
+    assertFalse((Boolean) method.invoke(actc, GATEWAY_SSL_TRUSTSTORE_PASSWORD));
+    assertFalse((Boolean) method.invoke(actc, SERVER_SSL_KEYSTORE_PASSWORD));
+    assertTrue((Boolean) method.invoke(actc, SSL_ENABLED));
+    assertTrue((Boolean) method.invoke(actc, CONSERVE_SOCKETS));
+    assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStorePassword"));
+    assertFalse((Boolean) method.invoke(actc, "javax.net.ssl.keyStoreType"));
+    assertFalse((Boolean) method.invoke(actc, "sysprop-value"));
+  }
 
-	private static class AbstractConfigTestClass extends AbstractConfig {
+  private static class AbstractConfigTestClass extends AbstractConfig {
 
-		@Override
-		protected Map getAttDescMap() {
-			return null;
-		}
+    @Override
+    protected Map getAttDescMap() {
+      return null;
+    }
 
-		@Override
-		protected Map<String, ConfigSource> getAttSourceMap() {
-			return null;
-		}
+    @Override
+    protected Map<String, ConfigSource> getAttSourceMap() {
+      return null;
+    }
 
-		@Override
-		public Object getAttributeObject(String attName) {
-			return null;
-		}
+    @Override
+    public Object getAttributeObject(String attName) {
+      return null;
+    }
 
-		@Override
-		public void setAttributeObject(String attName, Object attValue, ConfigSource source) {
+    @Override
+    public void setAttributeObject(String attName, Object attValue, ConfigSource source) {
 
-		}
+    }
 
-		@Override
-		public boolean isAttributeModifiable(String attName) {
-			return false;
-		}
+    @Override
+    public boolean isAttributeModifiable(String attName) {
+      return false;
+    }
 
-		@Override
-		public Class getAttributeType(String attName) {
-			return null;
-		}
+    @Override
+    public Class getAttributeType(String attName) {
+      return null;
+    }
 
-		@Override
-		public String[] getAttributeNames() {
-			return new String[0];
-		}
+    @Override
+    public String[] getAttributeNames() {
+      return new String[0];
+    }
 
-		@Override
-		public String[] getSpecificAttributeNames() {
-			return new String[0];
-		}
-	}
+    @Override
+    public String[] getSpecificAttributeNames() {
+      return new String[0];
+    }
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
index 9d50cc5..c53a3d1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/GemFireStatSamplerJUnitTest.java
@@ -43,8 +43,7 @@ import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
 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.*;
 import static org.junit.Assert.*;
 import static org.junit.Assume.assumeFalse;
 
@@ -181,7 +180,7 @@ public class GemFireStatSamplerJUnitTest extends StatSamplerTestCase {
     final File archiveFile1 = new File(dir + File.separator + this.testName + ".gfs");
     
     Properties props = createGemFireProperties();
-    props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, archiveFileName);
+    props.setProperty(STATISTIC_ARCHIVE_FILE, archiveFileName);
     connect(props);
 
     GemFireStatSampler statSampler = getGemFireStatSampler();
@@ -360,9 +359,9 @@ public class GemFireStatSamplerJUnitTest extends StatSamplerTestCase {
     // set the system property to use KB instead of MB for file size
     System.setProperty(HostStatSampler.TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY, "true");
     Properties props = createGemFireProperties();
-    props.setProperty(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, "1");
-    props.setProperty(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, "0");
-    props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, archiveFileName);
+    props.setProperty(ARCHIVE_FILE_SIZE_LIMIT, "1");
+    props.setProperty(ARCHIVE_DISK_SPACE_LIMIT, "0");
+    props.setProperty(STATISTIC_ARCHIVE_FILE, archiveFileName);
     connect(props);
 
     assertTrue(getGemFireStatSampler().waitForInitialization(5000));
@@ -408,10 +407,10 @@ public class GemFireStatSamplerJUnitTest extends StatSamplerTestCase {
     // set the system property to use KB instead of MB for file size
     System.setProperty(HostStatSampler.TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY, "true");
     Properties props = createGemFireProperties();
-    props.setProperty(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, archiveFileName);
-    props.setProperty(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, "1");
-    props.setProperty(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, "12");
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, String.valueOf(sampleRate));
+    props.setProperty(STATISTIC_ARCHIVE_FILE, archiveFileName);
+    props.setProperty(ARCHIVE_FILE_SIZE_LIMIT, "1");
+    props.setProperty(ARCHIVE_DISK_SPACE_LIMIT, "12");
+    props.setProperty(STATISTIC_SAMPLE_RATE, String.valueOf(sampleRate));
     connect(props);
 
     assertTrue(getGemFireStatSampler().waitForInitialization(5000));
@@ -534,11 +533,11 @@ public class GemFireStatSamplerJUnitTest extends StatSamplerTestCase {
 
   private Properties createGemFireProperties() {
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME, "true"); // TODO: test true/false
-    props.setProperty(DistributionConfig.ENABLE_TIME_STATISTICS_NAME, "true"); // TODO: test true/false
-    props.setProperty(DistributionConfig.STATISTIC_SAMPLE_RATE_NAME, String.valueOf(STAT_SAMPLE_RATE));
-    props.setProperty(DistributionConfig.ARCHIVE_FILE_SIZE_LIMIT_NAME, "0");
-    props.setProperty(DistributionConfig.ARCHIVE_DISK_SPACE_LIMIT_NAME, "0");
+    props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); // TODO: test true/false
+    props.setProperty(ENABLE_TIME_STATISTICS, "true"); // TODO: test true/false
+    props.setProperty(STATISTIC_SAMPLE_RATE, String.valueOf(STAT_SAMPLE_RATE));
+    props.setProperty(ARCHIVE_FILE_SIZE_LIMIT, "0");
+    props.setProperty(ARCHIVE_DISK_SPACE_LIMIT, "0");
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
     return props;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
index fc9fef5..fc1e40d 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JSSESocketJUnitTest.java
@@ -42,7 +42,7 @@ import java.net.ServerSocket;
 import java.net.Socket;
 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.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -101,10 +101,10 @@ public class JSSESocketJUnitTest {
       LogService.setBaseLogLevel(Level.DEBUG);
       {
         System.setProperty(DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT, "0");
-        System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_ENABLED_NAME, "true");
-        System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, "true");
-        System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_CIPHERS_NAME, "any");
-        System.setProperty(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_PROTOCOLS_NAME, "TLSv1.2");
+        System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_ENABLED, "true");
+        System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_REQUIRE_AUTHENTICATION, "true");
+        System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_CIPHERS, "any");
+        System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SSL_PROTOCOLS, "TLSv1.2");
 
         File jks = findTestJKS();
         System.setProperty("javax.net.ssl.trustStore", jks.getCanonicalPath());
@@ -164,7 +164,7 @@ public class JSSESocketJUnitTest {
   public void testClientSocketFactory() {
     System.getProperties().put(DistributionConfig.GEMFIRE_PREFIX + "clientSocketFactory",
         TSocketFactory.class.getName());
-    System.getProperties().remove(DistributionConfig.GEMFIRE_PREFIX + DistributionConfig.SSL_ENABLED_NAME);
+    System.getProperties().remove(DistributionConfig.GEMFIRE_PREFIX + SSL_ENABLED);
     SocketCreator.getDefaultInstance(new Properties());
     factoryInvoked = false;
     try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
index 84a72b0..02bb437 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/JarDeployerDUnitTest.java
@@ -21,6 +21,7 @@ import com.gemstone.gemfire.cache.execute.FunctionService;
 import com.gemstone.gemfire.cache.execute.ResultCollector;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.test.dunit.Assert;
@@ -456,7 +457,7 @@ public class JarDeployerDUnitTest extends CacheTestCase {
     // Add the alternate directory to the distributed system, get it back out, and then create
     // a JarDeployer object with it.
     Properties properties = new Properties();
-    properties.put(DistributionConfig.DEPLOY_WORKING_DIR, alternateDir.getAbsolutePath());
+    properties.put(SystemConfigurationProperties.DEPLOY_WORKING_DIR, alternateDir.getAbsolutePath());
     InternalDistributedSystem distributedSystem = getSystem(properties);
     final JarDeployer jarDeployer = new JarDeployer(distributedSystem.getConfig().getDeployWorkingDir());
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
index 5e179f2..a2e7414 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxDeleteFieldDUnitTest.java
@@ -55,7 +55,7 @@ public class PdxDeleteFieldDUnitTest  extends CacheTestCase{
     final int[] locatorPorts = AvailablePortHelper.getRandomAvailableTCPPorts(2);
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "localhost[" + locatorPorts[0] + "],localhost[" + locatorPorts[1] + "]");
-    props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
 
     final File f = new File(DS_NAME);
     f.mkdir();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
index ede5e16..6e63465 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/PdxRenameDUnitTest.java
@@ -62,7 +62,7 @@ public class PdxRenameDUnitTest  extends CacheTestCase{
     final Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "localhost[" + locatorPorts[0] + "],localhost[" + locatorPorts[1] + "]");
-    props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
     
     Host host = Host.getHost(0);
     VM vm1 = host.getVM(0);


Mime
View raw message