geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [34/67] [abbrv] incubator-geode git commit: GEODE-1377: Initial move of system properties from private to public
Date Thu, 02 Jun 2016 00:08:20 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index a91306e..72e0118 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -16,63 +16,17 @@
  */
 package com.gemstone.gemfire.distributed.internal.membership.gms.mgr;
 
-import java.io.IOException;
-import java.io.NotSerializableException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import org.apache.logging.log4j.Logger;
-
-import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.ForcedDisconnectException;
-import com.gemstone.gemfire.GemFireConfigException;
-import com.gemstone.gemfire.InternalGemFireError;
-import com.gemstone.gemfire.SystemConnectException;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.ToDataException;
+import com.gemstone.gemfire.*;
 import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
 import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.AdminMessageType;
-import com.gemstone.gemfire.distributed.internal.DMStats;
-import com.gemstone.gemfire.distributed.internal.DSClock;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.DistributionException;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.InternalLocator;
-import com.gemstone.gemfire.distributed.internal.OverflowQueueWithDMStats;
-import com.gemstone.gemfire.distributed.internal.SizeableRunnable;
-import com.gemstone.gemfire.distributed.internal.StartupMessage;
+import com.gemstone.gemfire.distributed.internal.*;
 import com.gemstone.gemfire.distributed.internal.direct.DirectChannel;
 import com.gemstone.gemfire.distributed.internal.direct.DirectChannelListener;
 import com.gemstone.gemfire.distributed.internal.direct.ShunnedMemberException;
-import com.gemstone.gemfire.distributed.internal.membership.DistributedMembershipListener;
-import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
-import com.gemstone.gemfire.distributed.internal.membership.MembershipTestHook;
-import com.gemstone.gemfire.distributed.internal.membership.NetView;
-import com.gemstone.gemfire.distributed.internal.membership.QuorumChecker;
+import com.gemstone.gemfire.distributed.internal.membership.*;
 import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember;
 import com.gemstone.gemfire.distributed.internal.membership.gms.Services;
 import com.gemstone.gemfire.distributed.internal.membership.gms.SuspectMember;
@@ -97,6 +51,17 @@ import com.gemstone.gemfire.internal.shared.StringPrintWriter;
 import com.gemstone.gemfire.internal.tcp.ConnectExceptions;
 import com.gemstone.gemfire.internal.tcp.MemberShunnedException;
 import com.gemstone.gemfire.internal.util.Breadcrumbs;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public class GMSMembershipManager implements MembershipManager, Manager
 {
@@ -352,7 +317,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
    * @see #shunnedMembers
    */
   static private final int SHUNNED_SUNSET = Integer.getInteger(
-      "gemfire.shunned-member-timeout", 300).intValue();
+      DistributionConfig.GEMFIRE_PREFIX + "shunned-member-timeout", 300).intValue();
   
   /**
    * Set to true when the service should stop.
@@ -736,7 +701,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
     
     surpriseMemberTimeout = Math.max(20 * DistributionConfig.DEFAULT_MEMBER_TIMEOUT,
         20 * config.getMemberTimeout());
-    surpriseMemberTimeout = Integer.getInteger("gemfire.surprise-member-timeout", surpriseMemberTimeout).intValue();
+    surpriseMemberTimeout = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "surprise-member-timeout", surpriseMemberTimeout).intValue();
     
   }
   
@@ -1604,7 +1569,7 @@ public class GMSMembershipManager implements MembershipManager, Manager
     // first save the current cache description so reconnect can rebuild the cache
     GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
     if (cache != null && (cache instanceof Cache)) {
-      if (!Boolean.getBoolean("gemfire.autoReconnect-useCacheXMLFile")
+      if (!Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "autoReconnect-useCacheXMLFile")
           && !sharedConfigEnabled) {
         try {
           logger.info("generating XML to rebuild the cache after reconnect completes");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
index 6ce0b08..ceb5af8 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/tcpserver/TcpServer.java
@@ -16,50 +16,24 @@
  */
 package com.gemstone.gemfire.distributed.internal.tcpserver;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.StreamCorruptedException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.URL;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import javax.net.ssl.SSLException;
-
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.CancelException;
 import com.gemstone.gemfire.DataSerializer;
 import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
-import com.gemstone.gemfire.distributed.internal.DistributionStats;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.PoolStatHelper;
-import com.gemstone.gemfire.distributed.internal.PooledExecutorWithDMStats;
-import com.gemstone.gemfire.distributed.internal.SharedConfiguration;
-import com.gemstone.gemfire.internal.DSFIDFactory;
-import com.gemstone.gemfire.internal.GemFireVersion;
-import com.gemstone.gemfire.internal.SocketCreator;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.VersionedDataInputStream;
-import com.gemstone.gemfire.internal.VersionedDataOutputStream;
+import com.gemstone.gemfire.distributed.internal.*;
+import com.gemstone.gemfire.internal.*;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.logging.log4j.Logger;
+
+import javax.net.ssl.SSLException;
+import java.io.*;
+import java.net.*;
+import java.util.*;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * TCP server which listens on a port and delegates requests to a request
@@ -98,15 +72,16 @@ public class TcpServer {
   public static int OLDTESTVERSION = OLDGOSSIPVERSION;
 
   public static final long SHUTDOWN_WAIT_TIME = 60 * 1000;
-  private static int MAX_POOL_SIZE = Integer.getInteger("gemfire.TcpServer.MAX_POOL_SIZE", 100).intValue();
+  private static int MAX_POOL_SIZE = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "TcpServer.MAX_POOL_SIZE", 100).intValue();
   private static int POOL_IDLE_TIMEOUT = 60 * 1000;
   
   private static final Logger log = LogService.getLogger();
-  
-  protected/*GemStoneAddition*/ final/*GemStoneAddition*/ static int READ_TIMEOUT = Integer.getInteger("gemfire.TcpServer.READ_TIMEOUT", 60 * 1000).intValue();
+
+  protected/*GemStoneAddition*/ final/*GemStoneAddition*/ static int READ_TIMEOUT = Integer
+      .getInteger(DistributionConfig.GEMFIRE_PREFIX + "TcpServer.READ_TIMEOUT", 60 * 1000).intValue();
   //This is for backwards compatibility. The p2p.backlog flag used to be the only way to configure the locator backlog.
   private static final int P2P_BACKLOG = Integer.getInteger("p2p.backlog", 1000).intValue();
-  private static final int BACKLOG = Integer.getInteger("gemfire.TcpServer.BACKLOG", P2P_BACKLOG).intValue();
+  private static final int BACKLOG = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "TcpServer.BACKLOG", P2P_BACKLOG).intValue();
 
   // private int port=7500;
   private final int port;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
index 93cb9b2..964f741 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
@@ -17,30 +17,18 @@
 
 package com.gemstone.gemfire.internal;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Array;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.TreeSet;
-
 import com.gemstone.gemfire.InternalGemFireException;
 import com.gemstone.gemfire.UnmodifiableException;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.FlowControlParams;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
