You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/06/08 00:05:20 UTC
[43/90] [abbrv] incubator-geode git commit: GEODE-1377: Initial move
of system properties from private to public
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 804314b..3d77dad 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -99,7 +99,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
// Create the cache in this VM
props.setProperty(SystemConfigurationProperties.NAME, "Controller");
- props.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ props.setProperty(GROUPS, "Group1");
getSystem(props);
getCache();
@@ -107,7 +107,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
vm.invoke(new SerializableRunnable() {
public void run() {
props.setProperty(SystemConfigurationProperties.NAME, vmName);
- props.setProperty(DistributionConfig.GROUPS_NAME, "Group2");
+ props.setProperty(GROUPS, "Group2");
getSystem(props);
getCache();
}
@@ -185,7 +185,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
// Create the cache in this VM
props.setProperty(SystemConfigurationProperties.NAME, "Controller");
- props.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ props.setProperty(GROUPS, "Group1");
getSystem(props);
getCache();
@@ -193,7 +193,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
vm.invoke(new SerializableRunnable() {
public void run() {
props.setProperty(SystemConfigurationProperties.NAME, vmName);
- props.setProperty(DistributionConfig.GROUPS_NAME, "Group2");
+ props.setProperty(GROUPS, "Group2");
getSystem(props);
getCache();
}
@@ -262,7 +262,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
// Create the cache in this VM
props.setProperty(SystemConfigurationProperties.NAME, "Controller");
- props.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ props.setProperty(GROUPS, "Group1");
getSystem(props);
getCache();
@@ -270,7 +270,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
vm.invoke(new SerializableRunnable() {
public void run() {
props.setProperty(SystemConfigurationProperties.NAME, vmName);
- props.setProperty(DistributionConfig.GROUPS_NAME, "Group2");
+ props.setProperty(GROUPS, "Group2");
getSystem(props);
getCache();
}
@@ -367,7 +367,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
// Start the default manager
Properties managerProps = new Properties();
managerProps.setProperty(MCAST_PORT, "0");
- managerProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+ managerProps.setProperty(GROUPS, groupName);
managerProps.setProperty(LOCATORS, "localhost:" + locatorPort);
setUpJmxManagerOnVm0ThenConnect(managerProps);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 60d80c9..02c4ba3 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -485,7 +485,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+ localProps.setProperty(GROUPS, groupName);
getSystem(localProps);
assertNotNull(getCache());
}
@@ -523,7 +523,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+ localProps.setProperty(GROUPS, groupName);
localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
Cache cache = getCache();
@@ -575,7 +575,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+ localProps.setProperty(GROUPS, groupName);
localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
Cache cache = getCache();
@@ -821,7 +821,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
final String diskStore2Name = "testCreateDiskStore2";
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group0");
+ localProps.setProperty(GROUPS, "Group0");
setUpJmxManagerOnVm0ThenConnect(localProps);
CommandResult cmdResult = executeCommand(CliStrings.LIST_DISK_STORE);
@@ -841,7 +841,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
getSystem(localProps);
getCache();
}
@@ -857,7 +857,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group2");
+ localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
getCache();
}
@@ -940,7 +940,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
final String region2Name = "testDestroyDiskStoreRegion2";
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group0");
+ localProps.setProperty(GROUPS, "Group0");
setUpJmxManagerOnVm0ThenConnect(localProps);
CommandResult cmdResult = executeCommand(CliStrings.LIST_DISK_STORE);
@@ -960,7 +960,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1,Group2");
+ localProps.setProperty(GROUPS, "Group1,Group2");
getSystem(localProps);
Cache cache = getCache();
@@ -986,7 +986,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group2");
+ localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
Cache cache = getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
index ba5974d..4fa3ddb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java
@@ -23,7 +23,6 @@ import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.execute.Function;
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.cache.functions.TestFunction;
import com.gemstone.gemfire.management.DistributedRegionMXBean;
import com.gemstone.gemfire.management.ManagementService;
@@ -43,6 +42,7 @@ import java.util.Properties;
import static com.gemstone.gemfire.test.dunit.Assert.*;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Dunit class for testing gemfire function commands : execute function, destroy function, list function
@@ -271,8 +271,8 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testExecuteFunctionOnMember() {
Properties localProps = new Properties();
- localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(NAME, "Manager");
+ localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
FunctionService.registerFunction(function);
@@ -303,7 +303,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
public void testExecuteFunctionOnMembers() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
FunctionService.registerFunction(function);
@@ -337,7 +337,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
public void testExecuteFunctionOnMembersWithArgs() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_RETURN_ARGS);
FunctionService.registerFunction(function);
@@ -373,7 +373,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
public void testExecuteFunctionOnMembersWithArgsAndCustomResultCollector() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_RETURN_ARGS);
FunctionService.registerFunction(function);
@@ -410,7 +410,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
public void testExecuteFunctionOnGroups() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group0");
+ localProps.setProperty(GROUPS, "Group0");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
FunctionService.registerFunction(function);
@@ -422,7 +422,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
getSystem(localProps);
Cache cache = getCache();
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
@@ -435,7 +435,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group2");
+ localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
Cache cache = getCache();
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
@@ -489,7 +489,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
public void testDestroyOnGroups() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group0");
+ localProps.setProperty(GROUPS, "Group0");
setUpJmxManagerOnVm0ThenConnect(localProps);
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
FunctionService.registerFunction(function);
@@ -501,7 +501,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
getSystem(localProps);
Cache cache = getCache();
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
@@ -515,7 +515,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group2");
+ localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
Cache cache = getCache();
Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1);
@@ -553,7 +553,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
public void testListFunction() {
// Create the default setup, putting the Manager VM into Group1
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
// Find no functions
@@ -579,7 +579,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
public void run() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group2");
+ localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
getCache();
@@ -598,7 +598,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase {
public void run() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group3");
+ localProps.setProperty(GROUPS, "Group3");
getSystem(localProps);
getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
index 4bd6cd5..4ff0325 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/HelpCommandsIntegrationTest.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.management.internal.cli.commands;
import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.management.internal.cli.CommandManager;
@@ -36,8 +35,7 @@ import org.junit.experimental.categories.Category;
import java.util.Map;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase.commandResultToString;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -59,9 +57,9 @@ public class HelpCommandsIntegrationTest {
Properties localProps = new Properties();
localProps.setProperty(LOCATORS, "");
localProps.setProperty(MCAST_PORT, "0");
- localProps.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
- localProps.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "true");
- localProps.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(jmxPort));
+ localProps.setProperty(JMX_MANAGER, "true");
+ localProps.setProperty(JMX_MANAGER_START, "true");
+ localProps.setProperty(JMX_MANAGER_PORT, String.valueOf(jmxPort));
new CacheFactory(localProps).create();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index 88ba958..b4a1f5f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -639,7 +639,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+ localProps.setProperty(GROUPS, groupName);
getSystem(localProps);
assertNotNull(getCache());
@@ -682,7 +682,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+ localProps.setProperty(GROUPS, groupName);
localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
Cache cache = getCache();
@@ -727,7 +727,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+ localProps.setProperty(GROUPS, groupName);
localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
Cache cache = getCache();
@@ -766,7 +766,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
public Object call() throws Exception {
Properties props = new Properties();
props.setProperty(SystemConfigurationProperties.NAME, VM1Name);
- props.setProperty(DistributionConfig.GROUPS_NAME, group1);
+ props.setProperty(GROUPS, group1);
getSystem(props);
Region parReg = createParReg(parRegName, getCache(), String.class, Stock.class);
parReg.put("MSFT", new Stock("MSFT", 27));
@@ -800,7 +800,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
public Object call() throws Exception {
Properties props = new Properties();
props.setProperty(SystemConfigurationProperties.NAME, VM1Name);
- props.setProperty(DistributionConfig.GROUPS_NAME, group1);
+ props.setProperty(GROUPS, group1);
getSystem(props);
Region parReg = createParReg(parRegName, getCache(), String.class, Stock.class);
parReg.put("MSFT", new Stock("MSFT", 27));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
index 385d200..3123399 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java
@@ -68,7 +68,7 @@ public class ListAndDescribeRegionDUnitTest extends CliCommandTestBase {
props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
props.setProperty(ENABLE_TIME_STATISTICS, "true");
props.setProperty(SystemConfigurationProperties.NAME, name);
- props.setProperty(DistributionConfig.GROUPS_NAME, groups);
+ props.setProperty(GROUPS, groups);
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
index 28ae887..1377551 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java
@@ -81,7 +81,7 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase {
props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
props.setProperty(ENABLE_TIME_STATISTICS, "true");
props.setProperty(SystemConfigurationProperties.NAME, name);
- props.setProperty(DistributionConfig.GROUPS_NAME, groups);
+ props.setProperty(GROUPS, groups);
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
index 689d33a..042df6f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java
@@ -72,7 +72,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
public void testGCForGroup() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
String command = "gc --group=Group1";
CommandResult cmdResult = executeCommand(command);
@@ -442,7 +442,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
public void testChangeLogLevelForGrps() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group0");
+ localProps.setProperty(GROUPS, "Group0");
final VM vm1 = Host.getHost(0).getVM(1);
final VM vm2 = Host.getHost(0).getVM(2);
@@ -455,7 +455,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, grp1);
+ localProps.setProperty(GROUPS, grp1);
getSystem(localProps);
Cache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
@@ -466,7 +466,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase {
@Override
public Object call() throws Exception {
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, grp2);
+ localProps.setProperty(GROUPS, grp2);
getSystem(localProps);
Cache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
index a60cf6c..6595ca0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java
@@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.RegionFactory;
import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.FileUtil;
import com.gemstone.gemfire.internal.logging.LogWriterImpl;
import com.gemstone.gemfire.management.cli.Result;
@@ -43,6 +42,7 @@ import java.util.Properties;
import static com.gemstone.gemfire.test.dunit.Assert.assertEquals;
import static com.gemstone.gemfire.test.dunit.Assert.fail;
import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Dunit class for testing gemfire function commands : export logs
@@ -87,7 +87,7 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes
public void testExportLogsForGroup() throws IOException {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, "Manager");
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
setUpJmxManagerOnVm0ThenConnect(localProps);
String dir = getCurrentTimeString();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index d1ee565..e1c906d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -78,7 +78,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
final String diskStoreName = "testAsyncEventQueueDiskStore";
Properties localProps = new Properties();
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group0");
+ localProps.setProperty(GROUPS, "Group0");
setUpJmxManagerOnVm0ThenConnect(localProps);
CommandResult cmdResult = executeCommand(CliStrings.LIST_ASYNC_EVENT_QUEUES);
@@ -95,7 +95,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group1");
+ localProps.setProperty(GROUPS, "Group1");
getSystem(localProps);
getCache();
}
@@ -107,7 +107,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
public void run() {
Properties localProps = new Properties();
localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, "Group2");
+ localProps.setProperty(GROUPS, "Group2");
getSystem(localProps);
getCache();
}
@@ -301,7 +301,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+ localProps.setProperty(GROUPS, groupName);
getSystem(localProps);
assertNotNull(getCache());
}
@@ -366,7 +366,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
- localProps.setProperty(DistributionConfig.GROUPS_NAME, groupName);
+ localProps.setProperty(GROUPS, groupName);
localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
getSystem(localProps);
cache = getCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
index 9a4aacd..2e4e2e4 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java
@@ -60,7 +60,7 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase {
props.setProperty(STATISTIC_SAMPLING_ENABLED, "true");
props.setProperty(ENABLE_TIME_STATISTICS, "true");
props.setProperty(SystemConfigurationProperties.NAME, name);
- props.setProperty(DistributionConfig.GROUPS_NAME, groups);
+ props.setProperty(GROUPS, groups);
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
index e56ab85..210bca1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilCustomRealmJUnitTest.java
@@ -17,11 +17,11 @@
package com.gemstone.gemfire.management.internal.security;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
import com.gemstone.gemfire.test.junit.categories.UnitTest;
import org.junit.BeforeClass;
import org.junit.experimental.categories.Category;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* this test and ShiroUtilWithIniFileJunitTest uses the same test body, but initialize the SecurityUtils differently.
@@ -32,8 +32,8 @@ import org.junit.experimental.categories.Category;
public class GeodeSecurityUtilCustomRealmJUnitTest extends GeodeSecurityUtilWithIniFileJUnitTest {
@BeforeClass
public static void beforeClass() throws Exception{
- props.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, JSONAuthorization.class.getName() + ".create");
- props.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
+ props.put(SECURITY_CLIENT_AUTHENTICATOR, JSONAuthorization.class.getName() + ".create");
+ props.put(SECURITY_CLIENT_ACCESSOR, JSONAuthorization.class.getName() + ".create");
JSONAuthorization.setUpWithJsonFile("shiro-ini.json");
GeodeSecurityUtil.initSecurity(props);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
index 8568b1a..be1f8f1 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/GeodeSecurityUtilWithIniFileJUnitTest.java
@@ -18,7 +18,6 @@
package com.gemstone.gemfire.management.internal.security;
import com.gemstone.gemfire.cache.operations.OperationContext;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.security.GeodeSecurityUtil;
import com.gemstone.gemfire.security.GemFireSecurityException;
import com.gemstone.gemfire.test.junit.categories.SecurityTest;
@@ -32,6 +31,7 @@ import org.junit.experimental.categories.Category;
import java.util.Properties;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* this test and ShiroUtilCustomRealmJUunitTest uses the same test body, but initialize the SecurityUtils differently.
@@ -42,7 +42,7 @@ public class GeodeSecurityUtilWithIniFileJUnitTest {
protected static Properties props = new Properties();
@BeforeClass
public static void beforeClass() throws Exception{
- props.setProperty(DistributionConfig.SECURITY_SHIRO_INIT_NAME, "shiro.ini");
+ props.setProperty(SECURITY_SHIRO_INIT, "shiro.ini");
GeodeSecurityUtil.initSecurity(props);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
index f4a4e59..ffb5d79 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java
@@ -24,8 +24,7 @@ import org.junit.rules.ExternalResource;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
public class JsonAuthorizationCacheStartRule extends ExternalResource {
private Cache cache;
@@ -58,14 +57,14 @@ public class JsonAuthorizationCacheStartRule extends ExternalResource {
properties.put(SystemConfigurationProperties.NAME, JsonAuthorizationCacheStartRule.class.getSimpleName());
properties.put(LOCATORS, "");
properties.put(MCAST_PORT, "0");
- properties.put(DistributionConfig.JMX_MANAGER_NAME, "true");
- properties.put(DistributionConfig.JMX_MANAGER_START_NAME, "true");
- properties.put(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(jmxManagerPort));
- properties.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(httpPort));
- properties.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME,
+ properties.put(JMX_MANAGER, "true");
+ properties.put(JMX_MANAGER_START, "true");
+ properties.put(JMX_MANAGER_PORT, String.valueOf(jmxManagerPort));
+ properties.put(HTTP_SERVICE_PORT, String.valueOf(httpPort));
+ properties.put(SECURITY_CLIENT_AUTHENTICATOR,
JSONAuthorization.class.getName() + ".create");
if (doAuthorization) {
- properties.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
+ properties.put(SECURITY_CLIENT_ACCESSOR, JSONAuthorization.class.getName() + ".create");
}
JSONAuthorization.setUpWithJsonFile(jsonFile);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
index 6ec3c10..010db07 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
@@ -18,7 +18,6 @@
package com.gemstone.gemfire.management.internal.security;
import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.management.cli.Result.Status;
import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
index f7dd2eb..b17edd0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
@@ -19,13 +19,11 @@ package com.gemstone.gemfire.management.internal.security;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
import com.gemstone.gemfire.distributed.SystemConfigurationProperties;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import org.junit.rules.ExternalResource;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
public class ShiroCacheStartRule extends ExternalResource {
private Cache cache;
@@ -43,11 +41,11 @@ public class ShiroCacheStartRule extends ExternalResource {
properties.put(SystemConfigurationProperties.NAME, ShiroCacheStartRule.class.getSimpleName());
properties.put(LOCATORS, "");
properties.put(MCAST_PORT, "0");
- properties.put(DistributionConfig.JMX_MANAGER_NAME, "true");
- properties.put(DistributionConfig.JMX_MANAGER_START_NAME, "true");
- properties.put(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(jmxManagerPort));
- properties.put(DistributionConfig.HTTP_SERVICE_PORT_NAME, "0");
- properties.put(DistributionConfig.SECURITY_SHIRO_INIT_NAME, shiroFile);
+ properties.put(JMX_MANAGER, "true");
+ properties.put(JMX_MANAGER_START, "true");
+ properties.put(JMX_MANAGER_PORT, String.valueOf(jmxManagerPort));
+ properties.put(HTTP_SERVICE_PORT, "0");
+ properties.put(SECURITY_SHIRO_INIT, shiroFile);
cache = new CacheFactory(properties).create();
cache.addCacheServer().start();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
index 5e135f9..0d60e81 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/memcached/IntegrationJUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.memcached;
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
import net.spy.memcached.MemcachedClient;
@@ -30,7 +29,7 @@ import java.net.InetSocketAddress;
import java.util.Properties;
import java.util.concurrent.Future;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.*;
/**
@@ -43,7 +42,7 @@ public class IntegrationJUnitTest {
public void testGemFireProperty() throws Exception {
Properties props = new Properties();
final int port = AvailablePortHelper.getRandomAvailableTCPPort();
- props.setProperty(DistributionConfig.MEMCACHED_PORT_NAME, port + "");
+ props.setProperty(MEMCACHED_PORT, port + "");
props.setProperty(MCAST_PORT, "0");
CacheFactory cf = new CacheFactory(props);
Cache cache = cf.create();
@@ -65,8 +64,8 @@ public class IntegrationJUnitTest {
public void testMemcachedBindAddress() throws Exception {
Properties props = new Properties();
final int port = AvailablePortHelper.getRandomAvailableTCPPort();
- props.setProperty(DistributionConfig.MEMCACHED_PORT_NAME, port + "");
- props.setProperty(DistributionConfig.MEMCACHED_BIND_ADDRESS_NAME, "127.0.0.1");
+ props.setProperty(MEMCACHED_PORT, port + "");
+ props.setProperty(MEMCACHED_BIND_ADDRESS, "127.0.0.1");
props.put(MCAST_PORT, "0");
CacheFactory cf = new CacheFactory(props);
Cache cache = cf.create();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
index f4a30d6..6ae9d88 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/DistributedSystemIdDUnitTest.java
@@ -107,7 +107,7 @@ public class DistributedSystemIdDUnitTest extends DistributedTestCase {
SerializableCallable createSystem = new SerializableCallable() {
public Object call() throws Exception {
Properties props = new Properties();
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, dsId);
props.setProperty(LOCATORS, "localhost[" + locatorPort + "]");
getSystem(props);
return null;
@@ -121,7 +121,7 @@ public class DistributedSystemIdDUnitTest extends DistributedTestCase {
public Object call() throws Exception {
int port = AvailablePortHelper.getRandomAvailableTCPPort();
Properties props = new Properties();
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, dsId);
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + port + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "]");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
index 2f93cc3..1c4db64 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/JSONPdxClientServerDUnitTest.java
@@ -25,7 +25,6 @@ import com.gemstone.gemfire.cache.client.ClientCacheFactory;
import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.Assert;
import com.gemstone.gemfire.internal.AvailablePortHelper;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -44,7 +43,7 @@ import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
*
*/
@@ -563,7 +562,7 @@ public class JSONPdxClientServerDUnitTest extends CacheTestCase {
public Object call() throws Exception {
Properties props = new Properties();
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, dsId);
getSystem(props);
AttributesFactory af = new AttributesFactory();
af.setScope(Scope.DISTRIBUTED_ACK);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
index 129727b..5f5465f 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxClientServerDUnitTest.java
@@ -34,8 +34,7 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
*
@@ -672,7 +671,7 @@ public class PdxClientServerDUnitTest extends CacheTestCase {
public Object call() throws Exception {
Properties props = new Properties();
props.setProperty(LOCATORS, "");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, dsId);
getSystem(props);
AttributesFactory af = new AttributesFactory();
af.setScope(Scope.DISTRIBUTED_ACK);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
index 561341d..0ae185a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/pdx/PdxInstanceJUnitTest.java
@@ -18,7 +18,6 @@ package com.gemstone.gemfire.pdx;
import com.gemstone.gemfire.DataSerializer;
import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.HeapDataOutputStream;
import com.gemstone.gemfire.internal.Version;
import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
@@ -38,7 +37,7 @@ import java.lang.reflect.InvocationTargetException;
import java.math.BigInteger;
import java.util.*;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
import static org.junit.Assert.*;
/**
@@ -55,7 +54,7 @@ public class PdxInstanceJUnitTest {
// make it a loner
this.c = (GemFireCacheImpl) new CacheFactory()
.set(MCAST_PORT, "0")
- .set(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "255")
+ .set(DISTRIBUTED_SYSTEM_ID, "255")
.setPdxReadSerialized(true)
.create();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
index 2b3a427..582d084 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/generator/LdapUserCredentialGenerator.java
@@ -29,6 +29,8 @@ import java.security.Principal;
import java.util.Properties;
import java.util.Random;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class LdapUserCredentialGenerator extends CredentialGenerator {
private static final Logger logger = LogService.getLogger();
@@ -97,7 +99,7 @@ public class LdapUserCredentialGenerator extends CredentialGenerator {
final Properties props = new Properties();
props.setProperty(UserPasswordAuthInit.USER_NAME, USER_PREFIX + ((index % 10) + 1));
props.setProperty(UserPasswordAuthInit.PASSWORD, USER_PREFIX + ((index % 10) + 1));
- props.setProperty(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, CIPHERS[RANDOM.nextInt(CIPHERS.length)]);
+ props.setProperty(SECURITY_CLIENT_DHALGO, CIPHERS[RANDOM.nextInt(CIPHERS.length)]);
if (serverAuthEnabled) {
final String keyStoreFile = TestUtil.getResourcePath(PKCSCredentialGenerator.class, PKCSCredentialGenerator.keyStoreDir + "/publickeyfile");
@@ -134,7 +136,7 @@ public class LdapUserCredentialGenerator extends CredentialGenerator {
throw new IllegalArgumentException("LDAP: [" + userName + "] not a valid user");
}
- props.setProperty(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, CIPHERS[RANDOM.nextInt(CIPHERS.length)]);
+ props.setProperty(SECURITY_CLIENT_DHALGO, CIPHERS[RANDOM.nextInt(CIPHERS.length)]);
if (serverAuthEnabled) {
final String keyStoreFile = TestUtil.getResourcePath(PKCSCredentialGenerator.class, PKCSCredentialGenerator.keyStoreDir + "/publickeyfile");
@@ -150,7 +152,7 @@ public class LdapUserCredentialGenerator extends CredentialGenerator {
final Properties props = new Properties();
props.setProperty(UserPasswordAuthInit.USER_NAME, "invalid" + index);
props.setProperty(UserPasswordAuthInit.PASSWORD, "none");
- props.setProperty(DistributionConfig.SECURITY_CLIENT_DHALGO_NAME, CIPHERS[RANDOM.nextInt(CIPHERS.length)]);
+ props.setProperty(SECURITY_CLIENT_DHALGO, CIPHERS[RANDOM.nextInt(CIPHERS.length)]);
if (serverAuthEnabled) {
final String keyStoreFile = TestUtil.getResourcePath(PKCSCredentialGenerator.class, PKCSCredentialGenerator.keyStoreDir + "/publickeyfile");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
index fa54b7a..f4a5897 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/DistributedTestUtils.java
@@ -17,7 +17,6 @@
package com.gemstone.gemfire.test.dunit;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
import com.gemstone.gemfire.distributed.internal.membership.gms.MembershipManagerHelper;
import com.gemstone.gemfire.internal.InternalDataSerializer;
@@ -30,6 +29,8 @@ import java.util.Properties;
import static org.junit.Assert.assertEquals;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
/**
* <code>DistributedTestUtils</code> provides static utility methods that
* affect the runtime environment or artifacts generated by a DistributedTest.
@@ -125,8 +126,8 @@ public class DistributedTestUtils {
Properties dsProperties = DUnitEnv.get().getDistributedSystemProperties();
// our tests do not expect auto-reconnect to be on by default
- if (!dsProperties.contains(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME)) {
- dsProperties.put(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+ if (!dsProperties.contains(DISABLE_AUTO_RECONNECT)) {
+ dsProperties.put(DISABLE_AUTO_RECONNECT, "true");
}
for (Iterator<Map.Entry<Object,Object>> iterator = properties.entrySet().iterator(); iterator.hasNext();) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
index 8f3cd28..a1fa2dd 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
@@ -250,7 +250,7 @@ public class DUnitLauncher {
Properties p = getDistributedSystemProperties();
// I never want this locator to end up starting a jmx manager
// since it is part of the unit test framework
- p.setProperty(DistributionConfig.JMX_MANAGER_NAME, "false");
+ p.setProperty(JMX_MANAGER, "false");
//Disable the shared configuration on this locator.
//Shared configuration tests create their own locator
p.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
@@ -259,7 +259,7 @@ public class DUnitLauncher {
System.setProperty(GMSJoinLeave.BYPASS_DISCOVERY_PROPERTY, "true");
// disable auto-reconnect - tests fly by so fast that it will never be
// able to do so successfully anyway
- p.setProperty(DistributionConfig.DISABLE_AUTO_RECONNECT_NAME, "true");
+ p.setProperty(DISABLE_AUTO_RECONNECT, "true");
try {
Locator.startLocatorAndDS(locatorPort, locatorLogFile, p);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
index adc73bb..1ba65ce 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Add.java
@@ -62,7 +62,7 @@ public class WANBootStrapping_Site1_Add {
// Create a locator and a cache
System.out.println("Creating cache ...It will take some time..");
Cache cache = new CacheFactory().set(MCAST_PORT,
- "0").set(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "" + 1).set(
+ "0").set(DISTRIBUTED_SYSTEM_ID, "" + 1).set(
LOCATORS, "localhost[" + 10101 + "]").set(
START_LOCATOR,
"localhost[" + 10101
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
index c469b4f..c002a2c 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site1_Remove.java
@@ -49,8 +49,8 @@ public class WANBootStrapping_Site1_Remove {
//start a stand alone locator with distributed-system-is = -1
Properties properties = new Properties();
properties.setProperty(MCAST_PORT, "0");
- properties.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+ (-1));
- properties.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + 20202 + "]");
+ properties.setProperty(DISTRIBUTED_SYSTEM_ID, ""+ (-1));
+ properties.setProperty(REMOTE_LOCATORS, "localhost[" + 20202 + "]");
properties.setProperty(LOG_LEVEL, "warning");
Locator locator = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
index 059aa99..b2d14b9 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Add.java
@@ -61,10 +61,10 @@ public class WANBootStrapping_Site2_Add {
System.out.println("Creating cache ...It will take some time..");
Cache cache = new CacheFactory()
.set(MCAST_PORT, "0")
- .set(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+2)
+ .set(DISTRIBUTED_SYSTEM_ID, ""+2)
.set(LOCATORS, "localhost[" + 20202 + "]")
.set(START_LOCATOR, "localhost[" + 20202 + "],server=true,peer=true,hostname-for-clients=localhost")
- .set(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + 10101 + "]")
+ .set(REMOTE_LOCATORS, "localhost[" + 10101 + "]")
.set(LOG_LEVEL, "warning")
.create();
System.out.println("Cache Created");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
index 751f13d..8abaa9e 100644
--- a/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
+++ b/geode-core/src/test/java/com/main/WANBootStrapping_Site2_Remove.java
@@ -46,8 +46,8 @@ public class WANBootStrapping_Site2_Remove {
System.out.println("Starting a locator with negative ds id -2");
Properties properties = new Properties();
properties.setProperty(MCAST_PORT, "0");
- properties.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+ (-2));
- properties.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + 10101 + "]");
+ properties.setProperty(DISTRIBUTED_SYSTEM_ID, ""+ (-2));
+ properties.setProperty(REMOTE_LOCATORS, "localhost[" + 10101 + "]");
properties.setProperty(LOG_LEVEL, "warning");
Locator locator = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
index 290660c..5f51611 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -107,9 +107,9 @@ public class CqStateDUnitTest extends HelperTestCase {
public Properties getAuthenticatedServerProperties() {
Properties props = new Properties();
props.put(MCAST_PORT, "0");
- props.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, CloseCacheAuthorization.class.getName() + ".create");
- props.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_PP_NAME, CloseCacheAuthorization.class.getName() + ".create");
- props.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, DummyAuthenticator.class.getName() + ".create");
+ props.put(SECURITY_CLIENT_ACCESSOR, CloseCacheAuthorization.class.getName() + ".create");
+ props.put(SECURITY_CLIENT_ACCESSOR_PP, CloseCacheAuthorization.class.getName() + ".create");
+ props.put(SECURITY_CLIENT_AUTHENTICATOR, DummyAuthenticator.class.getName() + ".create");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index 1a0fa28..17e85ec 100755
--- a/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -28,7 +28,6 @@ import com.gemstone.gemfire.cache.server.CacheServer;
import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
import com.gemstone.gemfire.cache.util.CqListenerAdapter;
import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.i18n.LogWriterI18n;
import com.gemstone.gemfire.internal.AvailablePort;
import com.gemstone.gemfire.internal.cache.CacheServerImpl;
@@ -41,8 +40,7 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Properties;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
/**
* Test client to server flow for delta propogation
@@ -442,7 +440,7 @@ public class ClientToServerDeltaDUnitTest extends DistributedTestCase {
secondUpdate = null;
error = false;
Properties props = new Properties();
- props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME,
+ props.setProperty(DELTA_PROPAGATION,
enableDelta.toString());
new ClientToServerDeltaDUnitTest("temp").createCache(props);
AttributesFactory factory = new AttributesFactory();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
index c321b53..bc83d7d 100644
--- a/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
+++ b/geode-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -241,7 +241,7 @@ public class CacheServerManagementDUnitTest extends LocatorTestBase {
props.setProperty(MCAST_PORT, String.valueOf(0));
props.setProperty(LOCATORS, otherLocators);
props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
- props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
+ props.setProperty(JMX_MANAGER_HTTP_PORT, "0");
props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
File logFile = new File(getUniqueName() + "-locator" + locatorPort + ".log");
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
index b7945b9..98675d0 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
@@ -24,6 +24,7 @@ import com.gemstone.gemfire.DataSerializer;
import com.gemstone.gemfire.cache.*;
import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
import com.gemstone.gemfire.cache.lucene.*;
+import com.gemstone.gemfire.cache.lucene.internal.LuceneIndexStats;
import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl;
import com.gemstone.gemfire.cache.lucene.internal.directory.RegionDirectory;
import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
----------------------------------------------------------------------
diff --git a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
index f4f3e40..4d9e959 100644
--- a/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
+++ b/geode-pulse/src/test/java/com/vmware/gemfire/tools/pulse/tests/Server.java
@@ -18,7 +18,6 @@
*/
package com.vmware.gemfire.tools.pulse.tests;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.security.shiro.CustomAuthRealm;
import com.gemstone.gemfire.internal.security.shiro.JMXShiroAuthenticator;
import com.gemstone.gemfire.management.internal.security.AccessControlMBean;
@@ -45,6 +44,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*;
+
public class Server {
private static final String DEFAULT_HOST = "127.0.0.1"; //"localhost"
private static final int DEFAULT_PORT = 9999;
@@ -64,8 +65,8 @@ public class Server {
if (jsonAuthFile != null) {
System.setProperty("spring.profiles.active", "pulse.authentication.gemfire");
Properties props = new Properties();
- props.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, JSONAuthorization.class.getName() + ".create");
- //props.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
+ props.put(SECURITY_CLIENT_AUTHENTICATOR, JSONAuthorization.class.getName() + ".create");
+ //props.put(SECURITY_CLIENT_ACCESSOR, JSONAuthorization.class.getName() + ".create");
JSONAuthorization.setUpWithJsonFile(jsonAuthFile);
Map<String, Object> env = new HashMap<String, Object>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index 0fb0b3e..0a9069d 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -768,10 +768,10 @@ public class UpdateVersionDUnitTest extends DistributedTestCase {
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + port + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
- props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+ props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
props.setProperty(USE_CLUSTER_CONFIGURATION, "false");
props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
test.getSystem(props);
@@ -928,7 +928,7 @@ public class UpdateVersionDUnitTest extends DistributedTestCase {
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + port + "]");
props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
props.setProperty(USE_CLUSTER_CONFIGURATION, "false");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 0ae3739..28ccd96 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -159,7 +159,7 @@ public class WANTestBase extends DistributedTestCase{
WANTestBase test = new WANTestBase(getTestMethodName());
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
StringBuffer localLocatorBuffer = new StringBuffer(localLocatorsList.toString());
localLocatorBuffer.deleteCharAt(0);
localLocatorBuffer.deleteCharAt(localLocatorBuffer.lastIndexOf("]"));
@@ -173,7 +173,7 @@ public class WANTestBase extends DistributedTestCase{
remoteLocatorBuffer.deleteCharAt(remoteLocatorBuffer.lastIndexOf("]"));
String remoteLocator = remoteLocatorBuffer.toString();
remoteLocator = remoteLocator.replace(" ", "");
- props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, remoteLocator);
+ props.setProperty(REMOTE_LOCATORS, remoteLocator);
test.getSystem(props);
}
@@ -183,7 +183,7 @@ public class WANTestBase extends DistributedTestCase{
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + port + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
test.getSystem(props);
@@ -196,7 +196,7 @@ public class WANTestBase extends DistributedTestCase{
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + port + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
test.getSystem(props);
@@ -209,7 +209,7 @@ public class WANTestBase extends DistributedTestCase{
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + locatorPort + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
test.getSystem(props);
@@ -222,7 +222,7 @@ public class WANTestBase extends DistributedTestCase{
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + locatorPort + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
test.getSystem(props);
@@ -235,10 +235,10 @@ public class WANTestBase extends DistributedTestCase{
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + port + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
- props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+ props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
test.getSystem(props);
return port;
}
@@ -248,10 +248,10 @@ public class WANTestBase extends DistributedTestCase{
Properties props = test.getDistributedSystemProperties();
props.put(LOG_LEVEL, "fine");
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + oldPort + "]");
props.setProperty(START_LOCATOR, "localhost[" + oldPort + "],server=true,peer=true,hostname-for-clients=localhost");
- props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+ props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
test.getSystem(props);
}
@@ -262,10 +262,10 @@ public class WANTestBase extends DistributedTestCase{
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + port + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
- props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+ props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
test.getSystem(props);
return port;
}
@@ -277,10 +277,10 @@ public class WANTestBase extends DistributedTestCase{
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + localPort + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
- props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+ props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
test.getSystem(props);
return port;
}
@@ -292,10 +292,10 @@ public class WANTestBase extends DistributedTestCase{
int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
Properties props = test.getDistributedSystemProperties();
props.setProperty(MCAST_PORT, "0");
- props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+ props.setProperty(DISTRIBUTED_SYSTEM_ID, ""+dsId);
props.setProperty(LOCATORS, "localhost[" + localPort + "]");
props.setProperty(START_LOCATOR, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
- props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+ props.setProperty(REMOTE_LOCATORS, "localhost[" + remoteLocPort + "]");
test.getSystem(props);
return port;
}
@@ -860,10 +860,10 @@ public class WANTestBase extends DistributedTestCase{
WANTestBase test = new WANTestBase(getTestMethodName());
Properties props = test.getDistributedSystemProperties();
if (management) {
- props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
- props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false");
- props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
- props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
+ props.setProperty(JMX_MANAGER, "true");
+ props.setProperty(JMX_MANAGER_START, "false");
+ props.setProperty(JMX_MANAGER_PORT, "0");
+ props.setProperty(JMX_MANAGER_HTTP_PORT, "0");
}
props.setProperty(MCAST_PORT, "0");
props.setProperty(LOCATORS, "localhost[" + locPort + "]");
@@ -881,18 +881,18 @@ public class WANTestBase extends DistributedTestCase{
Properties gemFireProps = test.getDistributedSystemProperties();
gemFireProps.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewaySslenabled));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_PROTOCOLS_NAME, gatewaySslprotocols);
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_CIPHERS_NAME, gatewaySslciphers);
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(gatewaySslRequireAuth));
+ gemFireProps.put(GATEWAY_SSL_ENABLED, String.valueOf(gatewaySslenabled));
+ gemFireProps.put(GATEWAY_SSL_PROTOCOLS, gatewaySslprotocols);
+ gemFireProps.put(GATEWAY_SSL_CIPHERS, gatewaySslciphers);
+ gemFireProps.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION, String.valueOf(gatewaySslRequireAuth));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_TYPE_NAME, "jks");
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_NAME,
+ gemFireProps.put(GATEWAY_SSL_KEYSTORE_TYPE, "jks");
+ gemFireProps.put(GATEWAY_SSL_KEYSTORE,
TestUtil.getResourcePath(WANTestBase.class, "/com/gemstone/gemfire/cache/client/internal/client.keystore"));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_PASSWORD_NAME, "password");
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_NAME,
+ gemFireProps.put(GATEWAY_SSL_KEYSTORE_PASSWORD, "password");
+ gemFireProps.put(GATEWAY_SSL_TRUSTSTORE,
TestUtil.getResourcePath(WANTestBase.class, "/com/gemstone/gemfire/cache/client/internal/client.truststore"));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME, "password");
+ gemFireProps.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD, "password");
gemFireProps.setProperty(MCAST_PORT, "0");
gemFireProps.setProperty(LOCATORS, "localhost[" + locPort + "]");
@@ -946,8 +946,7 @@ public class WANTestBase extends DistributedTestCase{
public static Integer createCacheServer() {
CacheServer server1 = cache.addCacheServer();
assertNotNull(server1);
- int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
- server1.setPort(port);
+ server1.setPort(0);
try {
server1.start();
}
@@ -1975,18 +1974,18 @@ public class WANTestBase extends DistributedTestCase{
Properties gemFireProps = test.getDistributedSystemProperties();
gemFireProps.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewaySslenabled));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_PROTOCOLS_NAME, gatewaySslprotocols);
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_CIPHERS_NAME, gatewaySslciphers);
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(gatewaySslRequireAuth));
+ gemFireProps.put(GATEWAY_SSL_ENABLED, String.valueOf(gatewaySslenabled));
+ gemFireProps.put(GATEWAY_SSL_PROTOCOLS, gatewaySslprotocols);
+ gemFireProps.put(GATEWAY_SSL_CIPHERS, gatewaySslciphers);
+ gemFireProps.put(GATEWAY_SSL_REQUIRE_AUTHENTICATION, String.valueOf(gatewaySslRequireAuth));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_TYPE_NAME, "jks");
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_NAME,
+ gemFireProps.put(GATEWAY_SSL_KEYSTORE_TYPE, "jks");
+ gemFireProps.put(GATEWAY_SSL_KEYSTORE,
TestUtil.getResourcePath(WANTestBase.class, "/com/gemstone/gemfire/cache/client/internal/cacheserver.keystore"));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_PASSWORD_NAME, "password");
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_NAME,
+ gemFireProps.put(GATEWAY_SSL_KEYSTORE_PASSWORD, "password");
+ gemFireProps.put(GATEWAY_SSL_TRUSTSTORE,
TestUtil.getResourcePath(WANTestBase.class, "/com/gemstone/gemfire/cache/client/internal/cacheserver.truststore"));
- gemFireProps.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME, "password");
+ gemFireProps.put(GATEWAY_SSL_TRUSTSTORE_PASSWORD, "password");
gemFireProps.setProperty(MCAST_PORT, "0");
gemFireProps.setProperty(LOCATORS, "localhost[" + locPort + "]");
@@ -3685,7 +3684,7 @@ public class WANTestBase extends DistributedTestCase{
// of WANTestBase (instead of instances of the subclass). So we can't override
// this method so that only the off-heap subclasses allocate off heap memory.
Properties props = new Properties();
- props.setProperty(DistributionConfig.OFF_HEAP_MEMORY_SIZE_NAME, "300m");
+ props.setProperty(OFF_HEAP_MEMORY_SIZE, "300m");
return props;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
index a8776c3..b668827 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
@@ -187,11 +187,11 @@ public class NewWanAuthenticationDUnitTest extends WANTestBase {
Properties authProps = new Properties();
if (clientauthenticator != null) {
authProps.setProperty(
- DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME,
+ SECURITY_CLIENT_AUTHENTICATOR,
clientauthenticator);
}
if (accessor != null) {
- authProps.setProperty(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME,
+ authProps.setProperty(SECURITY_CLIENT_ACCESSOR,
accessor);
}
if (clientAuthInit != null) {