Repository: incubator-geode Updated Branches: refs/heads/develop 1e97dbb68 -> b42d6e991
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java index c92d18c..8af63ed 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java @@ -16,18 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.wancommand; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.util.List; -import java.util.Properties; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - 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; @@ -35,6 +24,17 @@ import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +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.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.pause; @Category(DistributedTest.class) public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase { @@ -52,8 +52,8 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -85,8 +85,8 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -131,8 +131,8 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -177,8 +177,8 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -228,8 +228,8 @@ public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java index 9f13f74..3a86f0f 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java @@ -16,18 +16,7 @@ */ package com.gemstone.gemfire.internal.cache.wan.wancommand; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.util.List; -import java.util.Properties; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - 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; @@ -35,6 +24,17 @@ import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +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.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.pause; @Category(DistributedTest.class) public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { @@ -52,8 +52,8 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -86,8 +86,8 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -134,8 +134,8 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -181,8 +181,8 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -233,8 +233,8 @@ public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase { int punePort = (Integer) puneLocator.invoke(() -> getLocatorPort()); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/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 ccea2a3..5cccdbb 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 @@ -30,6 +30,8 @@ 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.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; import static com.gemstone.gemfire.test.dunit.Wait.pause; @@ -49,9 +51,9 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -94,9 +96,9 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -155,9 +157,9 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -199,9 +201,9 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -265,9 +267,9 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -346,9 +348,9 @@ public class WanCommandGatewaySenderStartDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/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 bdb35bc..7abb3a9 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 @@ -16,16 +16,6 @@ */ package com.gemstone.gemfire.internal.cache.wan.wancommand; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.util.List; -import java.util.Properties; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.cli.Result; @@ -34,6 +24,17 @@ import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.test.dunit.IgnoredException; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +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.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.pause; @Category(DistributedTest.class) public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { @@ -53,9 +54,9 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -88,9 +89,9 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -154,9 +155,9 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -200,9 +201,9 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -272,9 +273,9 @@ public class WanCommandGatewaySenderStopDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/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 79ad8a8..20977c7 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 @@ -30,6 +30,8 @@ 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.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; import static com.gemstone.gemfire.test.dunit.Wait.pause; @@ -45,9 +47,9 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -74,9 +76,9 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -127,9 +129,9 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); + props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort )); @@ -177,9 +179,9 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); + props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort )); @@ -239,9 +241,9 @@ public class WanCommandListDUnitTest extends WANCommandTestBase { Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); + props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort )); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/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 a4e843c..a95ae17 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 @@ -16,13 +16,6 @@ */ package com.gemstone.gemfire.internal.cache.wan.wancommand; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.util.List; -import java.util.Properties; - import com.gemstone.gemfire.distributed.DistributedMember; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.management.cli.Result; @@ -30,10 +23,18 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.test.junit.categories.DistributedTest; - import org.junit.Test; 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.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.pause; + @Category(DistributedTest.class) public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { @@ -45,9 +46,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -84,9 +85,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -126,9 +127,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -192,9 +193,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -263,9 +264,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -347,9 +348,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -383,9 +384,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -460,9 +461,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -511,9 +512,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); @@ -592,9 +593,9 @@ public class WanCommandPauseResumeDUnitTest extends WANCommandTestBase { Integer punePort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); + props.setProperty(MCAST_PORT, "0"); props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "1"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort + "]"); + props.setProperty(LOCATORS, "localhost[" + punePort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, punePort )); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java index 82c28ee..e2d813c 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java @@ -16,24 +16,24 @@ */ package com.gemstone.gemfire.internal.cache.wan.wancommand; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; - -import java.util.List; -import java.util.Properties; - -import org.junit.Test; -import org.junit.experimental.categories.Category; - 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; import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData; import com.gemstone.gemfire.management.internal.cli.result.TabularResultData; import com.gemstone.gemfire.test.junit.categories.DistributedTest; +import org.junit.Test; +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.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.test.dunit.Wait.pause; @Category(DistributedTest.class) public class WanCommandStatusDUnitTest extends WANCommandTestBase{ @@ -46,8 +46,8 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort )); @@ -136,8 +136,8 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort )); @@ -237,8 +237,8 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort )); @@ -331,8 +331,8 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort )); @@ -408,8 +408,8 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort )); @@ -482,8 +482,8 @@ public class WanCommandStatusDUnitTest extends WANCommandTestBase{ Integer lnPort = (Integer) vm1.invoke(() -> createFirstLocatorWithDSId( 1 )); Properties props = getDistributedSystemProperties(); - props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + lnPort + "]"); + props.setProperty(MCAST_PORT, "0"); + props.setProperty(LOCATORS, "localhost[" + lnPort + "]"); setUpJmxManagerOnVm0ThenConnect(props); Integer nyPort = (Integer) vm2.invoke(() -> createFirstRemoteLocator( 2, lnPort )); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java index 53c54ab..7243add 100644 --- a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java +++ b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java @@ -16,30 +16,6 @@ */ package com.gemstone.gemfire.management.internal.configuration; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.internal.AvailablePortHelper.*; -import static com.gemstone.gemfire.internal.FileUtil.*; -import static com.gemstone.gemfire.internal.lang.StringUtils.*; -import static com.gemstone.gemfire.management.internal.cli.CliUtil.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.test.dunit.Host.*; -import static com.gemstone.gemfire.test.dunit.IgnoredException.*; -import static com.gemstone.gemfire.test.dunit.Wait.*; -import static org.apache.commons.io.FileUtils.*; - -import java.io.File; -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; -import java.util.Set; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.Region; @@ -75,11 +51,29 @@ import com.gemstone.gemfire.test.dunit.SerializableCallable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.WaitCriterion; import com.gemstone.gemfire.test.junit.categories.DistributedTest; - import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import java.io.File; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.*; +import java.util.Map.Entry; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts; +import static com.gemstone.gemfire.internal.FileUtil.delete; +import static com.gemstone.gemfire.internal.FileUtil.deleteMatching; +import static com.gemstone.gemfire.internal.lang.StringUtils.isBlank; +import static com.gemstone.gemfire.management.internal.cli.CliUtil.getAllNormalMembers; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.test.dunit.Host.getHost; +import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException; +import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; +import static org.apache.commons.io.FileUtils.*; + @Category(DistributedTest.class) public class ClusterConfigurationDUnitTest extends CliCommandTestBase { @@ -186,10 +180,10 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { File workingDir = new File(newMemberWorkingDir); workingDir.mkdirs(); - localProps.setProperty(MCAST_PORT_NAME, "0"); - localProps.setProperty(LOCATORS_NAME, "localhost:" + locatorPort); - localProps.setProperty(NAME_NAME, ClusterConfigurationDUnitTest.newMember); - localProps.setProperty(USE_CLUSTER_CONFIGURATION_NAME, "true"); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); + localProps.setProperty(NAME, ClusterConfigurationDUnitTest.newMember); + localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true"); localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath()); getSystem(localProps); @@ -293,10 +287,10 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { File workingDir = new File(newMemberWorkDir); workingDir.mkdirs(); - localProps.setProperty(MCAST_PORT_NAME, "0"); - localProps.setProperty(LOCATORS_NAME, "localhost:" + locatorPort); - localProps.setProperty(NAME_NAME, ClusterConfigurationDUnitTest.newMember); - localProps.setProperty(USE_CLUSTER_CONFIGURATION_NAME, "true"); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); + localProps.setProperty(NAME, ClusterConfigurationDUnitTest.newMember); + localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true"); localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath()); getSystem(localProps); @@ -363,10 +357,10 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { File workingDir = new File(newMemberWorkingDir); workingDir.mkdirs(); - localProps.setProperty(MCAST_PORT_NAME, "0"); - localProps.setProperty(LOCATORS_NAME, "localhost:" + locatorPort); - localProps.setProperty(NAME_NAME, ClusterConfigurationDUnitTest.newMember); - localProps.setProperty(USE_CLUSTER_CONFIGURATION_NAME, "true"); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); + localProps.setProperty(NAME, ClusterConfigurationDUnitTest.newMember); + localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true"); localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath()); getSystem(localProps); @@ -469,10 +463,10 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { File workingDir = new File(newMemberWorkingDir); workingDir.mkdirs(); - localProps.setProperty(MCAST_PORT_NAME, "0"); - localProps.setProperty(LOCATORS_NAME, "localhost:" + locatorPort); - localProps.setProperty(NAME_NAME, ClusterConfigurationDUnitTest.newMember); - localProps.setProperty(USE_CLUSTER_CONFIGURATION_NAME, "true"); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locatorPort); + localProps.setProperty(NAME, ClusterConfigurationDUnitTest.newMember); + localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true"); localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath()); getSystem(localProps); @@ -558,20 +552,20 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File(locatorLogPath); final Properties locatorProps = new Properties(); - locatorProps.setProperty(NAME_NAME, locator1Name); - locatorProps.setProperty(MCAST_PORT_NAME, "0"); - locatorProps.setProperty(LOG_LEVEL_NAME, "config"); - locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); - locatorProps.setProperty(JMX_MANAGER_NAME, "true"); - locatorProps.setProperty(JMX_MANAGER_START_NAME, "true"); - locatorProps.setProperty(JMX_MANAGER_BIND_ADDRESS_NAME, String.valueOf(jmxHost)); - locatorProps.setProperty(JMX_MANAGER_PORT_NAME, String.valueOf(jmxPort)); + locatorProps.setProperty(NAME, locator1Name); + locatorProps.setProperty(MCAST_PORT, "0"); + locatorProps.setProperty(LOG_LEVEL, "config"); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); + locatorProps.setProperty(JMX_MANAGER, "true"); + locatorProps.setProperty(JMX_MANAGER_START, "true"); + locatorProps.setProperty(JMX_MANAGER_BIND_ADDRESS, String.valueOf(jmxHost)); + locatorProps.setProperty(JMX_MANAGER_PORT, String.valueOf(jmxPort)); File clusterConfigDir = new File(clusterConfigPath); assertTrue(clusterConfigDir.mkdir()); locatorProps.setProperty(CLUSTER_CONFIGURATION_DIR, clusterConfigDir.getCanonicalPath()); - locatorProps.setProperty(HTTP_SERVICE_PORT_NAME, String.valueOf(httpPort)); + locatorProps.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpPort)); final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps); @@ -627,15 +621,15 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File(locatorLogPath); final Properties locatorProps = new Properties(); - locatorProps.setProperty(NAME_NAME, locator1Name); - locatorProps.setProperty(MCAST_PORT_NAME, "0"); - locatorProps.setProperty(LOG_LEVEL_NAME, "config"); - locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION_NAME, "true"); - locatorProps.setProperty(JMX_MANAGER_NAME, "true"); - locatorProps.setProperty(JMX_MANAGER_START_NAME, "true"); - locatorProps.setProperty(JMX_MANAGER_BIND_ADDRESS_NAME, String.valueOf(jmxHost)); - locatorProps.setProperty(JMX_MANAGER_PORT_NAME, String.valueOf(jmxPort)); - locatorProps.setProperty(HTTP_SERVICE_PORT_NAME, String.valueOf(httpPort)); + locatorProps.setProperty(NAME, locator1Name); + locatorProps.setProperty(MCAST_PORT, "0"); + locatorProps.setProperty(LOG_LEVEL, "config"); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); + locatorProps.setProperty(JMX_MANAGER, "true"); + locatorProps.setProperty(JMX_MANAGER_START, "true"); + locatorProps.setProperty(JMX_MANAGER_BIND_ADDRESS, String.valueOf(jmxHost)); + locatorProps.setProperty(JMX_MANAGER_PORT, String.valueOf(jmxPort)); + locatorProps.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpPort)); final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps); @@ -678,10 +672,10 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase { File workingDir = new File(dataMemberWorkingDir); workingDir.mkdirs(); - localProps.setProperty(MCAST_PORT_NAME, "0"); - localProps.setProperty(LOCATORS_NAME, "localhost:" + locator1Port); - localProps.setProperty(NAME_NAME, ClusterConfigurationDUnitTest.dataMember); - localProps.setProperty(USE_CLUSTER_CONFIGURATION_NAME, "true"); + localProps.setProperty(MCAST_PORT, "0"); + localProps.setProperty(LOCATORS, "localhost:" + locator1Port); + localProps.setProperty(NAME, ClusterConfigurationDUnitTest.dataMember); + localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true"); localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath()); getSystem(localProps); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/RestApiPathProvider.java ---------------------------------------------------------------------- diff --git a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/RestApiPathProvider.java b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/RestApiPathProvider.java index 47316ed..b35dce9 100644 --- a/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/RestApiPathProvider.java +++ b/geode-web-api/src/main/java/com/gemstone/gemfire/rest/internal/web/swagger/config/RestApiPathProvider.java @@ -16,19 +16,16 @@ */ package com.gemstone.gemfire.rest.internal.web.swagger.config; -import javax.servlet.ServletContext; - -import com.gemstone.gemfire.admin.internal.InetAddressUtil; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import com.gemstone.gemfire.internal.SocketCreator; import com.gemstone.gemfire.internal.lang.StringUtils; import com.mangofactory.swagger.core.SwaggerPathProvider; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.util.UriComponentsBuilder; +import javax.servlet.ServletContext; import java.net.UnknownHostException; @SuppressWarnings("unused") http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java index 3f7e19b..7b20343 100644 --- a/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java +++ b/geode-web/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConnectCommandWithHttpAndSSLDUnitTest.java @@ -16,27 +16,26 @@ */ package com.gemstone.gemfire.management.internal.cli.commands; -import static com.gemstone.gemfire.distributed.internal.DistributionConfig.*; -import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*; -import static com.gemstone.gemfire.test.dunit.Assert.*; -import static com.gemstone.gemfire.util.test.TestUtil.*; - -import java.io.File; -import java.util.Properties; -import javax.net.ssl.HostnameVerifier; -import javax.net.ssl.HttpsURLConnection; -import javax.net.ssl.SSLSession; - import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh; import com.gemstone.gemfire.management.internal.cli.result.CommandResult; import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder; import com.gemstone.gemfire.test.junit.categories.DistributedTest; import com.gemstone.gemfire.test.junit.categories.SecurityTest; - import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLSession; +import java.io.File; +import java.util.Properties; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; +import static com.gemstone.gemfire.management.internal.cli.i18n.CliStrings.*; +import static com.gemstone.gemfire.test.dunit.Assert.*; +import static com.gemstone.gemfire.util.test.TestUtil.getResourcePath; + /** * @since GemFire 8.1 */ @@ -67,14 +66,14 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { @Test public void testMutualAuthentication() throws Exception { Properties serverProps = new Properties(); - serverProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); - serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, "JKS"); - serverProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS_NAME, "SSL"); - serverProps.setProperty(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME, "true"); - serverProps.setProperty(HTTP_SERVICE_SSL_TRUSTSTORE_NAME, jks.getCanonicalPath()); - serverProps.setProperty(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME, "password"); + serverProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); + serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_TYPE, "JKS"); + serverProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "SSL"); + serverProps.setProperty(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, "true"); + serverProps.setProperty(HTTP_SERVICE_SSL_TRUSTSTORE, jks.getCanonicalPath()); + serverProps.setProperty(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, "password"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__KEY_STORE, jks.getCanonicalPath()); @@ -90,10 +89,10 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { @Test public void testSimpleSSL() throws Exception { Properties serverProps = new Properties(); - serverProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); - serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, "JKS"); + serverProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); + serverProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_TYPE, "JKS"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__TRUST_STORE, jks.getCanonicalPath()); @@ -106,9 +105,9 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { @Test public void testSSLWithoutKeyStoreType() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); + localProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__TRUST_STORE, jks.getCanonicalPath()); @@ -121,10 +120,10 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { @Test public void testSSLWithSSLProtocol() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); - localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS_NAME,"SSL"); + localProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); + localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "SSL"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__TRUST_STORE, jks.getCanonicalPath()); @@ -137,10 +136,10 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { @Test public void testSSLWithTLSProtocol() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); - localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS_NAME,"TLS"); + localProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); + localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLS"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__TRUST_STORE, jks.getCanonicalPath()); @@ -153,10 +152,10 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { @Test public void testSSLWithTLSv11Protocol() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); - localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS_NAME,"TLSv1.1"); + localProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); + localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.1"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__TRUST_STORE, jks.getCanonicalPath()); @@ -169,10 +168,10 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { @Test public void testSSLWithTLSv12Protocol() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); - localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS_NAME,"TLSv1.2"); + localProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); + localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.2"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__TRUST_STORE, jks.getCanonicalPath()); @@ -185,10 +184,10 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { @Test public void testWithMultipleProtocol() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); - localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS_NAME,"SSL,TLSv1.2"); + localProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); + localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "SSL,TLSv1.2"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__TRUST_STORE, jks.getCanonicalPath()); @@ -202,10 +201,10 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { @Test public void testSSLWithCipherSuite() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); - localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS_NAME, "TLSv1.2"); + localProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); + localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.2"); //Its bad to hard code here. But using SocketFactory.getDefaultCiphers() somehow is not working with the option //"https.cipherSuites" which is required to restrict cipher suite with HttpsURLConnection @@ -215,8 +214,8 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { sslContext.init(null, null, new java.security.SecureRandom()); String[] cipherSuites = sslContext.getSocketFactory().getSupportedCipherSuites();*/ - - localProps.setProperty(HTTP_SERVICE_SSL_CIPHERS_NAME,"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"); + + localProps.setProperty(HTTP_SERVICE_SSL_CIPHERS, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__TRUST_STORE, jks.getCanonicalPath()); @@ -234,11 +233,11 @@ public class ConnectCommandWithHttpAndSSLDUnitTest extends CliCommandTestBase { System.setProperty("javax.net.debug", "ssl,handshake,failure"); Properties localProps = new Properties(); - localProps.setProperty(HTTP_SERVICE_SSL_ENABLED_NAME, "true"); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_NAME, jks.getCanonicalPath()); - localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, "password"); - localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS_NAME,"TLSv1.2"); - localProps.setProperty(HTTP_SERVICE_SSL_CIPHERS_NAME,"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_EMPTY_RENEGOTIATION_INFO_SCSV"); + localProps.setProperty(HTTP_SERVICE_SSL_ENABLED, "true"); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE, jks.getCanonicalPath()); + localProps.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password"); + localProps.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.2"); + localProps.setProperty(HTTP_SERVICE_SSL_CIPHERS, "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_EMPTY_RENEGOTIATION_INFO_SCSV"); Properties clientProps = new Properties(); clientProps.setProperty(CONNECT__TRUST_STORE, jks.getCanonicalPath());