+import java.io.*;
+import java.lang.reflect.Array;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+
 /**
  * Provides an implementation of the {@link Config} interface
  * that implements functionality that all {@link Config} implementations

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/Assert.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/Assert.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/Assert.java
index 80c691a..b337bbd 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/Assert.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/Assert.java
@@ -17,8 +17,9 @@
 
 package com.gemstone.gemfire.internal;
 
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 /**
  * Support for correctness assertions.
@@ -58,7 +59,7 @@ public class Assert {
     }
   }
 
-  private static boolean debug = Boolean.getBoolean("gemfire.haltOnAssertFailure");
+  private static boolean debug = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "haltOnAssertFailure");
 
   public static boolean waitForDebuggerOnError() { return debug; }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/AvailablePort.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/AvailablePort.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/AvailablePort.java
index 11eb834..95ca22b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AvailablePort.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AvailablePort.java
@@ -16,12 +16,12 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.*;
-import java.net.*;
-
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.*;
 import java.util.Enumeration;
 import java.util.Random;
 
@@ -47,10 +47,10 @@ public class AvailablePort {
     String name = null;
     try {
       if (protocol == SOCKET) {
-        name = System.getProperty("gemfire.bind-address");
+        name = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "bind-address");
       }
       else if (protocol == MULTICAST) {
-        name = System.getProperty("gemfire.mcast-address");
+        name = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "mcast-address");
       }
       if (name != null) {
         return InetAddress.getByName(name);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/Banner.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/Banner.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/Banner.java
index b6791ca..bee70a4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/Banner.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/Banner.java
@@ -21,7 +21,8 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
 import com.gemstone.gemfire.internal.logging.LogService;
 
-import java.io.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.management.ManagementFactory;
 import java.lang.management.RuntimeMXBean;
 import java.util.*;
@@ -132,7 +133,7 @@ public class Banner {
     prettyPrintPath((String)sp.get("java.library.path"), out);
     sp.remove("java.library.path");
 
-    if (Boolean.getBoolean("gemfire.disableSystemPropertyLogging")) {
+    if (Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "disableSystemPropertyLogging")) {
       out.println("System property logging disabled.");
     } else {
       out.println("System Properties:");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java
index 8d3cf0f..697f8c7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/ClassPathLoader.java
@@ -16,6 +16,11 @@
  */
 package com.gemstone.gemfire.internal;
 
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.util.CollectionUtils;
+import org.apache.logging.log4j.Logger;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,22 +28,9 @@ import java.lang.reflect.Proxy;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.logging.log4j.Logger;
-
-import com.gemstone.gemfire.internal.logging.LogService;
-import com.gemstone.gemfire.internal.util.CollectionUtils;
-
 /**
  * The delegating <tt>ClassLoader</tt> used by GemFire to load classes and other resources. This <tt>ClassLoader</tt>
  * delegates to any <tt>ClassLoader</tt>s added to the list of custom class loaders, thread context <tt>ClassLoader</tt>
@@ -71,14 +63,14 @@ public final class ClassPathLoader {
    * 
    * See also http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-5.html
    */
-  
-  public static final String ENABLE_TRACE_PROPERTY = "gemfire.ClassPathLoader.enableTrace";
+
+  public static final String ENABLE_TRACE_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "ClassPathLoader.enableTrace";
   public static final String ENABLE_TRACE_DEFAULT_VALUE = "false";
   private final boolean ENABLE_TRACE = false;
 
   private static final Logger logger = LogService.getLogger();
-  
-  public static final String EXCLUDE_TCCL_PROPERTY = "gemfire.excludeThreadContextClassLoader";
+
+  public static final String EXCLUDE_TCCL_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "excludeThreadContextClassLoader";
   public static final boolean EXCLUDE_TCCL_DEFAULT_VALUE = false;
   private boolean excludeTCCL;
   
