geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [61/90] [abbrv] incubator-geode git commit: GEODE-1377: Renaming SystemConfigurationProperties to DistributedSystemConfigProperties
Date Wed, 08 Jun 2016 00:05:38 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
new file mode 100644
index 0000000..d80a3e8
--- /dev/null
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystemConfigProperties.java
@@ -0,0 +1,746 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.distributed;
+
+
+public interface DistributedSystemConfigProperties {
+  /**
+   * The static definition of the <a href="DistributedSystem.html#ack-severe-alert-threshold">"ack-severe-alert-threshold"</a>
+   * property
+   */
+  String ACK_SEVERE_ALERT_THRESHOLD = "ack-severe-alert-threshold";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#ack-wait-threshold">"ack-wait-threshold"</a>
+   * property
+   */
+  String ACK_WAIT_THRESHOLD = "ack-wait-threshold";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#archive-disk-space-limit">"archive-disk-space-limit"</a>
+   * property
+   */
+  String ARCHIVE_DISK_SPACE_LIMIT = "archive-disk-space-limit";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#archive-file-size-limit">"archive-file-size-limit"</a>
+   * property
+   */
+  String ARCHIVE_FILE_SIZE_LIMIT = "archive-file-size-limit";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#async-distribution-timeout">"async-distribution-timeout"</a>
+   * property
+   */
+  String ASYNC_DISTRIBUTION_TIMEOUT = "async-distribution-timeout";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#async-max-queue-size">"async-max-queue-size"</a>
+   * property
+   */
+  String ASYNC_MAX_QUEUE_SIZE = "async-max-queue-size";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#async-queue-timeout">"async-queue-timeout"</a>
+   * property
+   */
+  String ASYNC_QUEUE_TIMEOUT = "async-queue-timeout";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#bind-address">"bind-address"</a>
+   * property
+   */
+  String BIND_ADDRESS = "bind-address";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
+   * property
+   */
+  String CACHE_XML_FILE = "cache-xml-file";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-configuration-dir">"cluster-configuration-dir"</a>
+   * property
+   */
+  String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-ciphers">"cluster-ssl-ciphers"</a>
+   * property
+   */
+  String CLUSTER_SSL_CIPHERS = "cluster-ssl-ciphers";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-enabled">"cluster-ssl-enabled"</a>
+   * property
+   */
+  String CLUSTER_SSL_ENABLED = "cluster-ssl-enabled";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore">"cluster-ssl-keystore"</a>
+   * property
+   */
+  String CLUSTER_SSL_KEYSTORE = "cluster-ssl-keystore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore-password">"cluster-ssl-keystore-password"</a>
+   * property
+   */
+  String CLUSTER_SSL_KEYSTORE_PASSWORD = "cluster-ssl-keystore-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-keystore-type">"cluster-ssl-keystore-type"</a>
+   * property
+   */
+  String CLUSTER_SSL_KEYSTORE_TYPE = "cluster-ssl-keystore-type";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-protocols">"cluster-ssl-protocols"</a>
+   * property
+   */
+  String CLUSTER_SSL_PROTOCOLS = "cluster-ssl-protocols";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-require-authentication">"cluster-ssl-require-authentication"</a>
+   * property
+   */
+  String CLUSTER_SSL_REQUIRE_AUTHENTICATION = "cluster-ssl-require-authentication";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-truststore">"cluster-ssl-truststore"</a>
+   * property
+   */
+  String CLUSTER_SSL_TRUSTSTORE = "cluster-ssl-truststore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#cluster-ssl-truststore-password">"cluster-ssl-truststore-password"</a>
+   * property
+   */
+  String CLUSTER_SSL_TRUSTSTORE_PASSWORD = "cluster-ssl-truststore-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#conflate-events">"conflate-events"</a>
+   * property
+   */
+  String CONFLATE_EVENTS = "conflate-events";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#conserve-sockets">"conserve-sockets"</a>
+   * property
+   */
+  String CONSERVE_SOCKETS = "conserve-sockets";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#delta-propagation">"delta-propagation"</a>
+   * property
+   */
+  String DELTA_PROPAGATION = "delta-propagation";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#deploy-working-dir">"deploy-working-dir"</a>
+   * property
+   */
+  String DEPLOY_WORKING_DIR = "deploy-working-dir";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#disable-auto-reconnect">"disable-auto-reconnect"</a>
+   * property
+   */
+  String DISABLE_AUTO_RECONNECT = "disable-auto-reconnect";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#disable-tcp">"disable-tcp"</a>
+   * property
+   */
+  String DISABLE_TCP = "disable-tcp";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#distributed-system-id">"distributed-system-id"</a>
+   * property
+   */
+  String DISTRIBUTED_SYSTEM_ID = "distributed-system-id";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#durable-client-id">"durable-client-id"</a>
+   * property
+   */
+  String DURABLE_CLIENT_ID = "durable-client-id";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#durable-client-timeout">"durable-client-timeout"</a>
+   * property
+   */
+  String DURABLE_CLIENT_TIMEOUT = "durable-client-timeout";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#enable-cluster-configuration">"enable-cluster-configuration"</a>
+   * property
+   */
+  String ENABLE_CLUSTER_CONFIGURATION = "enable-cluster-configuration";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#enable-network-partition-detection">"enable-network-partition-detection"</a>
+   * property
+   */
+  String ENABLE_NETWORK_PARTITION_DETECTION = "enable-network-partition-detection";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#enable-time-statistics">"enable-time-statistics"</a>
+   * property
+   */
+  String ENABLE_TIME_STATISTICS = "enable-time-statistics";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#enforce-unique-host">"enforce-unique-host"</a>
+   * property
+   */
+  String ENFORCE_UNIQUE_HOST = "enforce-unique-host";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-ciphers">"gateway-ssl-ciphers"</a>
+   * property
+   */
+  String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-enabled">"gateway-ssl-enabled"</a>
+   * property
+   */
+  String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore">"gateway-ssl-keystore"</a>
+   * property
+   */
+  String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore-password">"gateway-ssl-keystore-password"</a>
+   * property
+   */
+  String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-keystore-type">"gateway-ssl-keystore-type"</a>
+   * property
+   */
+  String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-protocols">"gateway-ssl-protocols"</a>
+   * property
+   */
+  String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-require-authentication">"gateway-ssl-require-authentication"</a>
+   * property
+   */
+  String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-truststore">"gateway-ssl-truststore"</a>
+   * property
+   */
+  String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#gateway-ssl-truststore-password">"gateway-ssl-truststore-password"</a>
+   * property
+   */
+  String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#groups">"groups"</a>
+   * property
+   */
+  String GROUPS = "groups";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-bind-address">"http-service-bind-address"</a>
+   * property
+   */
+  String HTTP_SERVICE_BIND_ADDRESS = "http-service-bind-address";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-port">"http-service-port"</a>
+   * property
+   */
+  String HTTP_SERVICE_PORT = "http-service-port";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-ciphers">"http-service-ssl-ciphers"</a>
+   * property
+   */
+  String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-enabled">"http-service-ssl-enabled"</a>
+   * property
+   */
+  String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore">"http-service-ssl-keystore"</a>
+   * property
+   */
+  String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore-password">"http-service-ssl-keystore-password"</a>
+   * property
+   */
+  String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-keystore-type">"http-service-ssl-keystore-type"</a>
+   * property
+   */
+  String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-protocols">"http-service-ssl-protocols"</a>
+   * property
+   */
+  String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-require-authentication">"http-service-ssl-require-authentication"</a>
+   * property
+   */
+  String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-truststore">"http-service-ssl-truststore"</a>
+   * property
+   */
+  String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#http-service-ssl-truststore-password">"http-service-ssl-truststore-password"</a>
+   * property
+   */
+  String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager">"jmx-manager"</a>
+   * property
+   */
+  String JMX_MANAGER = "jmx-manager";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-access-file">"jmx-manager-access-file"</a>
+   * property
+   */
+  String JMX_MANAGER_ACCESS_FILE = "jmx-manager-access-file";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-bind-address">"jmx-manager-bind-address"</a>
+   * property
+   */
+  String JMX_MANAGER_BIND_ADDRESS = "jmx-manager-bind-address";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-hostname-for-clients">"jmx-manager-hostname-for-clients"</a>
+   * property
+   */
+  String JMX_MANAGER_HOSTNAME_FOR_CLIENTS = "jmx-manager-hostname-for-clients";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-http-port">"jmx-manager-http-port"</a>
+   * property
+   *
+   * @deprecated as of GemFire 8.0 use {@link #HTTP_SERVICE_PORT} instead.
+   */
+  String JMX_MANAGER_HTTP_PORT = "jmx-manager-http-port";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-password-file">"jmx-manager-password-file"</a>
+   * property
+   */
+  String JMX_MANAGER_PASSWORD_FILE = "jmx-manager-password-file";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-port">"jmx-manager-port"</a>
+   * property
+   */
+  String JMX_MANAGER_PORT = "jmx-manager-port";
+  /**
+   * * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl">"jmx-manager-ssl"</a>
+   * property
+   * @deprecated as of GemFire 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead.
+   */
+  String JMX_MANAGER_SSL = "jmx-manager-ssl";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-start">"jmx-manager-start"</a>
+   * property
+   */
+  String JMX_MANAGER_START = "jmx-manager-start";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-update-rate">"jmx-manager-update-rate"</a>
+   * property
+   */
+  String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-ciphers">"jmx-manager-ssl-ciphers"</a>
+   * property
+   */
+  String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-enabled">"jmx-manager-ssl-enabled"</a>
+   * property
+   */
+  String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore">"jmx-manager-ssl-keystore"</a>
+   * property
+   */
+  String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore-password">"jmx-manager-ssl-keystore-password"</a>
+   * property
+   */
+  String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-keystore-type">"jmx-manager-ssl-keystore-type"</a>
+   * property
+   */
+  String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-protocols">"jmx-manager-ssl-protocols"</a>
+   * property
+   */
+  String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-require-authentication">"jmx-manager-ssl-require-authentication"</a>
+   * property
+   */
+  String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-truststore">"jmx-manager-ssl-truststore"</a>
+   * property
+   */
+  String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#jmx-manager-ssl-truststore-password">"jmx-manager-ssl-truststore-password"</a>
+   * property
+   */
+  String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password";
+  String LICENCE_APPLICATION_CACHE = "license-application-cache";
+  String LICENCE_DATA_MANAGEMENT = "license-data-management";
+  String LICENCE_SERVER_TIMEOUT = "license-server-timeout";
+  String LICENCE_WORKING_DIR = "license-working-dir";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#load-cluster-configuration-from-dir">"load-cluster-configuration-from-dir"</a>
+   * property
+   */
+  String LOAD_CLUSTER_CONFIGURATION_FROM_DIR = "load-cluster-configuration-from-dir";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#locator-wait-time">"locator-wait-time"</a>
+   * property
+   */
+  String LOCATOR_WAIT_TIME = "locator-wait-time";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#locators">"locators"</a>
+   * property
+   */
+  String LOCATORS = "locators";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#log-disk-space-limit">"log-disk-space-limit"</a>
+   * property
+   */
+  String LOG_DISK_SPACE_LIMIT = "log-disk-space-limit";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#log-file">"log-file"</a>
+   * property
+   */
+  String LOG_FILE = "log-file";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#log-file-size-limit">"log-file-size-limit"</a>
+   * property
+   */
+  String LOG_FILE_SIZE_LIMIT = "log-file-size-limit";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#log-level">"log-level"</a>
+   * property
+   */
+  String LOG_LEVEL = "log-level";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#max-num-reconnect-tries">"max-num-reconnect-tries"</a>
+   * property
+   */
+  String MAX_NUM_RECONNECT_TRIES = "max-num-reconnect-tries";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#max-wait-time-reconnect">"max-wait-time-reconnect"</a>
+   * property
+   */
+  String MAX_WAIT_TIME_RECONNECT = "max-wait-time-reconnect";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#mcast-address">"mcast-address"</a>
+   * property
+   */
+  String MCAST_ADDRESS = "mcast-address";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#mcast-flow-control">"mcast-flow-control"</a>
+   * property
+   */
+  String MCAST_FLOW_CONTROL = "mcast-flow-control";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#mcast-port">"mcast-port"</a>
+   * property
+   */
+  String MCAST_PORT = "mcast-port";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#mcast-recv-buffer-size">"mcast-recv-buffer-size"</a>
+   * property
+   */
+  String MCAST_RECV_BUFFER_SIZE = "mcast-recv-buffer-size";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#mcast-send-buffer-size">"mcast-send-buffer-size"</a>
+   * property
+   */
+  String MCAST_SEND_BUFFER_SIZE = "mcast-send-buffer-size";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#mcast-ttl">"mcast-ttl"</a>
+   * property
+   */
+  String MCAST_TTL = "mcast-ttl";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#member-timeout">"member-timeout"</a>
+   * property
+   */
+  String MEMBER_TIMEOUT = "member-timeout";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#membership-port-range">"membership-port-range"</a>
+   * property
+   */
+  String MEMBERSHIP_PORT_RANGE = "membership-port-range";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#memcached-bind-address">"memcached-bind-address"</a>
+   * property
+   */
+  String MEMCACHED_BIND_ADDRESS = "memcached-bind-address";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#memcached-port">"memcached-port"</a>
+   * property
+   */
+  String MEMCACHED_PORT = "memcached-port";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#memcached-protocol">"memcached-protocol"</a>
+   * property
+   */
+  String MEMCACHED_PROTOCOL = "memcached-protocol";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#name">"name"</a>
+   * property
+   */
+  String NAME = "name";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#redundancy-zone">"redundancy-zone"</a>
+   * property
+   */
+  String REDUNDANCY_ZONE = "redundancy-zone";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#remote-locators">"remote-locators"</a>
+   * property
+   */
+  String REMOTE_LOCATORS = "remote-locators";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#remove-unresponsive-client">"remove-unresponsive-client"</a>
+   * property
+   */
+  String REMOVE_UNRESPONSIVE_CLIENT = "remove-unresponsive-client";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#roles">"roles"</a>
+   * property
+   */
+  String ROLES = "roles";
+  /**
+   * The static definition of the security prefix "security-" used in conjuntion with other security-* properties</a>
+   * property
+   */
+  String SECURITY_PREFIX = "security-";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-client-accessor">"security-client-accessor"</a>
+   * property
+   */
+  String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-client-accessor-pp">"security-client-accessor-pp"</a>
+   * property
+   */
+  String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-client-auth-init">"security-client-auth-init"</a>
+   * property
+   */
+  String SECURITY_CLIENT_AUTH_INIT = SECURITY_PREFIX + "client-auth-init";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-client-authenticator">"security-client-authenticator"</a>
+   * property
+   */
+  String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + "client-authenticator";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-client-dhalgo">"security-client-dhalgo"</a>
+   * property
+   */
+  String SECURITY_CLIENT_DHALGO = SECURITY_PREFIX + "client-dhalgo";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-log-file">"security-log-file"</a>
+   * property
+   */
+  String SECURITY_LOG_FILE = SECURITY_PREFIX + "log-file";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-log-level">"security-log-level"</a>
+   * property
+   */
+  String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-peer-auth-init">"security-peer-auth-init"</a>
+   * property
+   */
+  String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-peer-authenticator">"security-peer-authenticator"</a>
+   * property
+   */
+  String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#security-peer-verifymember-timeout">"security-peer-verifymember-timeout"</a>
+   * property
+   */
+  String SECURITY_PEER_VERIFY_MEMBER_TIMEOUT = SECURITY_PREFIX + "peer-verifymember-timeout";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-bind-address">"server-bind-address"</a>
+   * property
+   */
+  String SERVER_BIND_ADDRESS = "server-bind-address";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-ssl-ciphers">"server-ssl-ciphers"</a>
+   * property
+   */
+  String SERVER_SSL_CIPHERS = "server-ssl-ciphers";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-ssl-enabled">"server-ssl-enabled"</a>
+   * property
+   */
+  String SERVER_SSL_ENABLED = "server-ssl-enabled";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore">"server-ssl-keystore"</a>
+   * property
+   */
+  String SERVER_SSL_KEYSTORE = "server-ssl-keystore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore-password">"server-ssl-keystore-password"</a>
+   * property
+   */
+  String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-ssl-keystore-type">"server-ssl-keystore-type"</a>
+   * property
+   */
+  String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-ssl-protocols">"server-ssl-protocols"</a>
+   * property
+   */
+  String SERVER_SSL_PROTOCOLS = "server-ssl-protocols";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-ssl-require-authentication">"server-ssl-require-authentication"</a>
+   * property
+   */
+  String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-ssl-truststore">"server-ssl-truststore"</a>
+   * property
+   */
+  String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#server-ssl-truststore-password">"server-ssl-truststore-password"</a>
+   * property
+   */
+  String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#socket-buffer-size">"socket-buffer-size"</a>
+   * property
+   */
+  String SOCKET_BUFFER_SIZE = "socket-buffer-size";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#socket-lease-time">"socket-lease-time"</a>
+   * property
+   */
+  String SOCKET_LEASE_TIME = "socket-lease-time";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#start-dev-rest-api">"start-dev-rest-api"</a>
+   * property
+   */
+  String START_DEV_REST_API = "start-dev-rest-api";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#start-locator">"start-locator"</a>
+   * property
+   */
+  String START_LOCATOR = "start-locator";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#statistic-archive-file">"statistic-archive-file"</a>
+   * property
+   */
+  String STATISTIC_ARCHIVE_FILE = "statistic-archive-file";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#statistic-sample-rate">"statistic-sample-rate"</a>
+   * property
+   */
+  String STATISTIC_SAMPLE_RATE = "statistic-sample-rate";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#statistic-sampling-enabled">"statistic-sampling-enabled"</a>
+   * property
+   */
+  String STATISTIC_SAMPLING_ENABLED = "statistic-sampling-enabled";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#tcp-port">"tcp-port"</a>
+   * property
+   */
+  String TCP_PORT = "tcp-port";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#udp-fragment-size">"udp-fragment-size"</a>
+   * property
+   */
+  String UDP_FRAGMENT_SIZE = "udp-fragment-size";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#udp-recv-buffer-size">"udp-recv-buffer-size"</a>
+   * property
+   */
+  String UDP_RECV_BUFFER_SIZE = "udp-recv-buffer-size";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#udp-send-buffer-size">"udp-send-buffer-size"</a>
+   * property
+   */
+  String UDP_SEND_BUFFER_SIZE = "udp-send-buffer-size";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#use-cluster-configuration">"use-cluster-configuration"</a>
+   * property
+   */
+  String USE_CLUSTER_CONFIGURATION = "use-cluster-configuration";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#user-command-packages">"user-command-packages"</a>
+   * property
+   */
+  String USER_COMMAND_PACKAGES = "user-command-packages";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#off-heap-memory-size">"off-heap-memory-size"</a>
+   * property
+   */
+  String OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#redis-port">"redis-port"</a>
+   * property
+   */
+  String REDIS_PORT = "redis-port";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#redis-bind-address">"redis-bind-address"</a>
+   * property
+   */
+  String REDIS_BIND_ADDRESS = "redis-bind-address";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#redis-password">"redis-password"</a>
+   * property
+   */
+  String REDIS_PASSWORD = "redis-password";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#lock-memory">"lock-memory"</a>
+   * property
+   */
+  String LOCK_MEMORY = "lock-memory";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#shiro-init">"shiro-init"</a>
+   * property
+   */
+  String SECURITY_SHIRO_INIT = SECURITY_PREFIX + "shiro-init";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#distributed-transactions">"distributed-transactions"</a>
+   * property
+   */
+  String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#ssl-enabled">"ssl-enabled"</a>
+   * property
+   *
+   * @deprecated as of Gemfire 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
+   */
+  String SSL_ENABLED = "ssl-enabled";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#ssl-protocols">"ssl-protocols"</a>
+   * property
+   *
+   * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
+   */
+  String SSL_PROTOCOLS = "ssl-protocols";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#ssl-ciphers">"ssl-ciphers"</a>
+   * property
+   *
+   * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
+   */
+  String SSL_CIPHERS = "ssl-ciphers";
+  /**
+   * The static definition of the <a href="DistributedSystem.html#ssl-require-authentication">"ssl-require-authentication"</a>
+   * property
+   *
+   * @deprecated as of GemFire 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
+   */
+  String SSL_REQUIRE_AUTHENTICATION = "ssl-require-authentication";
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
index f759886..22814a5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
@@ -17,7 +17,7 @@
 
 package com.gemstone.gemfire.distributed;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusResponse;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
index f19ce09..e4fe16c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java
@@ -17,7 +17,7 @@
 
 package com.gemstone.gemfire.distributed;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 import com.gemstone.gemfire.SystemFailure;
 import com.gemstone.gemfire.cache.Cache;
@@ -60,7 +60,7 @@ import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.SERVER_BIND_ADDRESS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SERVER_BIND_ADDRESS;
 
 /**
  * The ServerLauncher class is a launcher class with main method to start a GemFire Server (implying a GemFire Cache

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
deleted file mode 100644
index b4526fa..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.distributed;
-
-
-public interface SystemConfigurationProperties {
-  String ACK_SEVERE_ALERT_THRESHOLD = "ack-severe-alert-threshold";
-  String ACK_WAIT_THRESHOLD = "ack-wait-threshold";
-  String ARCHIVE_DISK_SPACE_LIMIT = "archive-disk-space-limit";
-  String ARCHIVE_FILE_SIZE_LIMIT = "archive-file-size-limit";
-  String ASYNC_DISTRIBUTION_TIMEOUT = "async-distribution-timeout";
-  String ASYNC_MAX_QUEUE_SIZE = "async-max-queue-size";
-  String ASYNC_QUEUE_TIMEOUT = "async-queue-timeout";
-  String BIND_ADDRESS = "bind-address";
-  String CACHE_XML_FILE = "cache-xml-file";
-  String CLUSTER_CONFIGURATION_DIR = "cluster-configuration-dir";
-  String CLUSTER_SSL_CIPHERS = "cluster-ssl-ciphers";
-  String CLUSTER_SSL_ENABLED = "cluster-ssl-enabled";
-  String CLUSTER_SSL_KEYSTORE = "cluster-ssl-keystore";
-  String CLUSTER_SSL_KEYSTORE_PASSWORD = "cluster-ssl-keystore-password";
-  String CLUSTER_SSL_KEYSTORE_TYPE = "cluster-ssl-keystore-type";
-  String CLUSTER_SSL_PROTOCOLS = "cluster-ssl-protocols";
-  String CLUSTER_SSL_REQUIRE_AUTHENTICATION = "cluster-ssl-require-authentication";
-  String CLUSTER_SSL_TRUSTSTORE = "cluster-ssl-truststore";
-  String CLUSTER_SSL_TRUSTSTORE_PASSWORD = "cluster-ssl-truststore-password";
-  String CONFLATE_EVENTS = "conflate-events";
-  String CONSERVE_SOCKETS = "conserve-sockets";
-  String DELTA_PROPAGATION = "delta-propagation";
-  String DEPLOY_WORKING_DIR = "deploy-working-dir";
-  String DISABLE_AUTO_RECONNECT = "disable-auto-reconnect";
-  String DISABLE_TCP = "disable-tcp";
-  String DISTRIBUTED_SYSTEM_ID = "distributed-system-id";
-  String DURABLE_CLIENT_ID = "durable-client-id";
-  String DURABLE_CLIENT_TIMEOUT = "durable-client-timeout";
-  String ENABLE_CLUSTER_CONFIGURATION = "enable-cluster-configuration";
-  String ENABLE_NETWORK_PARTITION_DETECTION = "enable-network-partition-detection";
-  String ENABLE_TIME_STATISTICS = "enable-time-statistics";
-  String ENFORCE_UNIQUE_HOST = "enforce-unique-host";
-  String GATEWAY_SSL_CIPHERS = "gateway-ssl-ciphers";
-  String GATEWAY_SSL_ENABLED = "gateway-ssl-enabled";
-  String GATEWAY_SSL_KEYSTORE = "gateway-ssl-keystore";
-  String GATEWAY_SSL_KEYSTORE_PASSWORD = "gateway-ssl-keystore-password";
-  String GATEWAY_SSL_KEYSTORE_TYPE = "gateway-ssl-keystore-type";
-  String GATEWAY_SSL_PROTOCOLS = "gateway-ssl-protocols";
-  String GATEWAY_SSL_REQUIRE_AUTHENTICATION = "gateway-ssl-require-authentication";
-  String GATEWAY_SSL_TRUSTSTORE = "gateway-ssl-truststore";
-  String GATEWAY_SSL_TRUSTSTORE_PASSWORD = "gateway-ssl-truststore-password";
-  String GROUPS = "groups";
-  String HTTP_SERVICE_BIND_ADDRESS = "http-service-bind-address";
-  String HTTP_SERVICE_PORT = "http-service-port";
-  String HTTP_SERVICE_SSL_CIPHERS = "http-service-ssl-ciphers";
-  String HTTP_SERVICE_SSL_ENABLED = "http-service-ssl-enabled";
-  String HTTP_SERVICE_SSL_KEYSTORE = "http-service-ssl-keystore";
-  String HTTP_SERVICE_SSL_KEYSTORE_PASSWORD = "http-service-ssl-keystore-password";
-  String HTTP_SERVICE_SSL_KEYSTORE_TYPE = "http-service-ssl-keystore-type";
-  String HTTP_SERVICE_SSL_PROTOCOLS = "http-service-ssl-protocols";
-  String HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION = "http-service-ssl-require-authentication";
-  String HTTP_SERVICE_SSL_TRUSTSTORE = "http-service-ssl-truststore";
-  String HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD = "http-service-ssl-truststore-password";
-  String JMX_MANAGER = "jmx-manager";
-  String JMX_MANAGER_ACCESS_FILE = "jmx-manager-access-file";
-  String JMX_MANAGER_BIND_ADDRESS = "jmx-manager-bind-address";
-  String JMX_MANAGER_HOSTNAME_FOR_CLIENTS = "jmx-manager-hostname-for-clients";
-
-  /**
-   * The name of the "jmx-manager-http-port" property.
-   *
-   * @deprecated as of 8.0 use {@link #HTTP_SERVICE_PORT} instead.
-   */
-  String JMX_MANAGER_HTTP_PORT = "jmx-manager-http-port";
-  String JMX_MANAGER_PASSWORD_FILE = "jmx-manager-password-file";
-  String JMX_MANAGER_PORT = "jmx-manager-port";
-
-  /**
-   * @deprecated as of 8.0 use {@link #JMX_MANAGER_SSL_ENABLED} instead.
-   */
-  String JMX_MANAGER_SSL = "jmx-manager-ssl";
-  String JMX_MANAGER_START = "jmx-manager-start";
-  String JMX_MANAGER_UPDATE_RATE = "jmx-manager-update-rate";
-  String JMX_MANAGER_SSL_CIPHERS = "jmx-manager-ssl-ciphers";
-  String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
-  String JMX_MANAGER_SSL_KEYSTORE = "jmx-manager-ssl-keystore";
-  String JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "jmx-manager-ssl-keystore-password";
-  String JMX_MANAGER_SSL_KEYSTORE_TYPE = "jmx-manager-ssl-keystore-type";
-  String JMX_MANAGER_SSL_PROTOCOLS = "jmx-manager-ssl-protocols";
-  String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = "jmx-manager-ssl-require-authentication";
-  String JMX_MANAGER_SSL_TRUSTSTORE = "jmx-manager-ssl-truststore";
-  String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "jmx-manager-ssl-truststore-password";
-  String LICENCE_APPLICATION_CACHE = "license-application-cache";
-  String LICENCE_DATA_MANAGEMENT = "license-data-management";
-  String LICENCE_SERVER_TIMEOUT = "license-server-timeout";
-  String LICENCE_WORKING_DIR = "license-working-dir";
-  String LOAD_CLUSTER_CONFIGURATION_FROM_DIR = "load-cluster-configuration-from-dir";
-  String LOCATOR_WAIT_TIME = "locator-wait-time";
-  String LOCATORS = "locators";
-  String LOG_DISK_SPACE_LIMIT = "log-disk-space-limit";
-  String LOG_FILE = "log-file";
-  String LOG_FILE_SIZE_LIMIT = "log-file-size-limit";
-  String LOG_LEVEL = "log-level";
-  String MAX_NUM_RECONNECT_TRIES = "max-num-reconnect-tries";
-  String MAX_WAIT_TIME_RECONNECT = "max-wait-time-reconnect";
-  String MCAST_ADDRESS = "mcast-address";
-  String MCAST_FLOW_CONTROL = "mcast-flow-control";
-  String MCAST_PORT = "mcast-port";
-  String MCAST_RECV_BUFFER_SIZE = "mcast-recv-buffer-size";
-  String MCAST_SEND_BUFFER_SIZE = "mcast-send-buffer-size";
-  String MCAST_TTL = "mcast-ttl";
-  String MEMBER_TIMEOUT = "member-timeout";
-  String MEMBERSHIP_PORT_RANGE = "membership-port-range";
-  String MEMCACHED_BIND_ADDRESS = "memcached-bind-address";
-  String MEMCACHED_PORT = "memcached-port";
-  String MEMCACHED_PROTOCOL = "memcached-protocol";
-
-  /**
-   * The "name" property, representing the system's name
-   */
-  String NAME = "name";
-  String REDUNDANCY_ZONE = "redundancy-zone";
-  String REMOTE_LOCATORS = "remote-locators";
-  String REMOVE_UNRESPONSIVE_CLIENT = "remove-unresponsive-client";
-  String ROLES = "roles";
-  String SECURITY_PREFIX = "security-";
-  String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor";
-  String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp";
-  String SECURITY_CLIENT_AUTH_INIT = SECURITY_PREFIX + "client-auth-init";
-  String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + "client-authenticator";
-  String SECURITY_CLIENT_DHALGO = SECURITY_PREFIX + "client-dhalgo";
-  String SECURITY_LOG_FILE = SECURITY_PREFIX + "log-file";
-  String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level";
-  String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init";
-  String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator";
-  String SECURITY_PEER_VERIFY_MEMBER_TIMEOUT = SECURITY_PREFIX + "peer-verifymember-timeout";
-  String SERVER_BIND_ADDRESS = "server-bind-address";
-  String SERVER_SSL_CIPHERS = "server-ssl-ciphers";
-  String SERVER_SSL_ENABLED = "server-ssl-enabled";
-  String SERVER_SSL_KEYSTORE = "server-ssl-keystore";
-  String SERVER_SSL_KEYSTORE_PASSWORD = "server-ssl-keystore-password";
-  String SERVER_SSL_KEYSTORE_TYPE = "server-ssl-keystore-type";
-  String SERVER_SSL_PROTOCOLS = "server-ssl-protocols";
-  String SERVER_SSL_REQUIRE_AUTHENTICATION = "server-ssl-require-authentication";
-  String SERVER_SSL_TRUSTSTORE = "server-ssl-truststore";
-  String SERVER_SSL_TRUSTSTORE_PASSWORD = "server-ssl-truststore-password";
-  String SOCKET_BUFFER_SIZE = "socket-buffer-size";
-  String SOCKET_LEASE_TIME = "socket-lease-time";
-  String START_DEV_REST_API = "start-dev-rest-api";
-  String START_LOCATOR = "start-locator";
-  String STATISTIC_ARCHIVE_FILE = "statistic-archive-file";
-  String STATISTIC_SAMPLE_RATE = "statistic-sample-rate";
-  String STATISTIC_SAMPLING_ENABLED = "statistic-sampling-enabled";
-  String TCP_PORT = "tcp-port";
-  String UDP_FRAGMENT_SIZE = "udp-fragment-size";
-  String UDP_RECV_BUFFER_SIZE = "udp-recv-buffer-size";
-  String UDP_SEND_BUFFER_SIZE = "udp-send-buffer-size";
-  String USE_CLUSTER_CONFIGURATION = "use-cluster-configuration";
-  String USER_COMMAND_PACKAGES = "user-command-packages";
-  String OFF_HEAP_MEMORY_SIZE = "off-heap-memory-size";
-
-  String REDIS_PORT = "redis-port";
-  String REDIS_BIND_ADDRESS = "redis-bind-address";
-  String REDIS_PASSWORD = "redis-password";
-  String LOCK_MEMORY = "lock-memory";
-  String SECURITY_SHIRO_INIT = SECURITY_PREFIX + "shiro-init";
-  String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
-
-  /**
-   * Returns the value of the <a
-   * href="../DistributedSystem.html#ssl-enabled">"ssl-enabled"</a>
-   * property.
-   *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_ENABLED} instead.
-   */
-  String SSL_ENABLED = "ssl-enabled";
-
-  /**
-   * The name of the "SSLProtocols" property
-   *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
-   */
-  String SSL_PROTOCOLS = "ssl-protocols";
-
-  /**
-   * The name of the "SSLCiphers" property
-   *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
-   */
-  String SSL_CIPHERS = "ssl-ciphers";
-
-  /**
-   * The name of the "SSLRequireAuthentication" property
-   *
-   * @deprecated as of 8.0 use {@link #CLUSTER_SSL_REQUIRE_AUTHENTICATION} instead.
-   */
-  String SSL_REQUIRE_AUTHENTICATION = "ssl-require-authentication";
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index 4212bb3..f529196 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.distributed.internal;
 import com.gemstone.gemfire.InternalGemFireException;
 import com.gemstone.gemfire.InvalidValueException;
 import com.gemstone.gemfire.UnmodifiableException;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.internal.AbstractConfig;
 import com.gemstone.gemfire.internal.ConfigSource;
 import com.gemstone.gemfire.internal.SocketCreator;
@@ -688,7 +687,7 @@ public abstract class AbstractDistributionConfig
       LocalizedStrings.AbstractDistributionConfig_ENABLE_TIME_STATISTICS_NAME
         .toLocalizedString());
 
-    m.put(SystemConfigurationProperties.DEPLOY_WORKING_DIR,
+    m.put(DEPLOY_WORKING_DIR,
         LocalizedStrings.AbstractDistributionConfig_DEPLOY_WORKING_DIR_0 
           .toLocalizedString(DEFAULT_DEPLOY_WORKING_DIR));
 
@@ -996,7 +995,7 @@ public abstract class AbstractDistributionConfig
     m.put(GROUPS, "A comma separated list of all the groups this member belongs to." +
         " Defaults to \"\".");
     
-    m.put(SystemConfigurationProperties.USER_COMMAND_PACKAGES, "A comma separated list of the names of the packages containing classes that implement user commands.");
+    m.put(USER_COMMAND_PACKAGES, "A comma separated list of the names of the packages containing classes that implement user commands.");
     
     m.put(JMX_MANAGER, "If true then this member is willing to be a jmx manager. Defaults to false except on a locator.");
     m.put(JMX_MANAGER_START, "If true then the jmx manager will be started when the cache is created. Defaults to false.");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index 9a900ca..fee905c 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -18,7 +18,7 @@
 package com.gemstone.gemfire.distributed.internal;
 
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.internal.Config;
 import com.gemstone.gemfire.internal.ConfigSource;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
@@ -48,7 +48,7 @@ import java.util.*;
  *
  * @since GemFire 2.1
  */
-public interface DistributionConfig extends Config, LogConfig, SystemConfigurationProperties {
+public interface DistributionConfig extends Config, LogConfig, DistributedSystemConfigProperties {
 
   ////////////////////  Instance Methods  ////////////////////
 
@@ -107,7 +107,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
   void setMcastPort(int value);
 
   /**
-   * The default value of the "mcastPort" property
+   * The default value of the "mcast-port" property
    */
   int DEFAULT_MCAST_PORT = 0;
 
@@ -124,7 +124,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
   int MAX_MCAST_PORT = 65535;
 
   /**
-   * The name of the "mcastPort" property
+   * The name of the "mcast-port" property
    */
   @ConfigAttribute(type = Integer.class, min = MIN_MCAST_PORT, max = MAX_MCAST_PORT)
   String MCAST_PORT_NAME = MCAST_PORT;
@@ -389,7 +389,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
    * The name of the "deploy-working-dir" property.
    */
   @ConfigAttribute(type = File.class)
-  String DEPLOY_WORKING_DIR_NAME = SystemConfigurationProperties.DEPLOY_WORKING_DIR;
+  String DEPLOY_WORKING_DIR_NAME = DEPLOY_WORKING_DIR;
 
   /**
    * Default will be the current working directory as determined by
@@ -419,7 +419,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati
    * The name of the "user-command-packages" property.
    */
   @ConfigAttribute(type = String.class)
-  String USER_COMMAND_PACKAGES_NAME = SystemConfigurationProperties.USER_COMMAND_PACKAGES;
+  String USER_COMMAND_PACKAGES_NAME = USER_COMMAND_PACKAGES;
 
   /**
    * The default value of the "user-command-packages" property

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index e8e4f3b..3288e98 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -20,7 +20,6 @@ package com.gemstone.gemfire.distributed.internal;
 import com.gemstone.gemfire.GemFireConfigException;
 import com.gemstone.gemfire.GemFireIOException;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.internal.ConfigSource;
 import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
@@ -1141,7 +1140,7 @@ public class DistributionConfigImpl
     // a no-op since multicast discovery has been removed
     // and the default mcast port is now zero
 
-    //    ConfigSource cs = getAttSourceMap().get(SystemConfigurationProperties.MCAST_PORT);
+    //    ConfigSource cs = getAttSourceMap().get(DistributedSystemConfigProperties.MCAST_PORT);
 //    if (cs == null) {
 //      String locators = getLocators();
 //      if (locators != null && !locators.isEmpty()) {
@@ -1557,7 +1556,7 @@ public class DistributionConfigImpl
   }
  
   public void setUserCommandPackages(String value) {
-    this.userCommandPackages = (String)checkAttribute(SystemConfigurationProperties.USER_COMMAND_PACKAGES, value);
+    this.userCommandPackages = (String)checkAttribute(USER_COMMAND_PACKAGES, value);
   }
 
   public boolean getDeltaPropagation() {
@@ -1629,7 +1628,7 @@ public class DistributionConfigImpl
   }
   
   public void setDeployWorkingDir(File value) {
-    this.deployWorkingDir = (File)checkAttribute(SystemConfigurationProperties.DEPLOY_WORKING_DIR, value);
+    this.deployWorkingDir = (File)checkAttribute(DEPLOY_WORKING_DIR, value);
   }
   public void setLogFile(File value) {
     this.logFile = (File)checkAttribute(LOG_FILE, value);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index 9439fbb..9d49b49 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -73,8 +73,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
 
 /**
  * The concrete implementation of {@link DistributedSystem} that

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 8b9b307..483778d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -71,7 +71,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 /**
  * Provides the implementation of a distribution <code>Locator</code>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
index 8970fda..2102893 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/LocatorStats.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
 
 /**
  * This class maintains statistics for the locator

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
index 3493a87..d8d26b5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
@@ -83,7 +83,7 @@ import com.gemstone.gemfire.management.internal.configuration.messages.SharedCon
 import com.gemstone.gemfire.management.internal.configuration.utils.XmlUtils;
 import com.gemstone.gemfire.management.internal.configuration.utils.ZipUtils;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 @SuppressWarnings({ "deprecation", "unchecked" })
 public class SharedConfiguration {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
index 6fca8b7..9af29ec 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/auth/GMSAuthenticator.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.distributed.internal.membership.gms.auth;
 
 import com.gemstone.gemfire.LogWriter;
 import com.gemstone.gemfire.distributed.DistributedMember;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
 import com.gemstone.gemfire.distributed.internal.membership.NetView;
@@ -38,6 +37,7 @@ import java.util.Properties;
 import java.util.Set;
 
 import static com.gemstone.gemfire.internal.i18n.LocalizedStrings.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 // static messages
 
@@ -113,7 +113,7 @@ public class GMSAuthenticator implements Authenticator {
    */
   String authenticate(DistributedMember member, Object credentials, Properties secProps, DistributedMember localMember) throws AuthenticationFailedException {
 
-    String authMethod = secProps.getProperty(SystemConfigurationProperties.SECURITY_PEER_AUTHENTICATOR);
+    String authMethod = secProps.getProperty(SECURITY_PEER_AUTHENTICATOR);
     if (authMethod == null || authMethod.length() == 0) {
       return null;
     }
@@ -180,7 +180,7 @@ public class GMSAuthenticator implements Authenticator {
       return getCredentials(member, securityProps);
 
     } catch (Exception e) {
-      String authMethod = securityProps.getProperty(SystemConfigurationProperties.SECURITY_PEER_AUTH_INIT);
+      String authMethod = securityProps.getProperty(SECURITY_PEER_AUTH_INIT);
       services.getSecurityLogWriter().warning(LocalizedStrings.AUTH_FAILED_TO_OBTAIN_CREDENTIALS_IN_0_USING_AUTHINITIALIZE_1_2, new Object[] { authMethod, e.getLocalizedMessage() });
       return null;
     }
@@ -191,7 +191,7 @@ public class GMSAuthenticator implements Authenticator {
    */
   Properties getCredentials(DistributedMember member, Properties secProps) {
     Properties credentials = null;
-    String authMethod = secProps.getProperty(SystemConfigurationProperties.SECURITY_PEER_AUTH_INIT);
+    String authMethod = secProps.getProperty(SECURITY_PEER_AUTH_INIT);
 
     try {
       if (authMethod != null && authMethod.length() > 0) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index d618dce..910ba2c 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -46,8 +46,8 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.START_LOCATOR;
 import static com.gemstone.gemfire.distributed.internal.membership.gms.ServiceConfig.MEMBER_REQUEST_COLLECTION_INTERVAL;
 import static com.gemstone.gemfire.internal.DataSerializableFixedID.*;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 dae240f..5d455ec 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
@@ -29,7 +29,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 /**
  * 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/1e985eb1/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 cd35e53..33d3765 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
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
@@ -33,8 +33,8 @@ 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;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
 
 /**
  * MigrationClient is used to retrieve all of the data for a region from

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 a611d39..cf5eea0 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
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 import com.gemstone.gemfire.admin.internal.InetAddressUtil;
 import com.gemstone.gemfire.cache.Cache;
@@ -34,8 +34,8 @@ 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;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
 
 /**
  * MigrationServer creates a cache using a supplied cache.xml and then

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 8f1ad81..7cb7df1 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,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 import com.gemstone.gemfire.*;
 import com.gemstone.gemfire.admin.AdminException;
@@ -47,7 +47,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.START_LOCATOR;
 
 /**
  * Provides static methods for various system administation tasks.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
index 213653e..17fbf94 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/admin/SSLConfig.java
@@ -18,7 +18,7 @@ package com.gemstone.gemfire.internal.admin;
 
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 import java.util.Iterator;
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/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 06b5721..8421c9a 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
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 /**
  * Tranport config for RemoteGfManagerAgent.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
index 4bf8fea..bb595d1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/CacheServerLauncher.java
@@ -23,7 +23,7 @@ import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
@@ -43,8 +43,8 @@ import java.net.URL;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOG_FILE;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.SERVER_BIND_ADDRESS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOG_FILE;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.SERVER_BIND_ADDRESS;
 
 /**
  * Launcher program to start a cache server.
@@ -263,7 +263,7 @@ public class CacheServerLauncher  {
       "critical-off-heap-percentage";
   public static final String EVICTION_OFF_HEAP_PERCENTAGE =
       "eviction-off-heap-percentage";
-  protected static final String LOCK_MEMORY = SystemConfigurationProperties.LOCK_MEMORY;
+  protected static final String LOCK_MEMORY = DistributedSystemConfigProperties.LOCK_MEMORY;
 
   protected final File processDirOption(final Map<String, Object> options, final String dirValue) throws FileNotFoundException {
     final File inputWorkingDirectory = new File(dirValue);
@@ -1197,7 +1197,7 @@ public class CacheServerLauncher  {
 
   /**
    * Reads {@link DistributedSystem#PROPERTY_FILE} and determines if the
-   * {@link SystemConfigurationProperties#LOG_FILE} property is set to stdout
+   * {@link DistributedSystemConfigProperties#LOG_FILE} property is set to stdout
    * @return true if the logging would go to stdout
    */
   private static boolean isLoggingToStdOut() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
index 4c6ea10..126d713 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DiskStoreImpl.java
@@ -72,7 +72,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 /**
  * Represents a (disk-based) persistent store for region data. Used for both

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
index c59d098..9c19461 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/PoolStats.java
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.*;
 import com.gemstone.gemfire.distributed.internal.DistributionStats;
 import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
 
 /**
  * GemFire statistics about a Pool 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
index 89db1eb..85b2041 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/AcceptorImpl.java
@@ -56,7 +56,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 /**
  * Implements the acceptor thread on the bridge server. Accepts connections from

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
index ba2a7a8..df9bbd4 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -54,7 +54,7 @@ import java.security.Principal;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 /**
  * Class <code>CacheClientNotifier</code> works on the server and manages

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
index ade09ee..4d1c1d2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientProxyMembershipID.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.Logger;
 import java.io.*;
 import java.util.Arrays;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 /**
  * This class represents a ConnectionProxy of the CacheClient

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
index 9bc8956..2408009 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/HandShake.java
@@ -56,7 +56,7 @@ import java.security.cert.X509Certificate;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 public class HandShake implements ClientHandShake
 {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
index c35ccb5..1a66030 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
@@ -60,7 +60,7 @@ import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 /**
  * Provides an implementation for the server socket end of the hierarchical

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
index 01c36bd..1c373c1 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerHandShakeProcessor.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.UnsupportedVersionException;
 import com.gemstone.gemfire.cache.VersionException;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.HeapDataOutputStream;
 import com.gemstone.gemfire.internal.Version;
@@ -47,7 +46,7 @@ import java.net.SocketTimeoutException;
 import java.security.Principal;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 /**
  * A <code>ServerHandShakeProcessor</code> verifies the client's version compatibility with server.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
index 5cd1849..4ee3585 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheXml.java
@@ -17,8 +17,7 @@
 package com.gemstone.gemfire.internal.cache.xmlcache;
 
 import com.gemstone.gemfire.cache.CacheXmlException;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import org.xml.sax.*;
@@ -692,7 +691,7 @@ public abstract class CacheXml implements EntityResolver2, ErrorHandler {
   /** The name of the <code>overflow-directory</code> attribute */
   protected static final String OVERFLOW_DIRECTORY = "overflow-directory";
   /** The name of the <code>socket-buffer-size</code> attribute */
-  protected static final String SOCKET_BUFFER_SIZE = SystemConfigurationProperties.SOCKET_BUFFER_SIZE;
+  protected static final String SOCKET_BUFFER_SIZE = DistributedSystemConfigProperties.SOCKET_BUFFER_SIZE;
   /** The name of the <code>socket-read-timeout</code> attribute */
   protected static final String SOCKET_READ_TIMEOUT = "socket-read-timeout";
   /** The name of the <code>maximum-queue-memory</code> attribute */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
index 27f5302..37ce630 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/logging/LogWriterFactory.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.internal.logging;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
index 5cfa58d..838bfc6 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
@@ -48,7 +48,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.Callable;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 public class GeodeSecurityUtil {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
index 2bb5183..fff008f 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/shiro/CustomAuthRealm.java
@@ -43,7 +43,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import static com.gemstone.gemfire.management.internal.security.ResourceConstants.ACCESS_DENIED_MESSAGE;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 public class CustomAuthRealm extends AuthorizingRealm{
   public static final String REALM_NAME = "CUSTOMAUTHREALM";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
index a3d78ed..80c8a56 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/tcp/Connection.java
@@ -49,7 +49,7 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
 
 /** <p>Connection is a socket holder that sends and receives serialized
     message objects.  A Connection may be closed to preserve system

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1e985eb1/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
index ac28941..b408d86 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/CommandManager.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.management.internal.cli;
 
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
+import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.management.cli.CliMetaData;
@@ -37,6 +37,8 @@ import java.lang.reflect.Method;
 import java.util.*;
 import java.util.Map.Entry;
 
+import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+
 /**
  * 
  * @since GemFire 7.0
@@ -48,7 +50,7 @@ public class CommandManager {
   
   private static final Object INSTANCE_LOCK = new Object();
   private static CommandManager INSTANCE = null;
-  public static final String USER_CMD_PACKAGES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.USER_COMMAND_PACKAGES;
+  public static final String USER_CMD_PACKAGES_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + USER_COMMAND_PACKAGES;
   public static final String USER_CMD_PACKAGES_ENV_VARIABLE = "GEMFIRE_USER_COMMAND_PACKAGES";
   
   private Properties cacheProperties;
@@ -93,7 +95,7 @@ public class CommandManager {
     
     // Find by  packages specified in the distribution config
     if (this.cacheProperties != null) {
-      String cacheUserCmdPackages = this.cacheProperties.getProperty(SystemConfigurationProperties.USER_COMMAND_PACKAGES);
+      String cacheUserCmdPackages = this.cacheProperties.getProperty(DistributedSystemConfigProperties.USER_COMMAND_PACKAGES);
       if (cacheUserCmdPackages != null && !cacheUserCmdPackages.isEmpty()) {
         StringTokenizer tokenizer = new StringTokenizer(cacheUserCmdPackages, ",");
         while (tokenizer.hasMoreTokens()) {



Mime
View raw message