http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java index 249e189..93c6360 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java @@ -97,7 +97,7 @@ public class WANLocatorServerDUnitTest extends WANTestBase { WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = test.getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "" + 1); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "" + 1); props.setProperty(LOCATORS, "localhost[" + port1 + "],localhost[" + port2 + "],localhost[" + port3 + "]"); props.setProperty(START_LOCATOR, "localhost["
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java index bd69adc..8a327a7 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java @@ -79,7 +79,7 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = 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"); InternalDistributedSystem ds = getSystem(props); @@ -91,10 +91,10 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite(); Properties props = 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 + "]"); getSystem(props); return port; } @@ -111,7 +111,7 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, "localhost[" + locPort + "]"); - props.setProperty(DistributionConfig.GROUPS_NAME, groups); + props.setProperty(GROUPS, groups); InternalDistributedSystem ds = getSystem(props); cache = CacheFactory.create(ds); } @@ -244,7 +244,7 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, "localhost[" + locPort + "]"); - props.setProperty(DistributionConfig.GROUPS_NAME, groups); + props.setProperty(GROUPS, groups); InternalDistributedSystem ds = getSystem(props); cache = CacheFactory.create(ds); @@ -281,7 +281,7 @@ public abstract class WANCommandTestBase extends CliCommandTestBase { props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, "localhost[" + locPort + "]"); - props.setProperty(DistributionConfig.GROUPS_NAME, groups); + props.setProperty(GROUPS, groups); InternalDistributedSystem ds = getSystem(props); cache = CacheFactory.create(ds); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java index ab07226..9ce3de6 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java @@ -19,7 +19,6 @@ package com.gemstone.gemfire.internal.cache.wan.wancommand; import com.gemstone.gemfire.cache.wan.GatewaySender; import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException; import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; @@ -34,8 +33,7 @@ import java.util.ArrayList; import java.util.List; 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.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; @@ -65,7 +63,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -114,7 +112,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -186,7 +184,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -242,7 +240,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -317,7 +315,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -390,7 +388,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -455,7 +453,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -520,7 +518,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -582,7 +580,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -651,7 +649,7 @@ public class WanCommandCreateGatewaySenderDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java index 5cccdbb..10e55e1 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java @@ -17,7 +17,6 @@ package com.gemstone.gemfire.internal.cache.wan.wancommand; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; @@ -30,8 +29,7 @@ import org.junit.experimental.categories.Category; import java.util.List; 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.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; import static com.gemstone.gemfire.test.dunit.Wait.pause; @@ -52,7 +50,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -97,7 +95,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -158,7 +156,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -202,7 +200,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -268,7 +266,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -349,7 +347,7 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java index 7abb3a9..c51853d 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java @@ -17,7 +17,6 @@ package com.gemstone.gemfire.internal.cache.wan.wancommand; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; @@ -30,8 +29,7 @@ import org.junit.experimental.categories.Category; import java.util.List; 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.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; import static com.gemstone.gemfire.test.dunit.Wait.pause; @@ -55,7 +53,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -90,7 +88,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -156,7 +154,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -202,7 +200,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -274,7 +272,7 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java index 20977c7..91c9e45 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java @@ -16,7 +16,6 @@ */ package com.gemstone.gemfire.internal.cache.wan.wancommand; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.json.GfJsonException; @@ -30,8 +29,7 @@ import org.junit.experimental.categories.Category; import java.util.List; 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.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; import static com.gemstone.gemfire.test.dunit.Wait.pause; @@ -48,7 +46,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -77,7 +75,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -130,7 +128,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -180,7 +178,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -242,7 +240,7 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8975cbdf/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java index a95ae17..abefb3b 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java @@ -17,7 +17,6 @@ package com.gemstone.gemfire.internal.cache.wan.wancommand; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.cli.Result; import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; @@ -29,8 +28,7 @@ import org.junit.experimental.categories.Category; import java.util.List; 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.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; import static com.gemstone.gemfire.test.dunit.Wait.pause; @@ -47,7 +45,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -86,7 +84,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -128,7 +126,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -194,7 +192,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -265,7 +263,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -349,7 +347,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -385,7 +383,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -462,7 +460,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -513,7 +511,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); @@ -594,7 +592,7 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Properties props = getDistributedSystemProperties(); props.setProperty(MCAST_PORT, "0"); - props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); + props.setProperty(DISTRIBUTED_SYSTEM_ID, "1"); props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props);