@@ -87,7 +79,7 @@ public final class ClassPathLoader {
   // class is found in a directory instead of a JAR file (as when testing),
   // then it will be relative to the location of the root of the package and
   // class.
-  public static final String EXT_LIB_DIR_PARENT_PROPERTY = "gemfire.ClassPathLoader.EXT_LIB_DIR";
+  public static final String EXT_LIB_DIR_PARENT_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "ClassPathLoader.EXT_LIB_DIR";
   public static final String EXT_LIB_DIR_PARENT_DEFAULT = ClassPathLoader.class.getProtectionDomain().getCodeSource().getLocation().getPath();
   static final File defineEXT_LIB_DIR() {
     return new File((new File(System.getProperty(EXT_LIB_DIR_PARENT_PROPERTY, EXT_LIB_DIR_PARENT_DEFAULT))).getParent(), "ext");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java
index e017a9d..c70b1fa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/Config.java
@@ -16,9 +16,9 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.util.Properties;
 import java.io.File;
 import java.io.IOException;
+import java.util.Properties;
 
 /**
  * Provides generic configuration features.
@@ -31,12 +31,12 @@ public interface Config {
    * a Config instance.
    * @throws IllegalArgumentException if the specified name is illegal
    */
-  public String getAttribute(String attName);
+  String getAttribute(String attName);
   /**
    * Given the attribute's name return its value as an Object.
    * @throws IllegalArgumentException if the specified name is illegal
    */
-  public Object getAttributeObject(String attName);
+  Object getAttributeObject(String attName);
   /**
    * Given the attribute's name set its value.
    * This method is used as a way to get command line arguments that
@@ -45,7 +45,7 @@ public interface Config {
    * @throws IllegalArgumentException if the specified name or value are illegal
    * @throws com.gemstone.gemfire.UnmodifiableException if the attribute can not be modified.
    */
-  public void setAttribute(String attName, String attValue, ConfigSource source);
+  void setAttribute(String attName, String attValue, ConfigSource source);
   /**
    * Given the attribute's name set its value to the specified Object.
    * @throws IllegalArgumentException if the specified name is unknown
@@ -53,58 +53,58 @@ public interface Config {
    *                               with the attributes type
    * @throws com.gemstone.gemfire.UnmodifiableException if the attribute can not be modified.
    */
-  public void setAttributeObject(String attName, Object attValue, ConfigSource source);
+  void setAttributeObject(String attName, Object attValue, ConfigSource source);
   /**
    * Returns true if the named configuration attribute can be modified.
    * @throws IllegalArgumentException if the specified name is illegal
    */
-  public boolean isAttributeModifiable(String attName);
+  boolean isAttributeModifiable(String attName);
   /**
    * Returns the source of the given attribute. This lets you figure out where an attribute's value came from.
    * @param attName the name of the attribute whose source is returned
    * @return null if the attribute has not been configured; otherwise returns the source of the given attribute
    */
-  public ConfigSource getAttributeSource(String attName);
+  ConfigSource getAttributeSource(String attName);
   /**
    * Returns a description of the named configuration attribute.
    * @throws IllegalArgumentException if the specified name is illegal
    */
-  public String getAttributeDescription(String attName);
+  String getAttributeDescription(String attName);
   /**
    * Returns the class that defines the type of this attribute.
    * The attribute's values will be constrained to be instances of
    * this type.
    * @throws IllegalArgumentException if the specified name is illegal
    */
-  public Class getAttributeType(String attName);
+  Class getAttributeType(String attName);
   /**
    * Returns an array containing the names of all the attributes.
    */
-  public String[] getAttributeNames();
+  String[] getAttributeNames();
   /**
    * Gets the attributes names of just this config; does not include inherited
    * attributes.
    */
-  public String[] getSpecificAttributeNames();
+  String[] getSpecificAttributeNames();
   /**
    * Returns whether or not this configuration is the same as another
    * configuration.
    */
-  public boolean sameAs(Config v);
+  boolean sameAs(Config v);
   /**
    * Converts the contents of this config to a property instance.
    * @since GemFire 3.5
    */
-  public Properties toProperties();
+  Properties toProperties();
   /**
    * Writes this config to the specified file.
    * @since GemFire 3.5
    */
-  public void toFile(File f) throws IOException;
+  void toFile(File f) throws IOException;
   /**
    * Returns a formatted string suitable for logging.
    * @since GemFire 7.0
    */
-  public String toLoggerString();
+  String toLoggerString();
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java
index f77b594..2549c7a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/DistributionLocator.java
@@ -16,20 +16,20 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.util.Properties;
-
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.SystemFailure;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.distributed.internal.InternalLocator;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.util.Properties;
 
 /**
  * This class is used to work with a managed VM that hosts a {@link
@@ -40,8 +40,8 @@ import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 public class DistributionLocator  {
   
   private static final Logger logger = LogService.getLogger();
-  
-  public static final String TEST_OVERRIDE_DEFAULT_PORT_PROPERTY = "gemfire.test.DistributionLocator.OVERRIDE_DEFAULT_PORT";
+
+  public static final String TEST_OVERRIDE_DEFAULT_PORT_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "test.DistributionLocator.OVERRIDE_DEFAULT_PORT";
 
   /** Default file name for locator log: <code>"locator.log"</code> */
   public static final String DEFAULT_LOG_FILE = "locator.log";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/FileUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/FileUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/FileUtil.java
index 2024959..276f6aa 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/FileUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/FileUtil.java
@@ -16,13 +16,9 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+
+import java.io.*;
 import java.net.URL;
 import java.nio.channels.FileChannel;
 import java.nio.file.Files;
@@ -39,8 +35,8 @@ import java.util.List;
  * 
  */
 public class FileUtil {
-  public static final long MAX_TRANSFER_SIZE = Long.getLong("gemfire.FileUtil.MAX_TRANSFER_SIZE", 1024 * 1024).longValue();
-  public static final boolean USE_NIO = !Boolean.getBoolean("gemfire.FileUtil.USE_OLD_IO");
+  public static final long MAX_TRANSFER_SIZE = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "FileUtil.MAX_TRANSFER_SIZE", 1024 * 1024).longValue();
+  public static final boolean USE_NIO = !Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "FileUtil.USE_OLD_IO");
   public static final String extSeparator = ".";
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
index 11233b5..4bf39b6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/HeapDataOutputStream.java
@@ -16,24 +16,20 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.DataOutput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UTFDataFormatException;
-import java.nio.BufferOverflowException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SocketChannel;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.BytesAndBitsForCompactor;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.tcp.ByteBufferInputStream.ByteSource;
+import org.apache.logging.log4j.Logger;
+
+import java.io.*;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+import java.nio.channels.SocketChannel;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 /** HeapDataOutputStream is an OutputStream that also implements DataOutput
  * and stores all data written to it in heap memory.
@@ -1108,7 +1104,7 @@ public class HeapDataOutputStream extends OutputStream implements
    * Use -Dgemfire.ASCII_STRINGS=true if all String instances contain
    * ASCII characters. Setting this to true gives a performance improvement.
    */
-  private static final boolean ASCII_STRINGS = Boolean.getBoolean("gemfire.ASCII_STRINGS");
+  private static final boolean ASCII_STRINGS = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "ASCII_STRINGS");
   
   /**
      * Writes two bytes of length information

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
index 452e6dd..ebb4177 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/HostStatSampler.java
@@ -16,16 +16,11 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.File;
-import java.net.UnknownHostException;
-import java.util.List;
-
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.CancelCriterion;
 import com.gemstone.gemfire.CancelException;
 import com.gemstone.gemfire.Statistics;
 import com.gemstone.gemfire.SystemFailure;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
@@ -35,6 +30,11 @@ import com.gemstone.gemfire.internal.statistics.SampleCollector;
 import com.gemstone.gemfire.internal.statistics.StatArchiveHandlerConfig;
 import com.gemstone.gemfire.internal.statistics.StatisticsSampler;
 import com.gemstone.gemfire.internal.util.concurrent.StoppableCountDownLatch;
+import org.apache.logging.log4j.Logger;
+
+import java.io.File;
+import java.net.UnknownHostException;
+import java.util.List;
 
 /**
  * HostStatSampler implements a thread which will monitor, sample, and archive
@@ -45,11 +45,11 @@ public abstract class HostStatSampler
     implements Runnable, StatisticsSampler, StatArchiveHandlerConfig {
 
   private static final Logger logger = LogService.getLogger();
-  
-  public static final String TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY = "gemfire.stats.test.fileSizeLimitInKB";
+
+  public static final String TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "stats.test.fileSizeLimitInKB";
   public static final String OS_STATS_DISABLED_PROPERTY = "osStatsDisabled";
 
-  protected static final String INITIALIZATION_TIMEOUT_PROPERTY = "gemfire.statSamplerInitializationTimeout";
+  protected static final String INITIALIZATION_TIMEOUT_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "statSamplerInitializationTimeout";
   protected static final int INITIALIZATION_TIMEOUT_DEFAULT = 3000;
   protected static final long INITIALIZATION_TIMEOUT_MILLIS = 
       Long.getLong(INITIALIZATION_TIMEOUT_PROPERTY, INITIALIZATION_TIMEOUT_DEFAULT);
@@ -58,7 +58,7 @@ public abstract class HostStatSampler
    * Used to check if the sampler thread wake-up is delayed, and log a warning if it is delayed by longer than 
    * the amount of milliseconds specified by this property. The value of 0 disables the check. 
    */
-  private static final long STAT_SAMPLER_DELAY_THRESHOLD = Long.getLong("gemfire.statSamplerDelayThreshold", 3000);
+  private static final long STAT_SAMPLER_DELAY_THRESHOLD = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "statSamplerDelayThreshold", 3000);
   private static final long STAT_SAMPLER_DELAY_THRESHOLD_NANOS = NanoTimer.millisToNanos(STAT_SAMPLER_DELAY_THRESHOLD);
   
   private static final int MIN_MS_SLEEP = 1;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
