You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2016/06/02 00:08:46 UTC
[60/67] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
GEODE-1377: Initial move of system properties from private to public
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8975cbdf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8975cbdf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8975cbdf
Branch: refs/heads/develop
Commit: 8975cbdf298964eccaaeb9f3777a6624a54ae26c
Parents: cb29153
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Tue May 31 11:34:28 2016 +1000
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Jun 2 10:01:42 2016 +1000
----------------------------------------------------------------------
.../internal/web/RestInterfaceJUnitTest.java | 11 +-
.../web/controllers/RestAPITestBase.java | 10 +-
.../RestAPIsAndInterOpsDUnitTest.java | 21 +-
...APIsOnMembersFunctionExecutionDUnitTest.java | 11 +-
.../RestAPIsQueryAndFEJUnitTest.java | 11 +-
.../controllers/RestAPIsWithSSLDUnitTest.java | 106 ++---
.../gemfire/admin/DistributedSystemConfig.java | 9 +-
.../internal/DistributedSystemConfigImpl.java | 2 +-
.../gemfire/distributed/DistributedSystem.java | 6 -
.../SystemConfigurationProperties.java | 41 +-
.../internal/AbstractDistributionConfig.java | 10 +-
.../internal/DistributionConfig.java | 383 ++++++++++---------
.../internal/DistributionConfigImpl.java | 144 +++----
.../internal/RuntimeDistributionConfigImpl.java | 2 +-
.../gemfire/internal/AbstractConfig.java | 4 +-
.../admin/remote/RemoteTransportConfig.java | 2 +-
.../internal/cache/CacheServerLauncher.java | 2 +-
.../cache/tier/sockets/AcceptorImpl.java | 7 +-
.../cache/tier/sockets/CacheClientNotifier.java | 8 +-
.../internal/cache/tier/sockets/HandShake.java | 6 +-
.../cache/tier/sockets/ServerConnection.java | 5 +-
.../tier/sockets/ServerHandShakeProcessor.java | 10 +-
.../internal/security/GeodeSecurityUtil.java | 6 +-
.../security/shiro/CustomAuthRealm.java | 8 +-
.../gemfire/internal/tcp/Connection.java | 6 +-
.../cli/commands/LauncherLifecycleCommands.java | 1 +
.../internal/cli/shell/JmxOperationInvoker.java | 6 +-
.../CacheServerSSLConnectionDUnitTest.java | 44 +--
.../internal/SSLNoClientAuthDUnitTest.java | 39 +-
.../MemoryThresholdsOffHeapDUnitTest.java | 6 +-
.../QueryParamsAuthorizationDUnitTest.java | 4 +-
.../cache/snapshot/RegionSnapshotJUnitTest.java | 4 +-
.../gemfire/cache30/Bug38741DUnitTest.java | 5 +-
.../gemfire/cache30/CacheLogRollDUnitTest.java | 4 +-
.../cache30/CacheXmlGeode10DUnitTest.java | 10 +-
...tedAckOverflowRegionCCEOffHeapDUnitTest.java | 5 +-
...dAckPersistentRegionCCEOffHeapDUnitTest.java | 5 +-
.../DistributedAckRegionCCEDUnitTest.java | 2 +-
...DistributedAckRegionCCEOffHeapDUnitTest.java | 4 +-
.../DistributedAckRegionOffHeapDUnitTest.java | 5 +-
...stributedNoAckRegionCCEOffHeapDUnitTest.java | 5 +-
.../DistributedNoAckRegionOffHeapDUnitTest.java | 4 +-
.../cache30/GlobalRegionCCEDUnitTest.java | 2 +-
.../GlobalRegionCCEOffHeapDUnitTest.java | 5 +-
.../cache30/GlobalRegionOffHeapDUnitTest.java | 5 +-
.../OffHeapLRUEvictionControllerDUnitTest.java | 5 +-
.../PartitionedRegionOffHeapDUnitTest.java | 5 +-
.../AbstractLauncherIntegrationTest.java | 5 +-
.../distributed/DistributedMemberDUnitTest.java | 6 +-
.../gemfire/distributed/LocatorDUnitTest.java | 12 +-
.../gemfire/distributed/LocatorJUnitTest.java | 14 +-
.../LocatorLauncherLocalIntegrationTest.java | 4 +-
.../ServerLauncherLocalIntegrationTest.java | 4 +-
.../internal/DistributionConfigJUnitTest.java | 42 +-
.../InternalDistributedSystemJUnitTest.java | 4 +-
.../membership/MembershipJUnitTest.java | 2 +-
.../gms/auth/GMSAuthenticatorJUnitTest.java | 35 +-
.../internal/SSLConfigIntegrationJUnitTest.java | 5 +-
.../cache/ClientServerGetAllDUnitTest.java | 6 +-
.../cache/DeltaPropagationStatsDUnitTest.java | 6 +-
...DistrbutedRegionProfileOffHeapDUnitTest.java | 15 +-
.../internal/cache/GridAdvisorDUnitTest.java | 4 +-
.../cache/OffHeapEvictionDUnitTest.java | 5 +-
.../cache/OffHeapEvictionStatsDUnitTest.java | 5 +-
.../cache/P2PDeltaPropagationDUnitTest.java | 5 +-
.../PRDataStoreMemoryOffHeapJUnitTest.java | 5 +-
...gionBucketCreationDistributionDUnitTest.java | 7 +-
...nedRegionLocalMaxMemoryOffHeapDUnitTest.java | 5 +-
...rtitionedRegionOffHeapEvictionDUnitTest.java | 5 +-
...artitionedRegionRedundancyZoneDUnitTest.java | 5 +-
.../control/MemoryMonitorOffHeapJUnitTest.java | 5 +-
.../control/RebalanceOperationDUnitTest.java | 5 +-
...ributedRegionFunctionExecutionDUnitTest.java | 2 +-
.../OnGroupsFunctionExecutionDUnitTest.java | 2 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 6 +-
.../tier/sockets/ClientConflationDUnitTest.java | 4 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 61 +--
...ForceInvalidateOffHeapEvictionDUnitTest.java | 5 +-
.../tier/sockets/InterestListDUnitTest.java | 8 +-
.../cache/wan/AsyncEventQueueTestBase.java | 9 +-
...ompressionCacheListenerOffHeapDUnitTest.java | 4 +-
...ressionRegionOperationsOffHeapDUnitTest.java | 4 +-
.../DistributedSystemLogFileJUnitTest.java | 24 +-
.../logging/LocatorLogFileJUnitTest.java | 2 +-
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 4 +-
.../management/CacheManagementDUnitTest.java | 4 +-
.../DataBrowserJSONValidationJUnitTest.java | 8 +-
.../management/LocatorManagementDUnitTest.java | 20 +-
.../gemfire/management/ManagementTestBase.java | 8 +-
.../management/OffHeapManagementDUnitTest.java | 11 +-
.../stats/DistributedSystemStatsJUnitTest.java | 8 +-
.../internal/cli/CliUtilDUnitTest.java | 14 +-
.../cli/commands/CliCommandTestBase.java | 12 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 14 +-
.../cli/commands/DeployCommandsDUnitTest.java | 14 +-
.../commands/DiskStoreCommandsDUnitTest.java | 18 +-
.../cli/commands/FunctionCommandsDUnitTest.java | 30 +-
.../commands/HelpCommandsIntegrationTest.java | 10 +-
.../cli/commands/IndexCommandsDUnitTest.java | 10 +-
.../ListAndDescribeRegionDUnitTest.java | 2 +-
.../cli/commands/MemberCommandsDUnitTest.java | 2 +-
.../MiscellaneousCommandsDUnitTest.java | 8 +-
...laneousCommandsExportLogsPart3DUnitTest.java | 4 +-
.../cli/commands/QueueCommandsDUnitTest.java | 10 +-
.../cli/commands/ShowStackTraceDUnitTest.java | 2 +-
.../GeodeSecurityUtilCustomRealmJUnitTest.java | 6 +-
.../GeodeSecurityUtilWithIniFileJUnitTest.java | 4 +-
.../JsonAuthorizationCacheStartRule.java | 15 +-
.../internal/security/MultiUserDUnitTest.java | 1 -
.../internal/security/ShiroCacheStartRule.java | 14 +-
.../gemfire/memcached/IntegrationJUnitTest.java | 9 +-
.../pdx/DistributedSystemIdDUnitTest.java | 4 +-
.../pdx/JSONPdxClientServerDUnitTest.java | 5 +-
.../gemfire/pdx/PdxClientServerDUnitTest.java | 5 +-
.../gemfire/pdx/PdxInstanceJUnitTest.java | 5 +-
.../generator/LdapUserCredentialGenerator.java | 8 +-
.../test/dunit/DistributedTestUtils.java | 7 +-
.../test/dunit/standalone/DUnitLauncher.java | 4 +-
.../com/main/WANBootStrapping_Site1_Add.java | 2 +-
.../com/main/WANBootStrapping_Site1_Remove.java | 4 +-
.../com/main/WANBootStrapping_Site2_Add.java | 4 +-
.../com/main/WANBootStrapping_Site2_Remove.java | 4 +-
.../cache/query/cq/dunit/CqStateDUnitTest.java | 6 +-
.../sockets/ClientToServerDeltaDUnitTest.java | 6 +-
.../CacheServerManagementDUnitTest.java | 2 +-
.../IndexRepositoryImplPerformanceTest.java | 1 +
.../gemfire/tools/pulse/tests/Server.java | 7 +-
.../internal/cache/UpdateVersionDUnitTest.java | 6 +-
.../gemfire/internal/cache/wan/WANTestBase.java | 81 ++--
.../wan/misc/NewWanAuthenticationDUnitTest.java | 4 +-
.../wan/misc/WANLocatorServerDUnitTest.java | 2 +-
.../wan/wancommand/WANCommandTestBase.java | 12 +-
.../WanCommandCreateGatewaySenderDUnitTest.java | 24 +-
.../WanCommandGatewaySenderStartDUnitTest.java | 16 +-
.../WanCommandGatewaySenderStopDUnitTest.java | 14 +-
.../wan/wancommand/WanCommandListDUnitTest.java | 14 +-
.../WanCommandPauseResumeDUnitTest.java | 24 +-
137 files changed, 940 insertions(+), 946 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
index 62131fe..c82b481 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java
@@ -111,10 +111,9 @@ public class RestInterfaceJUnitTest {
.set("name", getClass().getSimpleName())
.set(MCAST_PORT, "0")
.set(LOG_LEVEL, "config")
- .set(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, "localhost")
- .set(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(getHttpServicePort()))
- //.set("http-service-ssl-enabled", "false")
- .set(DistributionConfig.START_DEV_REST_API_NAME, "true")
+ .set(HTTP_SERVICE_BIND_ADDRESS, "localhost")
+ .set(HTTP_SERVICE_PORT, String.valueOf(getHttpServicePort()))
+ .set(START_DEV_REST_API, "true")
.create();
RegionFactory<String, Object> peopleRegionFactory = gemfireCache.createRegionFactory();
@@ -134,11 +133,11 @@ public class RestInterfaceJUnitTest {
protected synchronized int getHttpServicePort() {
try {
- return Integer.parseInt(StringUtils.trimWhitespace(gemfireProperties.getProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME)));
+ return Integer.parseInt(StringUtils.trimWhitespace(gemfireProperties.getProperty(HTTP_SERVICE_PORT)));
}
catch (NumberFormatException ignore) {
int httpServicePort = getHttpServicePort(DEFAULT_HTTP_SERVICE_PORT);
- gemfireProperties.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(httpServicePort));
+ gemfireProperties.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpServicePort));
return httpServicePort;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
index 2eddddc..52d4f09 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
@@ -47,6 +47,8 @@ import java.util.List;
import java.util.Properties;
import java.util.Random;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class RestAPITestBase extends DistributedTestCase {
protected Cache cache = null;
protected List<String> restURLs = new ArrayList();
@@ -109,12 +111,12 @@ public class RestAPITestBase extends DistributedTestCase {
Properties props = new Properties();
if (groups != null) {
- props.put(DistributionConfig.GROUPS_NAME, groups);
+ props.put(GROUPS, groups);
}
- props.setProperty(DistributionConfig.START_DEV_REST_API_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, hostName);
- props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(servicePort));
+ props.setProperty(START_DEV_REST_API, "true");
+ props.setProperty(HTTP_SERVICE_BIND_ADDRESS, hostName);
+ props.setProperty(HTTP_SERVICE_PORT, String.valueOf(servicePort));
InternalDistributedSystem ds = test.getSystem(props);
cache = CacheFactory.create(ds);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 8e0286a..27e2780 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -50,8 +50,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Dunit Test containing inter - operations between REST Client and Gemfire cache client
@@ -183,9 +182,9 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, String.valueOf(0));
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.START_DEV_REST_API_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, hostName);
- props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(restServicerPort));
+ props.setProperty(START_DEV_REST_API, "true");
+ props.setProperty(HTTP_SERVICE_BIND_ADDRESS, hostName);
+ props.setProperty(HTTP_SERVICE_PORT, String.valueOf(restServicerPort));
DistributedSystem ds = getSystem(props);
Cache cache = CacheFactory.create(ds);
@@ -835,15 +834,15 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
.setProperty(MCAST_PORT, String.valueOf(0));
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
- props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
- props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
+ props.setProperty(JMX_MANAGER, "true");
+ props.setProperty(JMX_MANAGER_START, "true");
+ props.setProperty(JMX_MANAGER_PORT, "0");
final int httpPort = AvailablePortHelper.getRandomAvailableTCPPort();
//Set REST service related configuration
- props.setProperty(DistributionConfig.START_DEV_REST_API_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, "localhost");
- props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(httpPort));
+ props.setProperty(START_DEV_REST_API, "true");
+ props.setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
+ props.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpPort));
DistributedSystem ds = getSystem(props);
Cache cache = CacheFactory.create(ds);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index c650e27..cca3959 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -21,13 +21,12 @@ import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.cache.execute.FunctionContext;
import com.gemstone.gemfire.cache.execute.FunctionService;
-import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
import org.apache.http.client.methods.CloseableHttpResponse;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase {
@@ -74,10 +73,10 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
final int servicePort = AvailablePortHelper.getRandomAvailableTCPPort();
Properties props = new Properties();
- props.setProperty(SystemConfigurationProperties.NAME, memberName);
- props.setProperty(DistributionConfig.START_DEV_REST_API_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, hostName);
- props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(servicePort));
+ props.setProperty(NAME, memberName);
+ props.setProperty(START_DEV_REST_API, "true");
+ props.setProperty(HTTP_SERVICE_BIND_ADDRESS, hostName);
+ props.setProperty(HTTP_SERVICE_PORT, String.valueOf(servicePort));
Cache c = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
index 1789c98..3bceea5 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
@@ -19,7 +19,6 @@ package com.gemstone.gemfire.rest.internal.web.controllers;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.execute.FunctionService;
import com.gemstone.gemfire.distributed.ServerLauncher;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.GemFireVersion;
import com.gemstone.gemfire.internal.SocketCreator;
@@ -40,7 +39,7 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
@Category(IntegrationTest.class)
public class RestAPIsQueryAndFEJUnitTest extends TestCase {
@@ -1317,10 +1316,10 @@ public class RestAPIsQueryAndFEJUnitTest extends TestCase {
ServerLauncher serverLauncher = new ServerLauncher.Builder()
.set(MCAST_PORT, "0")
.setServerBindAddress(this.hostName)
- .setServerPort(AvailablePortHelper.getRandomAvailableTCPPort())
- .set(DistributionConfig.START_DEV_REST_API_NAME, "true")
- .set(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(this.restServicePort))
- .set(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, this.hostName)
+ .setServerPort(0)
+ .set(START_DEV_REST_API, "true")
+ .set(HTTP_SERVICE_PORT, String.valueOf(this.restServicePort))
+ .set(HTTP_SERVICE_BIND_ADDRESS, this.hostName)
.setPdxReadSerialized(true)
.setWorkingDirectory(workingDirectory)
.build();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index 4be3b0f..af0318b 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -97,9 +97,9 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.START_DEV_REST_API_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, hostName);
- props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(restServicePort));
+ props.setProperty(START_DEV_REST_API, "true");
+ props.setProperty(HTTP_SERVICE_BIND_ADDRESS, hostName);
+ props.setProperty(HTTP_SERVICE_PORT, String.valueOf(restServicePort));
System.setProperty("javax.net.debug", "ssl,handshake");
configureSSL(props, sslProperties, clusterLevel);
@@ -276,16 +276,16 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, locators);
- props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
- props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
+ props.setProperty(JMX_MANAGER, "true");
+ props.setProperty(JMX_MANAGER_START, "true");
Cache cache = null;
configureSSL(props, sslProperties, false);
while (true) {
try {
DistributedSystem ds = getSystem(props);
- System.out.println("Creating cache with http-service-port " + props.getProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, "7070")
- + " and jmx-manager-port " + props.getProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "1099"));
+ System.out.println("Creating cache with http-service-port " + props.getProperty(HTTP_SERVICE_PORT, "7070")
+ + " and jmx-manager-port " + props.getProperty(JMX_MANAGER_PORT, "1099"));
cache = CacheFactory.create(ds);
System.out.println("Successfully created cache.");
break;
@@ -305,8 +305,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
//try a different port
int httpServicePort = AvailablePortHelper.getRandomAvailableTCPPort();
int jmxManagerPort = AvailablePortHelper.getRandomAvailableTCPPort();
- props.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, Integer.toString(httpServicePort));
- props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, Integer.toString(jmxManagerPort));
+ props.setProperty(HTTP_SERVICE_PORT, Integer.toString(httpServicePort));
+ props.setProperty(JMX_MANAGER_PORT, Integer.toString(jmxManagerPort));
System.out.println("Try a different http-service-port " + httpServicePort);
System.out.println("Try a different jmx-manager-port " + jmxManagerPort);
} else {
@@ -405,19 +405,19 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSimpleSSL() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, "JKS");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_TYPE, "JKS");
String restEndpoint = startInfraWithSSL(props,false);
validateConnection(restEndpoint, "SSL");
}
public void testSSLWithoutKeyStoreType() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
String restEndpoint = startInfraWithSSL(props, false);
validateConnection(restEndpoint, "SSL");
@@ -425,10 +425,10 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithSSLProtocol() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, "SSL");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
+ props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "SSL");
String restEndpoint = startInfraWithSSL(props, false);
validateConnection(restEndpoint, "SSL");
@@ -436,10 +436,10 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithTLSProtocol() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, "TLS");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
+ props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLS");
String restEndpoint = startInfraWithSSL(props, false);
validateConnection(restEndpoint, "TLS");
@@ -447,10 +447,10 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithTLSv11Protocol() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, "TLSv1.1");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
+ props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.1");
String restEndpoint = startInfraWithSSL(props, false);
validateConnection(restEndpoint, "TLSv1.1");
@@ -458,10 +458,10 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithTLSv12Protocol() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, "TLSv1.2");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
+ props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.2");
String restEndpoint = startInfraWithSSL(props, false);
validateConnection(restEndpoint, "TLSv1.2");
@@ -469,10 +469,10 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testWithMultipleProtocol() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, "SSL,TLSv1.2");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
+ props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "SSL,TLSv1.2");
String restEndpoint = startInfraWithSSL(props, false);
validateConnection(restEndpoint, "TLSv1.2");
@@ -481,17 +481,17 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithCipherSuite() throws Exception {
System.setProperty("javax.net.debug", "ssl");
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, "TLSv1.2");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
+ props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.2");
SSLContext ssl = SSLContext.getInstance("TLSv1.2");
ssl.init(null, null, new java.security.SecureRandom());
String[] cipherSuites = ssl.getSocketFactory().getSupportedCipherSuites();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_CIPHERS_NAME, cipherSuites[0]);
+ props.setProperty(HTTP_SERVICE_SSL_CIPHERS, cipherSuites[0]);
String restEndpoint = startInfraWithSSL(props, false);
validateConnection(restEndpoint, "TLSv1.2");
@@ -499,17 +499,17 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithMultipleCipherSuite() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, "TLSv1.2");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
+ props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.2");
SSLContext ssl = SSLContext.getInstance("TLSv1.2");
ssl.init(null, null, new java.security.SecureRandom());
String[] cipherSuites = ssl.getSocketFactory().getSupportedCipherSuites();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_CIPHERS_NAME, cipherSuites[0] + "," + cipherSuites[1]);
+ props.setProperty(HTTP_SERVICE_SSL_CIPHERS, cipherSuites[0] + "," + cipherSuites[1]);
String restEndpoint = startInfraWithSSL(props, false);
validateConnection(restEndpoint, "TLSv1.2");
@@ -517,15 +517,15 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testMutualAuthentication() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, "SSL");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME, "true");
+ props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
+ props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "SSL");
+ props.setProperty(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, "true");
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_NAME, jks.getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_TRUSTSTORE, jks.getCanonicalPath());
- props.setProperty(DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME, "password");
+ props.setProperty(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, "password");
String restEndpoint = startInfraWithSSL(props, false);
validateConnection(restEndpoint, "SSL");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
index e5e2d6e..a060c96 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java
@@ -87,20 +87,17 @@ public interface DistributedSystemConfig extends Cloneable {
String DEFAULT_NAME = "";
/** The name of the "mcastPort" property */
- String MCAST_PORT_NAME =
- MCAST_PORT;
+ String MCAST_PORT_NAME = MCAST_PORT;
/** The default value of the "mcastPort" property (10334) */
int DEFAULT_MCAST_PORT =
DistributionConfig.DEFAULT_MCAST_PORT;
/** The minimum mcastPort (0) */
- int MIN_MCAST_PORT =
- DistributionConfig.MIN_MCAST_PORT;
+ int MIN_MCAST_PORT = DistributionConfig.MIN_MCAST_PORT;
/** The maximum mcastPort (65535) */
- int MAX_MCAST_PORT =
- DistributionConfig.MAX_MCAST_PORT;
+ int MAX_MCAST_PORT = DistributionConfig.MAX_MCAST_PORT;
/** The name of the "mcastAddress" property */
String MCAST_ADDRESS_NAME = MCAST_ADDRESS;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
index cad20d0..d40addc 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java
@@ -1091,7 +1091,7 @@ public class DistributedSystemConfigImpl
buf.append(" " + DISABLE_TCP + "=");
buf.append(String.valueOf(this.disableTcp));
buf.append(lf);
- buf.append(" " + DistributionConfig.DISABLE_AUTO_RECONNECT_NAME + "=");
+ buf.append(" " + DISABLE_AUTO_RECONNECT + "=");
buf.append(String.valueOf(this.disableAutoReconnect));
buf.append(lf);
buf.append(" " + REMOTE_COMMAND_NAME + "=");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
index 80f1b82..674f46d 100755
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java
@@ -1574,12 +1574,6 @@ public abstract class DistributedSystem implements StatisticsFactory {
// fix for bug 33992
config = new Properties();
}
-// {
-// LogWriterI18n logger =
-// new LocalLogWriter(LocalLogWriter.ALL_LEVEL, System.out);
-// logger.info("DistributedSystem: Connecting with " + config,
-// new Exception("Stack trace"));
-// }
synchronized (existingSystemsLock) {
if (DistributionManager.isDedicatedAdminVM) {
// For a dedicated admin VM, check to see if there is already
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/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
index 40a11bb..c451708 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java
@@ -53,7 +53,7 @@ public interface SystemConfigurationProperties {
String ENABLE_CLUSTER_CONFIGURATION = "enable-cluster-configuration";
String ENABLE_NETWORK_PARTITION_DETECTION = "enable-network-partition-detection";
String ENABLE_TIME_STATISTICS = "enable-time-statistics";
- String ENFORE_UNIQUE_HOST = "enforce-unique-host";
+ 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";
@@ -79,9 +79,19 @@ public interface SystemConfigurationProperties {
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";
@@ -171,13 +181,34 @@ public interface SystemConfigurationProperties {
String SECURITY_SHIRO_INIT = SECURITY_PREFIX + "shiro-init";
String DISTRIBUTED_TRANSACTIONS = "distributed-transactions";
- @Deprecated
+ /**
+ * 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";
- @Deprecated
+
+ /**
+ * The name of the "SSLProtocols" property
+ *
+ * @deprecated as of 8.0 use {@link #CLUSTER_SSL_PROTOCOLS} instead.
+ */
String SSL_PROTOCOLS = "ssl-protocols";
- @Deprecated
+
+ /**
+ * The name of the "SSLCiphers" property
+ *
+ * @deprecated as of 8.0 use {@link #CLUSTER_SSL_CIPHERS} instead.
+ */
String SSL_CIPHERS = "ssl-ciphers";
- @Deprecated
+
+ /**
+ * 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/8975cbdf/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 864c93b..98c3faf 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
@@ -619,7 +619,7 @@ public abstract class AbstractDistributionConfig
* @return an empty list
*/
public List<String> getModifiableAttributes(){
- String[] modifiables = {HTTP_SERVICE_PORT,JMX_MANAGER_HTTP_PORT_NAME};
+ String[] modifiables = {HTTP_SERVICE_PORT,JMX_MANAGER_HTTP_PORT};
return Arrays.asList(modifiables);
};
@@ -962,7 +962,7 @@ public abstract class AbstractDistributionConfig
LocalizedStrings.AbstractDistributionConfig_SECURITY_LOG_FILE_NAME_0
.toLocalizedString(DEFAULT_SECURITY_LOG_FILE));
- m.put(SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME,
+ m.put(SECURITY_PEER_VERIFY_MEMBER_TIMEOUT,
LocalizedStrings.AbstractDistributionConfig_SECURITY_PEER_VERIFYMEMBER_TIMEOUT_NAME_0
.toLocalizedString(Integer.valueOf(DEFAULT_SECURITY_PEER_VERIFYMEMBER_TIMEOUT)));
@@ -974,11 +974,11 @@ public abstract class AbstractDistributionConfig
LocalizedStrings.AbstractDistributionConfig_USERDEFINED_PREFIX_NAME
.toLocalizedString());
- m.put(REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME,
+ m.put(REMOVE_UNRESPONSIVE_CLIENT,
LocalizedStrings.AbstractDistributionConfig_REMOVE_UNRESPONSIVE_CLIENT_PROP_NAME_0
.toLocalizedString(DEFAULT_REMOVE_UNRESPONSIVE_CLIENT));
- m.put(DELTA_PROPAGATION_PROP_NAME, "Whether delta propagation is enabled");
+ m.put(DELTA_PROPAGATION, "Whether delta propagation is enabled");
m.put(REMOTE_LOCATORS,
LocalizedStrings.AbstractDistributionConfig_REMOTE_DISTRIBUTED_SYSTEMS_NAME_0
@@ -987,7 +987,7 @@ public abstract class AbstractDistributionConfig
m.put(DISTRIBUTED_SYSTEM_ID, "An id that uniquely idenitifies this distributed system. " +
"Required when using portable data exchange objects and the WAN." +
"Must be the same on each member in this distributed system if set.");
- m.put(ENFORCE_UNIQUE_HOST_NAME, "Whether to require partitioned regions to put " +
+ m.put(ENFORCE_UNIQUE_HOST, "Whether to require partitioned regions to put " +
"redundant copies of data on different physical machines");
m.put(REDUNDANCY_ZONE, "The zone that this member is in. When this is set, " +