http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java index 042df6f..d675b14 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsDUnitTest.java @@ -71,7 +71,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { @Test public void testGCForGroup() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(NAME, "Manager"); localProps.setProperty(GROUPS, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); String command = "gc --group=Group1"; @@ -441,7 +441,7 @@ public class MiscellaneousCommandsDUnitTest extends CliCommandTestBase { @Test public void testChangeLogLevelForGrps() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(NAME, "Manager"); localProps.setProperty(GROUPS, "Group0"); final VM vm1 = Host.getHost(0).getVM(1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java index 6595ca0..6bdf917 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MiscellaneousCommandsExportLogsPart3DUnitTest.java @@ -86,7 +86,7 @@ public class MiscellaneousCommandsExportLogsPart3DUnitTest extends CliCommandTes @Test public void testExportLogsForGroup() throws IOException { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(NAME, "Manager"); localProps.setProperty(GROUPS, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); String dir = getCurrentTimeString(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java index e1c906d..e53e6ea 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java @@ -94,7 +94,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase { diskStoreDir.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); + localProps.setProperty(NAME, vm1Name); localProps.setProperty(GROUPS, "Group1"); getSystem(localProps); getCache(); @@ -106,7 +106,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase { vm2.invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name); + localProps.setProperty(NAME, vm2Name); localProps.setProperty(GROUPS, "Group2"); getSystem(localProps); getCache(); @@ -261,7 +261,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File("locator-" + locatorPort + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator"); + locatorProps.setProperty(NAME, "Locator"); locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(LOG_LEVEL, "fine"); locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java index a77aeee..3b1f75e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java @@ -178,7 +178,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase { localProps.setProperty(MCAST_PORT, "0"); localProps.setProperty(LOCATORS, "localhost:" + locator1Port); localProps.setProperty(GROUPS, groupName); - localProps.setProperty(SystemConfigurationProperties.NAME, "DataMember"); + localProps.setProperty(NAME, "DataMember"); getSystem(localProps); Cache cache = getCache(); assertNotNull(cache); @@ -286,7 +286,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase { public void run() { final File locatorLogFile = new File(locator2LogFilePath); final Properties locatorProps = new Properties(); - locatorProps.setProperty(SystemConfigurationProperties.NAME, locator2Name); + locatorProps.setProperty(NAME, locator2Name); locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(LOG_LEVEL, "fine"); locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java index cc7017a..b439e20 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowMetricsDUnitTest.java @@ -53,7 +53,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase { private void createLocalSetUp() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Controller"); + localProps.setProperty(NAME, "Controller"); getSystem(localProps); Cache cache = getCache(); RegionFactory<Integer, Integer> dataRegionFactory = cache.createRegionFactory(RegionShortcut.REPLICATE); @@ -74,7 +74,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase { vm1.invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); + localProps.setProperty(NAME, vm1Name); getSystem(localProps); Cache cache = getCache(); @@ -117,7 +117,7 @@ public class ShowMetricsDUnitTest extends CliCommandTestBase { vm1.invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); + localProps.setProperty(NAME, vm1Name); getSystem(localProps); Cache cache = getCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java index 2e4e2e4..44600f6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ShowStackTraceDUnitTest.java @@ -59,7 +59,7 @@ public class ShowStackTraceDUnitTest extends CliCommandTestBase { props.setProperty(LOG_LEVEL, "info"); props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); props.setProperty(ENABLE_TIME_STATISTICS, "true"); - props.setProperty(SystemConfigurationProperties.NAME, name); + props.setProperty(NAME, name); props.setProperty(GROUPS, groups); return props; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java index e6ee71b..06e5fbb 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java @@ -94,7 +94,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { final File locatorLogFile = new File(testName + "-locator-" + locator1Port + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(SystemConfigurationProperties.NAME, locator1Name); + locatorProps.setProperty(NAME, locator1Name); locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(LOG_LEVEL, "fine"); locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); @@ -143,7 +143,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { final File locatorLogFile = new File(testName + "-locator-" + locator2Port + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(SystemConfigurationProperties.NAME, locator2Name); + locatorProps.setProperty(NAME, locator2Name); locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(LOG_LEVEL, "fine"); locatorProps.setProperty(LOCATORS, "localhost:" + locator1Port); @@ -229,7 +229,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { final File locatorLogFile = new File(testName + "-locator-" + locator1Port + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator1"); + locatorProps.setProperty(NAME, "Locator1"); locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(LOG_LEVEL, "info"); locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); @@ -321,7 +321,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase { final File locatorLogFile = new File(testName + "-locator-" + locator2Port + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator2"); + locatorProps.setProperty(NAME, "Locator2"); locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(LOG_LEVEL, "info"); locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java index 3e21a7a..97b56d3 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java @@ -306,7 +306,7 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase { disconnectFromDS(); final Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, "member" + i); + props.setProperty(NAME, "member" + i); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, getLocatorStr(locatorPorts)); props.setProperty(LOG_FILE, "server-" + i + ".log"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java index ffb5d79..e2e951f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/JsonAuthorizationCacheStartRule.java @@ -54,7 +54,7 @@ public class JsonAuthorizationCacheStartRule extends ExternalResource { protected void before() throws Throwable { Properties properties = new Properties(); - properties.put(SystemConfigurationProperties.NAME, JsonAuthorizationCacheStartRule.class.getSimpleName()); + properties.put(NAME, JsonAuthorizationCacheStartRule.class.getSimpleName()); properties.put(LOCATORS, ""); properties.put(MCAST_PORT, "0"); properties.put(JMX_MANAGER, "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java index b17edd0..2887195 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java @@ -38,7 +38,7 @@ public class ShiroCacheStartRule extends ExternalResource { protected void before() throws Throwable { Properties properties = new Properties(); - properties.put(SystemConfigurationProperties.NAME, ShiroCacheStartRule.class.getSimpleName()); + properties.put(NAME, ShiroCacheStartRule.class.getSimpleName()); properties.put(LOCATORS, ""); properties.put(MCAST_PORT, "0"); properties.put(JMX_MANAGER, "true");