index 67629e9..0df656a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
@@ -16,87 +16,17 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.NotSerializableException;
-import java.io.ObjectInput;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.io.ObjectStreamClass;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.io.UTFDataFormatException;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.Proxy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.InetAddress;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.IdentityHashMap;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.UUID;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.logging.log4j.Logger;
-
-import com.gemstone.gemfire.CancelException;
-import com.gemstone.gemfire.CanonicalInstantiator;
-import com.gemstone.gemfire.DataSerializable;
-import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.GemFireIOException;
-import com.gemstone.gemfire.GemFireRethrowable;
-import com.gemstone.gemfire.Instantiator;
-import com.gemstone.gemfire.InternalGemFireError;
-import com.gemstone.gemfire.SerializationException;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.ToDataException;
+import com.gemstone.gemfire.*;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.execute.Function;
-import com.gemstone.gemfire.distributed.internal.DMStats;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.LonerDistributionManager;
-import com.gemstone.gemfire.distributed.internal.PooledDistributionMessage;
-import com.gemstone.gemfire.distributed.internal.SerialDistributionMessage;
+import com.gemstone.gemfire.distributed.internal.*;
 import com.gemstone.gemfire.i18n.StringId;
 import com.gemstone.gemfire.internal.cache.EnumListenerEvent;
 import com.gemstone.gemfire.internal.cache.EventID;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
-import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerHelper;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientDataSerializerMessage;
-import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
+import com.gemstone.gemfire.internal.cache.tier.sockets.*;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
@@ -106,17 +36,25 @@ import com.gemstone.gemfire.pdx.NonPortableClassException;
 import com.gemstone.gemfire.pdx.PdxInstance;
 import com.gemstone.gemfire.pdx.PdxSerializable;
 import com.gemstone.gemfire.pdx.PdxSerializer;
-import com.gemstone.gemfire.pdx.internal.AutoSerializableManager;
+import com.gemstone.gemfire.pdx.internal.*;
 import com.gemstone.gemfire.pdx.internal.AutoSerializableManager.AutoClassInfo;
-import com.gemstone.gemfire.pdx.internal.EnumInfo;
-import com.gemstone.gemfire.pdx.internal.PdxInputStream;
-import com.gemstone.gemfire.pdx.internal.PdxInstanceEnum;
-import com.gemstone.gemfire.pdx.internal.PdxInstanceImpl;
-import com.gemstone.gemfire.pdx.internal.PdxOutputStream;
-import com.gemstone.gemfire.pdx.internal.PdxReaderImpl;
-import com.gemstone.gemfire.pdx.internal.PdxType;
-import com.gemstone.gemfire.pdx.internal.PdxWriterImpl;
-import com.gemstone.gemfire.pdx.internal.TypeRegistry;
+import org.apache.logging.log4j.Logger;
+
+import java.io.*;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.Proxy;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.InetAddress;
+import java.sql.Timestamp;
+import java.util.*;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Contains static methods for data serializing instances of internal
@@ -140,9 +78,8 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
   public static ConcurrentHashMap<String, DataSerializer> getClassesToSerializers() {
     return classesToSerializers;
   }
-  
-  
-  private static final String serializationVersionTxt = System.getProperty("gemfire.serializationVersion");
+
+  private static final String serializationVersionTxt = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "serializationVersion");
   /**
    * Any time new serialization format is added then a new enum needs to be added here.
    * @since GemFire 6.6.2
@@ -3346,7 +3283,7 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
      * Note that some tests set this to a small amount to speed up failures.
      * Made public for unit test access.
      */
-    public static int WAIT_MS = Integer.getInteger("gemfire.InternalDataSerializer.WAIT_MS", 60 * 1000);
+    public static int WAIT_MS = Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "InternalDataSerializer.WAIT_MS", 60 * 1000);
 
     /**
      * Returns the serializer associated with this marker.  If the
@@ -4011,8 +3948,8 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
     }
     return out.size();
   }
-  
-  public static final boolean LOAD_CLASS_EACH_TIME = Boolean.getBoolean("gemfire.loadClassOnEveryDeserialization");
+
+  public static final boolean LOAD_CLASS_EACH_TIME = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "loadClassOnEveryDeserialization");
   private static final CopyOnWriteHashMap<String, WeakReference<Class<?>>> classCache = LOAD_CLASS_EACH_TIME ? null : new CopyOnWriteHashMap<String, WeakReference<Class<?>>>();
   private static final Object cacheAccessLock = new Object();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcFsStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcFsStatistics.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcFsStatistics.java
index c155b3b..3070287 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcFsStatistics.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/LinuxProcFsStatistics.java
@@ -16,19 +16,16 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import org.apache.logging.log4j.Logger;
+
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.apache.logging.log4j.Logger;
-
 public class LinuxProcFsStatistics {
   private enum CPU { 
     USER, NICE, SYSTEM, IDLE, IOWAIT, IRQ, SOFTIRQ,
@@ -36,9 +33,9 @@ public class LinuxProcFsStatistics {
     OTHER
   }  
   
-  private static final int DEFAULT_PAGESIZE = 4 * 1024; 
-  private static final int OneMeg = 1024 * 1024; 
-  private static final String pageSizeProperty = "gemfire.statistics.linux.pageSize"; 
+  private static final int DEFAULT_PAGESIZE = 4 * 1024;
+  private static final int OneMeg = 1024 * 1024;
+  private static final String pageSizeProperty = DistributionConfig.GEMFIRE_PREFIX + "statistics.linux.pageSize";
   private static CpuStat cpuStatSingleton;
   private static int pageSize;
   private static int sys_cpus;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
index d15dda4..0e80a28 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationClient.java
@@ -24,18 +24,16 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.io.ObjectInputStream;
+import java.io.*;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+
 /**
  * MigrationClient is used to retrieve all of the data for a region from
  * a MigrationServer.  First start a MigrationServer using one version of
@@ -156,9 +154,9 @@ public class MigrationClient {
   private void createDistributedSystem() throws Exception {
     Properties dsProps = new Properties();
     // if no discovery information has been explicitly given, use a loner ds 
-    if (System.getProperty("gemfire." + DistributionConfig.MCAST_PORT_NAME) == null
-        && System.getProperty("gemfire." + DistributionConfig.LOCATORS_NAME) == null) {
-      dsProps.put(DistributionConfig.MCAST_PORT_NAME, "0");
+    if (System.getProperty(DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT) == null
+        && System.getProperty(DistributionConfig.GEMFIRE_PREFIX + LOCATORS) == null) {
+      dsProps.put(MCAST_PORT, "0");
     }
     dsProps.put(DistributionConfig.LOG_FILE_NAME, "migrationClient.log");
     if (this.cacheXmlFile != null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
index bbcc148..6c9fa73 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/MigrationServer.java
@@ -26,23 +26,15 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.NetworkInterface;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
+import java.io.*;
+import java.net.*;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.Properties;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+
 /**
  * MigrationServer creates a cache using a supplied cache.xml and then
  * opens a server socket that a MigrationClient connects to and requests
@@ -212,9 +204,9 @@ public class MigrationServer {
   private void createDistributedSystem() throws Exception {
     Properties dsProps = new Properties();
     // if no discovery information has been explicitly given, use a loner ds 
-    if (System.getProperty("gemfire." + DistributionConfig.MCAST_PORT_NAME) == null
-        && System.getProperty("gemfire." + DistributionConfig.LOCATORS_NAME) == null) {
-      dsProps.put(DistributionConfig.MCAST_PORT_NAME, "0");
+    if (System.getProperty(DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT) == null
+        && System.getProperty(DistributionConfig.GEMFIRE_PREFIX + LOCATORS) == null) {
+      dsProps.put(MCAST_PORT, "0");
     }
     dsProps.put(DistributionConfig.LOG_FILE_NAME, "migrationServer.log");
     if (this.cacheXmlFile != null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java
index 18d65d5..66dd612 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/OSProcess.java
@@ -16,35 +16,18 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.lang.management.LockInfo;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MonitorInfo;
-import java.lang.management.ThreadInfo;
-import java.lang.management.ThreadMXBean;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.SystemFailure;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.io.TeePrintStream;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
+import org.apache.logging.log4j.Logger;
+
+import java.io.*;
+import java.lang.management.*;
+import java.util.*;
+import java.util.zip.GZIPOutputStream;
 
 /**
  * Used to interact with operating system processes.
@@ -55,9 +38,9 @@ import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
  */
 public class OSProcess {
   private static final Logger logger = LogService.getLogger();
-  
-  public static final String DISABLE_OUTPUT_REDIRECTION_PROPERTY = "gemfire.OSProcess.DISABLE_OUTPUT_REDIRECTION";
-  public static final String ENABLE_OUTPUT_REDIRECTION_PROPERTY = "gemfire.OSProcess.ENABLE_OUTPUT_REDIRECTION";
+
+  public static final String DISABLE_OUTPUT_REDIRECTION_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "OSProcess.DISABLE_OUTPUT_REDIRECTION";
+  public static final String ENABLE_OUTPUT_REDIRECTION_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "OSProcess.ENABLE_OUTPUT_REDIRECTION";
   
   private static final boolean DISABLE_OUTPUT_REDIRECTION = Boolean.getBoolean(DISABLE_OUTPUT_REDIRECTION_PROPERTY);
   private static final boolean ENABLE_OUTPUT_REDIRECTION = Boolean.getBoolean(ENABLE_OUTPUT_REDIRECTION_PROPERTY);
@@ -134,7 +117,7 @@ public class OSProcess {
                       Map<String, String> env)
 	throws IOException
     {
-		String commandShell = System.getProperty("gemfire.commandShell", "bash");
+      String commandShell = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "commandShell", "bash");
         if (cmdarray.length == 0) {
             throw new java.lang.IndexOutOfBoundsException();
         }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java
index 769a959..bba2809 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/PureJavaMode.java
@@ -17,6 +17,8 @@
    
 package com.gemstone.gemfire.internal;
 
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+
 /**
  * Used to determine if product should use pure java mode.
  */
@@ -24,12 +26,12 @@ public final class PureJavaMode {
   /**
    * System property to set to true to force pure java mode
    */
-  public final static String PURE_MODE_PROPERTY = "gemfire.pureJavaMode";
+  public final static String PURE_MODE_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "pureJavaMode";
   /**
    * System property to set to true enable debug information regarding native library loading.
    * @since GemFire 5.1
    */
-  public final static String LOADLIBRARY_DEBUG_PROPERTY = "gemfire.loadLibrary.debug";
+  public final static String LOADLIBRARY_DEBUG_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "loadLibrary.debug";
 
   private static final boolean debug = Boolean.getBoolean(LOADLIBRARY_DEBUG_PROPERTY);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java
index 0edb02d..76d98c7 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SharedLibrary.java
@@ -17,6 +17,7 @@
 package com.gemstone.gemfire.internal;
 
 import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.lang.SystemUtils;
 import com.gemstone.gemfire.pdx.internal.unsafe.UnsafeWrapper;
 
@@ -151,7 +152,7 @@ public class SharedLibrary {
       if (is64Bit()) {
         result.append("64");
       }
-      if (Boolean.getBoolean("gemfire.debug")) {
+      if (Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "debug")) {
         result.append("_g");
       }
       return result.toString();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
index 9b7e5d7..367d4a7 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SocketCreator.java
@@ -16,57 +16,6 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.BindException;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.NetworkInterface;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.nio.channels.ServerSocketChannel;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.net.ServerSocketFactory;
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLPeerUnverifiedException;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-
 import com.gemstone.gemfire.GemFireConfigException;
 import com.gemstone.gemfire.SystemConnectException;
 import com.gemstone.gemfire.SystemFailure;
@@ -84,12 +33,27 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 import com.gemstone.gemfire.internal.util.PasswordUtil;
+import org.apache.logging.log4j.Logger;
 
-import java.util.*;
-
+import javax.naming.Context;
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import javax.net.ServerSocketFactory;
+import javax.net.SocketFactory;
 import javax.net.ssl.*;
-
-import org.apache.logging.log4j.Logger;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.*;
+import java.nio.channels.ServerSocketChannel;
+import java.security.*;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.*;
 
 /**
  * Analyze configuration data (gemfire.properties) and configure sockets
@@ -117,8 +81,8 @@ public class SocketCreator {
   private static final Logger logger = LogService.getLogger();
   
   /** Optional system property to enable GemFire usage of link-local addresses */
-  public static final String USE_LINK_LOCAL_ADDRESSES_PROPERTY = 
-      "gemfire.net.useLinkLocalAddresses";
+  public static final String USE_LINK_LOCAL_ADDRESSES_PROPERTY =
+      DistributionConfig.GEMFIRE_PREFIX + "net.useLinkLocalAddresses";
   
   /** True if GemFire should use link-local addresses */
   private static final boolean useLinkLocalAddresses = 
@@ -134,7 +98,7 @@ public class SocketCreator {
   private static final Map<InetAddress, String> hostNames = new HashMap<>();
   
   /** flag to force always using DNS (regardless of the fact that these lookups can hang) */
-  public static final boolean FORCE_DNS_USE = Boolean.getBoolean("gemfire.forceDnsUse");
+  public static final boolean FORCE_DNS_USE = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "forceDnsUse");
   
   /** set this to false to inhibit host name lookup */
   public static volatile boolean resolve_dns = true;
@@ -241,9 +205,9 @@ public class SocketCreator {
     // bug #49484 - customers want tcp/ip keep-alive turned on by default
     // to avoid dropped connections.  It can be turned off by setting this
     // property to false
-    String str = System.getProperty("gemfire.setTcpKeepAlive");
+    String str = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "setTcpKeepAlive");
     if (str != null) {
-      ENABLE_TCP_KEEP_ALIVE = Boolean.getBoolean("gemfire.setTcpKeepAlive");
+      ENABLE_TCP_KEEP_ALIVE = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "setTcpKeepAlive");
     } else {
       ENABLE_TCP_KEEP_ALIVE = true;
     }
@@ -264,8 +228,8 @@ public class SocketCreator {
    * Returns the default instance for use in GemFire socket creation. 
    * <p>
    * If not already initialized, the default instance of SocketCreator will be 
-   * initialized using defaults in {@link 
-   * com.gemstone.gemfire.distributed.internal.DistributionConfig}. If any 
+   * initialized using defaults in {@link
+   * DistributionConfig}. If any
    * values are specified in System properties, those values will be used to 
    * override the defaults.
    * <p>
@@ -297,8 +261,8 @@ public class SocketCreator {
   
   /**
    * Returns the default instance for use in GemFire socket creation after
-   * initializing it using defaults in {@link 
-   * com.gemstone.gemfire.distributed.internal.DistributionConfig}. If any 
+   * initializing it using defaults in {@link
+   * DistributionConfig}. If any
    * values are specified in the provided properties or in System properties,
    * those values will be used to override the defaults.
    * <p>
@@ -720,8 +684,8 @@ public class SocketCreator {
   }
   
   /**
-   * Perform initialization using defaults in {@link 
-   * com.gemstone.gemfire.distributed.internal.DistributionConfig}.  If any
+   * Perform initialization using defaults in {@link
+   * DistributionConfig}.  If any
    * values are specified in System properties, those values will be used to 
    * override the defaults.
    * <p>
@@ -1168,7 +1132,7 @@ public class SocketCreator {
   
   protected void initializeClientSocketFactory() {
     this.clientSocketFactory = null;
-    String className = System.getProperty("gemfire.clientSocketFactory");
+    String className = System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "clientSocketFactory");
     if (className != null) {
       Object o;
       try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java
index ffbed3e..fcf645d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/StatArchiveWriter.java
@@ -16,29 +16,10 @@
  */
 package com.gemstone.gemfire.internal;
 
-import java.io.BufferedOutputStream;
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.TimeZone;
-import java.util.zip.GZIPOutputStream;
-
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.GemFireIOException;
 import com.gemstone.gemfire.InternalGemFireException;
 import com.gemstone.gemfire.StatisticDescriptor;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
@@ -46,6 +27,12 @@ import com.gemstone.gemfire.internal.statistics.ResourceInstance;
 import com.gemstone.gemfire.internal.statistics.ResourceType;
 import com.gemstone.gemfire.internal.statistics.SampleHandler;
 import com.gemstone.gemfire.internal.statistics.StatArchiveDescriptor;
+import org.apache.logging.log4j.Logger;
+
+import java.io.*;
+import java.net.UnknownHostException;
+import java.util.*;
+import java.util.zip.GZIPOutputStream;
 
 /**
  * StatArchiveWriter provides APIs to write statistic snapshots to an archive
@@ -59,8 +46,8 @@ public class StatArchiveWriter implements StatArchiveFormat, SampleHandler {
   private static volatile String traceStatisticsName = null;
   private static volatile String traceStatisticsTypeName = null;
   private static volatile int traceResourceInstId = -1;
-  
-  private final boolean trace = Boolean.getBoolean("gemfire.stats.debug.traceStatArchiveWriter");
+
+  private final boolean trace = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "stats.debug.traceStatArchiveWriter");
   
   private final Set<ResourceInstance> sampleWrittenForResources = 
       new HashSet<ResourceInstance>();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
index 9f4a703..d3220b8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/SystemAdmin.java
@@ -16,23 +16,13 @@
  */
 package com.gemstone.gemfire.internal;
 
-import com.gemstone.gemfire.GemFireException;
-import com.gemstone.gemfire.GemFireIOException;
-import com.gemstone.gemfire.InternalGemFireException;
-import com.gemstone.gemfire.NoSystemException;
-import com.gemstone.gemfire.SystemFailure;
-import com.gemstone.gemfire.UncreatedSystemException;
-import com.gemstone.gemfire.UnstartedSystemException;
+import com.gemstone.gemfire.*;
 import com.gemstone.gemfire.admin.AdminException;
 import com.gemstone.gemfire.admin.BackupStatus;
 import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
 import com.gemstone.gemfire.cache.persistence.PersistentID;
 import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
-import com.gemstone.gemfire.distributed.internal.HighPriorityAckedMessage;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
-import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.distributed.internal.*;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.StatArchiveReader.ResourceInst;
 import com.gemstone.gemfire.internal.StatArchiveReader.StatValue;
@@ -40,54 +30,23 @@ import com.gemstone.gemfire.internal.admin.remote.TailLogResponse;
 import com.gemstone.gemfire.internal.cache.DiskStoreImpl;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.DateFormatter;
-import com.gemstone.gemfire.internal.logging.InternalLogWriter;
-import com.gemstone.gemfire.internal.logging.LocalLogWriter;
 import com.gemstone.gemfire.internal.logging.MergeLogFiles;
 import com.gemstone.gemfire.internal.util.JavaCommandBuilder;
 import com.gemstone.gemfire.internal.util.PasswordUtil;
 import com.gemstone.gemfire.internal.util.PluckStacks;
 import com.gemstone.gemfire.internal.util.PluckStacks.ThreadStack;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.RandomAccessFile;
-import java.io.StringWriter;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.net.UnknownHostException;
+import java.io.*;
+import java.net.*;
 import java.text.DateFormat;
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
+
 /**
  * Provides static methods for various system administation tasks.
  */
@@ -1396,7 +1355,7 @@ public class SystemAdmin {
   private final static String[] validCommands = new String [] {
     "version",
     "stats",
-    "start-locator", "stop-locator", "status-locator", "info-locator",
+      START_LOCATOR, "stop-locator", "status-locator", "info-locator",
     "tail-locator-log",
  "merge-logs", "encrypt-password",
     "revoke-missing-disk-store",
@@ -1472,7 +1431,7 @@ public class SystemAdmin {
         usage();
       } else {
         if (cmd.equalsIgnoreCase("locator-start")) {
-          cmd = "start-locator";
+          cmd = START_LOCATOR;
         } else if (cmd.equalsIgnoreCase("locator-stop")) {
           cmd = "stop-locator";
         } else if (cmd.equalsIgnoreCase("locator-info")) {
@@ -1547,7 +1506,7 @@ public class SystemAdmin {
       }));
     helpMap.put("encrypt-password",
       LocalizedStrings.SystemAdmin_ENCRYPTS_A_PASSWORD_FOR_USE_IN_CACHE_XML_DATA_SOURCE_CONFIGURATION.toLocalizedString());
-    helpMap.put("start-locator", 
+    helpMap.put(START_LOCATOR,
       LocalizedStrings.SystemAdmin_START_LOCATOR_HELP
         .toLocalizedString(new Object[] { "-port=",  Integer.valueOf(DistributionLocator.DEFAULT_LOCATOR_PORT), "-address=", "-dir=", "-properties=", "-peer=", "-server=", "-hostname-for-clients=", "-D", "-X" })); 
     helpMap.put("stop-locator",  
@@ -1578,7 +1537,7 @@ public class SystemAdmin {
                 "This command uses the compaction threshold that each member has " +
                 "configured for its disk stores. The disk store must have allow-force-compaction " +
                 "set to true in order for this command to work.\n" +
-                "This command will use the \"gemfire.properties\" file to determine what distributed system to connect to.");
+                    "This command will use the gemfire.properties file to determine what distributed system to connect to.");
     helpMap.put("modify-disk-store",
                 LocalizedStrings.SystemAdmin_MODIFY_DISK_STORE.toLocalizedString()); 
     helpMap.put("revoke-missing-disk-store",
@@ -1589,24 +1548,24 @@ public class SystemAdmin {
                 "missing disk stores.\n" +
                 "You must pass the in the unique id for the disk store to revoke. The unique id is listed in the output " +
                 "of the list-missing-disk-stores command, for example a63d7d99-f8f8-4907-9eb7-cca965083dbb.\n" +
-                "This command will use the \"gemfire.properties\" file to determine what distributed system to connect to."); 
+                    "This command will use the gemfire.properties file to determine what distributed system to connect to.");
     helpMap.put("list-missing-disk-stores",
                 "Prints out a description of the disk stores that are currently missing from a distributed system\n\\n."
-                + "This command will use the \"gemfire.properties\" file to determine what distributed system to connect to."); 
+                    + "This command will use the gemfire.properties file to determine what distributed system to connect to.");
     helpMap.put("export-disk-store", 
                 "Exports an offline disk store.  The persistent data is written to a binary format.\n"
                 + "  -outputDir=<directory> specifies the location of the exported snapshot files.");
     helpMap.put("shut-down-all",
                 "Connects to a running system and asks all its members that have a cache to close the cache and disconnect from system." +
                 "The timeout parameter allows you to specify that the system should be shutdown forcibly after the time has exceeded.\n" +
-                "This command will use the \"gemfire.properties\" file to determine what distributed system to connect to."); 
+                    "This command will use the gemfire.properties file to determine what distributed system to connect to.");
     helpMap.put("backup",
                 "Connects to a running system and asks all its members that have persistent data " +
                 "to backup their data to the specified directory. The directory specified must exist " +
                 "on all members, but it can be a local directory on each machine. This command " +
                 "takes care to ensure that the backup files will not be corrupted by concurrent " +
                 "operations. Backing up a running system with filesystem copy is not recommended.\n" +
-                "This command will use the \"gemfire.properties\" file to determine what distributed system to connect to.");
+                    "This command will use the gemfire.properties file to determine what distributed system to connect to.");
     helpMap.put("print-stacks",
                 "fetches stack dumps of all processes.  By default an attempt" +
                 " is made to remove idle GemFire threads from the dump.  " +
@@ -1644,7 +1603,7 @@ public class SystemAdmin {
         .toLocalizedString());
     helpMap.put("-properties=", 
       LocalizedStrings.SystemAdmin_USED_TO_SPECIFY_THE_0_FILE_TO_BE_USED_IN_CONFIGURING_THE_LOCATORS_DISTRIBUTEDSYSTEM
-        .toLocalizedString("gemfire.properties")); 
+          .toLocalizedString(DistributionConfig.GEMFIRE_PREFIX + "properties"));
     helpMap.put("-archive=", 
       LocalizedStrings.SystemAdmin_THE_ARGUMENT_IS_THE_STATISTIC_ARCHIVE_FILE_THE_0_COMMAND_SHOULD_READ
         .toLocalizedString("stats")); 
@@ -1663,8 +1622,8 @@ public class SystemAdmin {
         .toLocalizedString(new Object[] {"stats", DateFormatter.FORMAT_STRING})); 
     helpMap.put("-dir=", 
       LocalizedStrings.SystemAdmin_DIR_ARGUMENT_HELP
-            .toLocalizedString(new Object[] { "gemfire.properties",
-                "gemfire.systemDirectory", "GEMFIRE", "defaultSystem",
+          .toLocalizedString(new Object[] { DistributionConfig.GEMFIRE_PREFIX + "properties",
+              DistributionConfig.GEMFIRE_PREFIX + "systemDirectory", "GEMFIRE", "defaultSystem",
                 "version" }));
     helpMap.put("-D", 
       LocalizedStrings.SystemAdmin_SETS_A_JAVA_SYSTEM_PROPERTY_IN_THE_LOCATOR_VM_USED_MOST_OFTEN_FOR_CONFIGURING_SSL_COMMUNICATION
@@ -1709,7 +1668,8 @@ public class SystemAdmin {
     usageMap.put("version", "version");
     usageMap.put("help", "help [" + join(helpTopics, "|") + "]");
     usageMap.put("stats", "stats ([<instanceId>][:<typeId>][.<statId>])* [-details] [-nofilter|-persec|-persample] [-prunezeros] [-starttime=<time>] [-endtime=<time>] -archive=<statFile>");
-    usageMap.put("start-locator", "start-locator [-port=<port>] [-address=<ipAddr>] [-dir=<locatorDir>] [-properties=<gemfire.properties>] [-peer=<true|false>] [-server=<true|false>] [-hostname-for-clients=<ipAddr>] [-D<system.property>=<value>] [-X<vm-setting>]");
+    usageMap.put(START_LOCATOR,
+        "start-locator [-port=<port>] [-address=<ipAddr>] [-dir=<locatorDir>] [-properties=<gemfire.properties>] [-peer=<true|false>] [-server=<true|false>] [-hostname-for-clients=<ipAddr>] [-D<system.property>=<value>] [-X<vm-setting>]");
     usageMap.put("stop-locator", "stop-locator [-port=<port>] [-address=<ipAddr>] [-dir=<locatorDir>]");
     usageMap.put("status-locator", "status-locator [-dir=<locatorDir>]");
     usageMap.put("info-locator", "info-locator [-dir=<locatorDir>]");
@@ -1774,7 +1734,8 @@ public class SystemAdmin {
     cmdOptionsMap.put("help", new String[] {});
     cmdOptionsMap.put("merge-logs", new String[] {"-out="});
     cmdOptionsMap.put("stats", new String[] {"-details", "-monitor", "-nofilter", "-persec", "-persample", "-prunezeros", "-archive=", "-starttime=", "-endtime="});
-    cmdOptionsMap.put("start-locator",  new String[] {"-port=", "-dir=", "-address=", "-properties=", "-D", "-X", "-peer=", "-server=", "-hostname-for-clients="});
+    cmdOptionsMap
+        .put(START_LOCATOR, new String[] { "-port=", "-dir=", "-address=", "-properties=", "-D", "-X", "-peer=", "-server=", "-hostname-for-clients=" });
     cmdOptionsMap.put("stop-locator",  new String[] {"-port=", "-dir=", "-address=", "-D"});
     cmdOptionsMap.put("status-locator",  new String[] {"-dir=", "-D"});
     cmdOptionsMap.put("info-locator",  new String[] {"-dir=", "-D"});
@@ -2134,7 +2095,7 @@ public class SystemAdmin {
           usage(cmd);
         }
         help(cmdLine);
-      } else if (cmd.equalsIgnoreCase("start-locator")) {
+      } else if (cmd.equalsIgnoreCase(START_LOCATOR)) {
         if (cmdLine.size() != 0) {
           System.err.println( LocalizedStrings.SystemAdmin_ERROR_UNEXPECTED_COMMAND_LINE_ARGUMENTS_0.toLocalizedString(join(cmdLine)));
           usage(cmd);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
index cf8f7a1..87fa715 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
@@ -17,12 +17,6 @@
    
 package com.gemstone.gemfire.internal.admin.remote;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-
 import com.gemstone.gemfire.InternalGemFireException;
 import com.gemstone.gemfire.distributed.Locator;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
@@ -30,6 +24,12 @@ import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.internal.admin.SSLConfig;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+
 /**
  * Identifies the host, port, and bindAddress a distribution locator is 
  * listening on.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java
index 69f002c..949e5ad 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/FetchHostResponse.java
@@ -18,26 +18,26 @@
    
 package com.gemstone.gemfire.internal.admin.remote;
 
-import java.io.DataInput;
-import java.io.DataOutput;
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.URL;
-import java.net.UnknownHostException;
-
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.DataSerializer;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.DistributionManager;
-//import java.util.*;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.GemFireVersion;
 import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.internal.cache.CacheServerLauncher;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
+import org.apache.logging.log4j.Logger;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.URL;
+import java.net.UnknownHostException;
+
+//import java.util.*;
 
 /**
  * A message that is sent to a particular distribution manager to

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteCacheInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteCacheInfo.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteCacheInfo.java
index 1f57127..8c7157a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteCacheInfo.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteCacheInfo.java
@@ -18,16 +18,22 @@ package com.gemstone.gemfire.internal.admin.remote;
 
 import com.gemstone.gemfire.DataSerializable;
 import com.gemstone.gemfire.DataSerializer;
-import com.gemstone.gemfire.internal.admin.*;
-//import com.gemstone.gemfire.internal.*;
-import com.gemstone.gemfire.cache.*;
+import com.gemstone.gemfire.cache.CacheRuntimeException;
+import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.internal.cache.*;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.admin.CacheInfo;
+import com.gemstone.gemfire.internal.admin.StatResource;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
 import java.util.*;
 
+//import com.gemstone.gemfire.internal.*;
+
 /**
  * This class is an implementation of the {@link CacheInfo} interface.
  */
@@ -66,7 +72,7 @@ public class RemoteCacheInfo implements CacheInfo, DataSerializable {
     } else {
       try {
         final Set roots;
-        if (!Boolean.getBoolean("gemfire.PRDebug"))  {
+        if (!Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "PRDebug")) {
           roots = c.rootRegions();
         } else {
           roots = c.rootRegions(true);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java
index 29dc6c2..9394bb2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteGfManagerAgent.java
@@ -16,51 +16,18 @@
  */
 package com.gemstone.gemfire.internal.admin.remote;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.apache.logging.log4j.Logger;
-
 import com.gemstone.gemfire.CancelException;
 import com.gemstone.gemfire.IncompatibleSystemException;
 import com.gemstone.gemfire.SystemFailure;
 import com.gemstone.gemfire.admin.OperationCancelledException;
 import com.gemstone.gemfire.admin.RuntimeAdminException;
 import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
-import com.gemstone.gemfire.distributed.internal.DM;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.*;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.DisconnectListener;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem.ReconnectListener;
-import com.gemstone.gemfire.distributed.internal.MembershipListener;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.internal.Assert;
-import com.gemstone.gemfire.internal.admin.Alert;
-import com.gemstone.gemfire.internal.admin.AlertListener;
-import com.gemstone.gemfire.internal.admin.ApplicationVM;
-import com.gemstone.gemfire.internal.admin.CacheCollector;
-import com.gemstone.gemfire.internal.admin.CacheSnapshot;
-import com.gemstone.gemfire.internal.admin.GemFireVM;
-import com.gemstone.gemfire.internal.admin.GfManagerAgent;
-import com.gemstone.gemfire.internal.admin.GfManagerAgentConfig;
-import com.gemstone.gemfire.internal.admin.JoinLeaveListener;
+import com.gemstone.gemfire.internal.admin.*;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
 import com.gemstone.gemfire.internal.logging.LogService;
@@ -69,6 +36,10 @@ import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
 import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
 import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
 import com.gemstone.gemfire.security.AuthenticationFailedException;
+import org.apache.logging.log4j.Logger;
+
+import java.util.*;
+import java.util.concurrent.*;
 
 /**
  * An implementation of <code>GfManagerAgent</code> that uses a {@link

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
index 0a4e057..3e4ddf1 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/RemoteTransportConfig.java
@@ -16,19 +16,16 @@
  */
 package com.gemstone.gemfire.internal.admin.remote;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.Assert;
 import com.gemstone.gemfire.internal.admin.SSLConfig;
 import com.gemstone.gemfire.internal.admin.TransportConfig;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
+import java.util.*;
+
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
 /**
  * Tranport config for RemoteGfManagerAgent.
  * 
@@ -263,25 +260,25 @@ public class RemoteTransportConfig implements TransportConfig {
    */
   Properties toDSProperties() {
     Properties props = new Properties();
-    props.setProperty(DistributionConfig.BIND_ADDRESS_NAME,
+    props.setProperty(BIND_ADDRESS,
                       bindAddress);
 //    System.out.println("entering ds port range property of " + this.membershipPortRange);
     if (this.membershipPortRange != null) {
       props.setProperty(DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME, this.membershipPortRange);
     }
     if (this.tcpPort != 0) {
-      props.setProperty(DistributionConfig.TCP_PORT_NAME, String.valueOf(this.tcpPort));
+      props.setProperty(TCP_PORT, String.valueOf(this.tcpPort));
     }
     if (this.mcastEnabled) {
        // Fix bug 32849
-       props.setProperty(DistributionConfig.MCAST_ADDRESS_NAME,
+      props.setProperty(MCAST_ADDRESS,
                          String.valueOf(this.mcastId.getHost().getHostAddress()));
-       props.setProperty(DistributionConfig.MCAST_PORT_NAME,
+      props.setProperty(MCAST_PORT,
                         String.valueOf(this.mcastId.getPort()));
 
     }
     else {
-      props.setProperty(DistributionConfig.MCAST_PORT_NAME, 
+      props.setProperty(MCAST_PORT,
                         String.valueOf(0));
     }
     // Create locator string
@@ -307,7 +304,7 @@ public class RemoteTransportConfig implements TransportConfig {
       }
     }
 
-    props.setProperty(DistributionConfig.LOCATORS_NAME,
+    props.setProperty(LOCATORS,
         locators.toString());
 
     this.sslConfig.toDSProperties(props);



Mime
View raw message