GEODE-1377: Initial move of system properties from private to public
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ff81dbfc Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ff81dbfc Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ff81dbfc Branch: refs/heads/develop Commit: ff81dbfc6fe193f30d9607fa39be6c8f72b56688 Parents: 8975cbd Author: Udo Kohlmeyer <[email protected]> Authored: Tue May 31 12:02:27 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Thu Jun 2 10:01:42 2016 +1000 ---------------------------------------------------------------------- .../LauncherLifecycleCommandsJUnitTest.java | 2 +- .../SharedConfigurationEndToEndDUnitTest.java | 4 +-- .../gemfire/admin/DistributedSystemConfig.java | 2 +- .../gemfire/distributed/AbstractLauncher.java | 2 +- .../gemfire/distributed/LocatorLauncher.java | 6 ++-- .../gemfire/distributed/ServerLauncher.java | 6 ++-- .../SystemConfigurationProperties.java | 4 +-- .../internal/AbstractDistributionConfig.java | 2 +- .../internal/DistributionConfig.java | 2 +- .../internal/DistributionConfigImpl.java | 4 +-- .../internal/SharedConfiguration.java | 4 ++- .../internal/cli/help/utils/HelpUtils.java | 4 +-- .../com/gemstone/gemfire/GemFireTestCase.java | 2 +- .../gemfire/LocalStatisticsJUnitTest.java | 2 +- .../com/gemstone/gemfire/LonerDMJUnitTest.java | 2 +- .../functional/IndexCreationJUnitTest.java | 12 ++++---- .../DistributedMulticastRegionDUnitTest.java | 2 +- .../distributed/AbstractLauncherTest.java | 32 ++++++++++---------- .../distributed/DistributedMemberDUnitTest.java | 14 ++++----- .../LocatorLauncherIntegrationTest.java | 2 +- .../LocatorLauncherLocalIntegrationTest.java | 24 +++++++-------- .../distributed/LocatorLauncherTest.java | 6 ++-- .../ServerLauncherIntegrationTest.java | 2 +- .../ServerLauncherLocalIntegrationTest.java | 2 +- .../gemfire/distributed/ServerLauncherTest.java | 6 ++-- .../internal/DistributionManagerDUnitTest.java | 8 ++--- .../InternalDistributedSystemJUnitTest.java | 4 +-- .../cache/DiskRegCacheXmlJUnitTest.java | 2 +- .../DiskRegCachexmlGeneratorJUnitTest.java | 2 +- ...ributedRegionFunctionExecutionDUnitTest.java | 2 +- .../cli/HeadlessGfshIntegrationTest.java | 2 +- .../cli/commands/CliCommandTestBase.java | 4 +-- .../cli/commands/ConfigCommandsDUnitTest.java | 20 ++++++------ ...eateAlterDestroyRegionCommandsDUnitTest.java | 8 ++--- .../cli/commands/DeployCommandsDUnitTest.java | 14 ++++----- .../commands/DiskStoreCommandsDUnitTest.java | 14 ++++----- .../cli/commands/FunctionCommandsDUnitTest.java | 14 ++++----- .../commands/GemfireDataCommandsDUnitTest.java | 2 +- ...WithCacheLoaderDuringCacheMissDUnitTest.java | 4 +-- .../cli/commands/IndexCommandsDUnitTest.java | 4 +-- ...stAndDescribeDiskStoreCommandsDUnitTest.java | 4 +-- .../ListAndDescribeRegionDUnitTest.java | 2 +- .../cli/commands/ListIndexCommandDUnitTest.java | 4 +-- .../cli/commands/MemberCommandsDUnitTest.java | 2 +- .../MiscellaneousCommandsDUnitTest.java | 4 +-- ...laneousCommandsExportLogsPart3DUnitTest.java | 2 +- .../cli/commands/QueueCommandsDUnitTest.java | 6 ++-- .../SharedConfigurationCommandsDUnitTest.java | 4 +-- .../cli/commands/ShowMetricsDUnitTest.java | 6 ++-- .../cli/commands/ShowStackTraceDUnitTest.java | 2 +- .../SharedConfigurationDUnitTest.java | 8 ++--- .../SharedConfigurationUsingDirDUnitTest.java | 2 +- .../JsonAuthorizationCacheStartRule.java | 2 +- .../internal/security/ShiroCacheStartRule.java | 2 +- 54 files changed, 151 insertions(+), 153 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java index b97cef3..97251a6 100755 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java @@ -103,7 +103,7 @@ public class LauncherLifecycleCommandsJUnitTest { gemfireProperties.setProperty(LOG_LEVEL, "config"); gemfireProperties.setProperty(LOG_FILE, StringUtils.EMPTY_STRING); gemfireProperties.setProperty(MCAST_PORT, "0"); - gemfireProperties.setProperty(SystemConfigurationProperties.NAME, "tidepool"); + gemfireProperties.setProperty(NAME, "tidepool"); getLauncherLifecycleCommands().addGemFireSystemProperties(commandLine, gemfireProperties); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java index d03e211..5c3d99f 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java @@ -345,7 +345,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File(locatorLogPath); final Properties locatorProps = new Properties(); - locatorProps.setProperty(SystemConfigurationProperties.NAME, locator1Name); + locatorProps.setProperty(NAME, locator1Name); locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(SystemConfigurationProperties.LOG_LEVEL, "config"); locatorProps.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "true"); @@ -393,7 +393,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase { Properties localProps = new Properties(); localProps.setProperty(MCAST_PORT, "0"); localProps.setProperty(SystemConfigurationProperties.LOCATORS, "localhost:" + locator1Port); - localProps.setProperty(SystemConfigurationProperties.NAME, "DataMember"); + localProps.setProperty(NAME, "DataMember"); getSystem(localProps); Cache cache = getCache(); assertNotNull(cache); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java index a060c96..1c53e42 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/DistributedSystemConfig.java @@ -81,7 +81,7 @@ public interface DistributedSystemConfig extends Cloneable { String DEFAULT_SYSTEM_ID = "Default System"; /** The name of the "name" property. See {@link #getSystemName()}. */ - String NAME_NAME = SystemConfigurationProperties.NAME; + String NAME_NAME = NAME; /** The default value of the "name" property (""). See {@link #getSystemName()}. */ String DEFAULT_NAME = ""; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java index 9be157c..cc27a03 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/AbstractLauncher.java @@ -285,7 +285,7 @@ public abstract class AbstractLauncher<T extends Comparable<T>> implements Runna } if (!StringUtils.isBlank(getMemberName())) { - distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, getMemberName()); + distributedSystemProperties.setProperty(NAME, getMemberName()); } // Set any other GemFire Distributed System/Distribution Config directory-based properties as necessary http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java index 1e350e7..f759886 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java @@ -1711,9 +1711,9 @@ public final class LocatorLauncher extends AbstractLauncher<String> { protected void validateOnStart() { if (Command.START.equals(getCommand())) { if (StringUtils.isBlank(getMemberName()) - && !isSet(System.getProperties(), DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.NAME) - && !isSet(getDistributedSystemProperties(), SystemConfigurationProperties.NAME) - && !isSet(loadGemFireProperties(DistributedSystem.getPropertyFileURL()), SystemConfigurationProperties.NAME)) + && !isSet(System.getProperties(), DistributionConfig.GEMFIRE_PREFIX + NAME) + && !isSet(getDistributedSystemProperties(), NAME) + && !isSet(loadGemFireProperties(DistributedSystem.getPropertyFileURL()), NAME)) { throw new IllegalStateException(LocalizedStrings.Launcher_Builder_MEMBER_NAME_VALIDATION_ERROR_MESSAGE .toLocalizedString("Locator")); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java index fe441fd..f19ce09 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ServerLauncher.java @@ -2264,9 +2264,9 @@ public class ServerLauncher extends AbstractLauncher<String> { protected void validateOnStart() { if (Command.START.equals(getCommand())) { if (StringUtils.isBlank(getMemberName()) - && !isSet(System.getProperties(), DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.NAME) - && !isSet(getDistributedSystemProperties(), SystemConfigurationProperties.NAME) - && !isSet(loadGemFireProperties(DistributedSystem.getPropertyFileURL()), SystemConfigurationProperties.NAME)) + && !isSet(System.getProperties(), DistributionConfig.GEMFIRE_PREFIX + NAME) + && !isSet(getDistributedSystemProperties(), NAME) + && !isSet(loadGemFireProperties(DistributedSystem.getPropertyFileURL()), NAME)) { throw new IllegalStateException(LocalizedStrings.Launcher_Builder_MEMBER_NAME_VALIDATION_ERROR_MESSAGE .toLocalizedString("Server")); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java index c451708..df320b2 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/SystemConfigurationProperties.java @@ -16,7 +16,6 @@ */ package com.gemstone.gemfire.distributed; -import com.gemstone.gemfire.distributed.internal.ConfigAttribute; /** * Created by ukohlmeyer on 26/05/2016. @@ -130,9 +129,8 @@ public interface SystemConfigurationProperties { String MEMCACHED_PROTOCOL = "memcached-protocol"; /** - * The name of the "name" property + * The "name" property, representing the system's name */ - @ConfigAttribute(type = String.class) String NAME = "name"; String REDUNDANCY_ZONE = "redundancy-zone"; String REMOTE_LOCATORS = "remote-locators"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java index 98c3faf..4212bb3 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java @@ -809,7 +809,7 @@ public abstract class AbstractDistributionConfig LocalizedStrings.AbstractDistributionConfig_SERVER_BIND_ADDRESS_NAME_0 .toLocalizedString(DEFAULT_BIND_ADDRESS)); - m.put(SystemConfigurationProperties.NAME, "A name that uniquely identifies a member in its distributed system." + + m.put(NAME, "A name that uniquely identifies a member in its distributed system." + " Multiple members in the same distributed system can not have the same name." + " Defaults to \"\"."); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java index dbd9c79..1cce999 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java @@ -79,7 +79,7 @@ public interface DistributionConfig extends Config, LogConfig, SystemConfigurati void setName(String value); /** - * The name of the "name" property + * The "name" property, representing the system's name */ @ConfigAttribute(type = String.class) String NAME_NAME = NAME; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java index 196d8f3..e8e4f3b 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java @@ -35,8 +35,6 @@ import java.net.URL; import java.net.UnknownHostException; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; - /** * Provides an implementation of <code>DistributionConfig</code> that * knows how to read the configuration file. @@ -1574,7 +1572,7 @@ public class DistributionConfigImpl if (value == null) { value = DEFAULT_NAME; } - this.name = (String) checkAttribute(SystemConfigurationProperties.NAME, value); + this.name = (String) checkAttribute(NAME, value); } public void setTcpPort(int value) { this.tcpPort = (Integer) checkAttribute(TCP_PORT, value); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java index ccccee3..3493a87 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java @@ -83,6 +83,8 @@ import com.gemstone.gemfire.management.internal.configuration.messages.SharedCon import com.gemstone.gemfire.management.internal.configuration.utils.XmlUtils; import com.gemstone.gemfire.management.internal.configuration.utils.ZipUtils; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + @SuppressWarnings({ "deprecation", "unchecked" }) public class SharedConfiguration { @@ -142,7 +144,7 @@ public class SharedConfiguration { public SharedConfiguration(Cache cache) throws IOException { this.cache = (GemFireCacheImpl)cache; this.configDiskDirName = CLUSTER_CONFIG_DISK_DIR_PREFIX + cache.getDistributedSystem().getName(); - String clusterConfigDir = cache.getDistributedSystem().getProperties().getProperty(DistributionConfig.CLUSTER_CONFIGURATION_DIR); + String clusterConfigDir = cache.getDistributedSystem().getProperties().getProperty(CLUSTER_CONFIGURATION_DIR); if (StringUtils.isBlank(clusterConfigDir)) { clusterConfigDir = System.getProperty("user.dir"); } else { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java index bf71373..b15feda 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/help/utils/HelpUtils.java @@ -74,7 +74,7 @@ public class HelpUtils { public static Help getHelp(CommandTarget commandTarget) { List<Block> blocks = new ArrayList<Block>(); // First we will have the block for NAME of the command - blocks.add(block(SystemConfigurationProperties.NAME, row(commandTarget.getCommandName()))); + blocks.add(block(NAME, row(commandTarget.getCommandName()))); // Now add synonyms if any if (commandTarget.getSynonyms() != null) { blocks.add(block(SYNONYMS_NAME, row(commandTarget.getSynonyms()))); @@ -186,7 +186,7 @@ public class HelpUtils { public static NewHelp getNewHelp(CommandTarget commandTarget, boolean withinShell) { DataNode root = new DataNode(null, new ArrayList<DataNode>()); // First we will have the block for NAME of the command - DataNode name = new DataNode(SystemConfigurationProperties.NAME, new ArrayList<DataNode>()); + DataNode name = new DataNode(NAME, new ArrayList<DataNode>()); name.addChild(new DataNode(commandTarget.getCommandName(), null)); root.addChild(name); if (withinShell) {// include availabilty info http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java index 30b5c27..cd4e615 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java @@ -48,7 +48,7 @@ public abstract class GemFireTestCase { // make it a loner p.setProperty(MCAST_PORT, "0"); p.setProperty(LOCATORS, ""); - p.setProperty(SystemConfigurationProperties.NAME, getName()); + p.setProperty(NAME, getName()); DistributedSystem.connect(p); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java index dccdf79..5270738 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/LocalStatisticsJUnitTest.java @@ -42,7 +42,7 @@ public class LocalStatisticsJUnitTest extends StatisticsTestCase { props.setProperty(STATISTIC_ARCHIVE_FILE, "StatisticsTestCase-localTest.gfs"); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); - props.setProperty(SystemConfigurationProperties.NAME, getName()); + props.setProperty(NAME, getName()); this.system = DistributedSystem.connect(props); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java index 09605c7..dedfa67 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/LonerDMJUnitTest.java @@ -168,7 +168,7 @@ public class LonerDMJUnitTest { cfg.setProperty(MCAST_PORT, "0"); cfg.setProperty(LOCATORS, ""); cfg.setProperty(ROLES, "lonelyOne"); - cfg.setProperty(SystemConfigurationProperties.NAME, name); + cfg.setProperty(NAME, name); DistributedSystem ds = DistributedSystem.connect(cfg); System.out.println("MemberId = " + ds.getMemberId()); assertEquals(host.toString(), ds.getDistributedMember().getHost()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java index 3128dc7..17763d2 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/functional/IndexCreationJUnitTest.java @@ -849,7 +849,7 @@ public class IndexCreationJUnitTest{ { Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(NAME, "test"); props.setProperty(MCAST_PORT, "0"); props.setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-with-eviction.xml").toURI().getPath()); DistributedSystem ds = DistributedSystem.connect(props); @@ -873,7 +873,7 @@ public class IndexCreationJUnitTest{ { Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(NAME, "test"); props.setProperty(MCAST_PORT, "0"); //Using a different cache.xml that changes some region properties //That will force the disk code to copy the region entries. @@ -899,7 +899,7 @@ public class IndexCreationJUnitTest{ file.mkdir(); Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(NAME, "test"); props.setProperty(MCAST_PORT, "0"); props .setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath()); @@ -927,7 +927,7 @@ public class IndexCreationJUnitTest{ file.mkdir(); Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(NAME, "test"); props.setProperty(MCAST_PORT, "0"); props .setProperty(CACHE_XML_FILE, IndexCreationJUnitTest.class.getResource("index-creation-without-eviction.xml").toURI().getPath()); @@ -956,7 +956,7 @@ public class IndexCreationJUnitTest{ { Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(NAME, "test"); props.setProperty(MCAST_PORT, "0"); props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); props.setProperty(ENABLE_TIME_STATISTICS, "true"); @@ -990,7 +990,7 @@ public class IndexCreationJUnitTest{ { Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(NAME, "test"); props.setProperty(MCAST_PORT, "0"); props.setProperty(STATISTIC_SAMPLING_ENABLED, "true"); props.setProperty(ENABLE_TIME_STATISTICS, "true"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java index 3104892..e7aaf0c 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java @@ -271,7 +271,7 @@ public class DistributedMulticastRegionDUnitTest extends CacheTestCase { public Object call() { final File locatorLogFile = new File(getTestMethodName() + "-locator-" + locatorPort + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(SystemConfigurationProperties.NAME, "LocatorWithMcast"); + locatorProps.setProperty(NAME, "LocatorWithMcast"); locatorProps.setProperty(MCAST_PORT, mcastport); locatorProps.setProperty(MCAST_TTL, mcastttl); locatorProps.setProperty(LOG_LEVEL, "info"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java index 96e88c3..1d05217 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/AbstractLauncherTest.java @@ -70,22 +70,22 @@ public class AbstractLauncherTest { public void testIsSet() { final Properties properties = new Properties(); - assertFalse(properties.containsKey(SystemConfigurationProperties.NAME)); - assertFalse(AbstractLauncher.isSet(properties, SystemConfigurationProperties.NAME)); + assertFalse(properties.containsKey(NAME)); + assertFalse(AbstractLauncher.isSet(properties, NAME)); - properties.setProperty(SystemConfigurationProperties.NAME, ""); + properties.setProperty(NAME, ""); - assertTrue(properties.containsKey(SystemConfigurationProperties.NAME)); - assertFalse(AbstractLauncher.isSet(properties, SystemConfigurationProperties.NAME)); + assertTrue(properties.containsKey(NAME)); + assertFalse(AbstractLauncher.isSet(properties, NAME)); - properties.setProperty(SystemConfigurationProperties.NAME, " "); + properties.setProperty(NAME, " "); - assertTrue(properties.containsKey(SystemConfigurationProperties.NAME)); - assertFalse(AbstractLauncher.isSet(properties, SystemConfigurationProperties.NAME)); + assertTrue(properties.containsKey(NAME)); + assertFalse(AbstractLauncher.isSet(properties, NAME)); - properties.setProperty(SystemConfigurationProperties.NAME, "memberOne"); + properties.setProperty(NAME, "memberOne"); - assertTrue(AbstractLauncher.isSet(properties, SystemConfigurationProperties.NAME)); + assertTrue(AbstractLauncher.isSet(properties, NAME)); assertFalse(AbstractLauncher.isSet(properties, "NaMe")); } @@ -114,8 +114,8 @@ public class AbstractLauncherTest { Properties distributedSystemProperties = launcher.getDistributedSystemProperties(); assertNotNull(distributedSystemProperties); - assertTrue(distributedSystemProperties.containsKey(SystemConfigurationProperties.NAME)); - assertEquals("memberOne", distributedSystemProperties.getProperty(SystemConfigurationProperties.NAME)); + assertTrue(distributedSystemProperties.containsKey(NAME)); + assertEquals("memberOne", distributedSystemProperties.getProperty(NAME)); launcher = createAbstractLauncher(null, "22"); @@ -126,7 +126,7 @@ public class AbstractLauncherTest { distributedSystemProperties = launcher.getDistributedSystemProperties(); assertNotNull(distributedSystemProperties); - assertFalse(distributedSystemProperties.containsKey(SystemConfigurationProperties.NAME)); + assertFalse(distributedSystemProperties.containsKey(NAME)); launcher = createAbstractLauncher(StringUtils.EMPTY_STRING, "333"); @@ -137,7 +137,7 @@ public class AbstractLauncherTest { distributedSystemProperties = launcher.getDistributedSystemProperties(); assertNotNull(distributedSystemProperties); - assertFalse(distributedSystemProperties.containsKey(SystemConfigurationProperties.NAME)); + assertFalse(distributedSystemProperties.containsKey(NAME)); launcher = createAbstractLauncher(" ", "4444"); @@ -148,7 +148,7 @@ public class AbstractLauncherTest { distributedSystemProperties = launcher.getDistributedSystemProperties(); assertNotNull(distributedSystemProperties); - assertFalse(distributedSystemProperties.containsKey(SystemConfigurationProperties.NAME)); + assertFalse(distributedSystemProperties.containsKey(NAME)); } @Test @@ -166,7 +166,7 @@ public class AbstractLauncherTest { Properties distributedSystemProperties = launcher.getDistributedSystemProperties(defaults); assertNotNull(distributedSystemProperties); - assertEquals(launcher.getMemberName(), distributedSystemProperties.getProperty(SystemConfigurationProperties.NAME)); + assertEquals(launcher.getMemberName(), distributedSystemProperties.getProperty(NAME)); assertEquals("testValue", distributedSystemProperties.getProperty("testKey")); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java index 8dc0d03..3f13597 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedMemberDUnitTest.java @@ -64,7 +64,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase { config.setProperty(LOCATORS, ""); config.setProperty(ROLES, ""); config.setProperty(GROUPS, ""); - config.setProperty(SystemConfigurationProperties.NAME, ""); + config.setProperty(NAME, ""); InternalDistributedSystem system = getSystem(config); try { @@ -93,7 +93,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase { Properties config = new Properties(); config.setProperty(MCAST_PORT, "0"); config.setProperty(LOCATORS, ""); - config.setProperty(SystemConfigurationProperties.NAME, "nondefault"); + config.setProperty(NAME, "nondefault"); InternalDistributedSystem system = getSystem(config); try { @@ -154,21 +154,21 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase { Host.getHost(0).getVM(0).invoke(new SerializableRunnable() { public void run() { Properties config = new Properties(); - config.setProperty(SystemConfigurationProperties.NAME, "name0"); + config.setProperty(NAME, "name0"); getSystem(config); } }); Host.getHost(0).getVM(1).invoke(new SerializableRunnable() { public void run() { Properties config = new Properties(); - config.setProperty(SystemConfigurationProperties.NAME, "name1"); + config.setProperty(NAME, "name1"); getSystem(config); } }); Host.getHost(0).getVM(2).invoke(new SerializableRunnable() { public void run() { Properties config = new Properties(); - config.setProperty(SystemConfigurationProperties.NAME, "name0"); + config.setProperty(NAME, "name0"); try { getSystem(config); fail("expected IncompatibleSystemException"); @@ -363,7 +363,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase { Properties config = new Properties(); config.setProperty(MCAST_PORT, "0"); config.setProperty(LOCATORS, ""); - config.setProperty(SystemConfigurationProperties.NAME, "foobar"); + config.setProperty(NAME, "foobar"); InternalDistributedSystem system = getSystem(config); try { @@ -421,7 +421,7 @@ public class DistributedMemberDUnitTest extends JUnit4DistributedTestCase { @Override public Object call() throws Exception { Properties config = new Properties(); - config.setProperty(SystemConfigurationProperties.NAME, name); + config.setProperty(NAME, name); DistributedSystem ds = getSystem(config); return ds.getDistributedMember(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java index ba7e8c6..63e7b99 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherIntegrationTest.java @@ -116,7 +116,7 @@ public class LocatorLauncherIntegrationTest { public void testBuildWithMemberNameSetInGemFirePropertiesOnStart() throws Exception { // given: gemfire.properties with a name Properties gemfireProperties = new Properties(); - gemfireProperties.setProperty(SystemConfigurationProperties.NAME, "locator123"); + gemfireProperties.setProperty(NAME, "locator123"); useGemFirePropertiesFileInTemporaryFolder(DistributionConfig.GEMFIRE_PREFIX + "properties", gemfireProperties); // when: starting with null MemberName http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java index 4285ed9..8500399 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherLocalIntegrationTest.java @@ -71,7 +71,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setMemberName(getUniqueName()) .setPort(this.locatorPort) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(DISABLE_AUTO_RECONNECT, "true") .set(LOG_LEVEL, "config") .set(MCAST_PORT, "0") @@ -90,7 +90,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher assertEquals("true", distributedSystem.getProperties().getProperty(DISABLE_AUTO_RECONNECT)); assertEquals("0", distributedSystem.getProperties().getProperty(MCAST_PORT)); assertEquals("config", distributedSystem.getProperties().getProperty(LOG_LEVEL)); - assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(SystemConfigurationProperties.NAME)); + assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(NAME)); } catch (Throwable e) { this.errorCollector.addError(e); } @@ -116,7 +116,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setPort(this.locatorPort) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config") .build(); @@ -168,7 +168,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setPort(this.locatorPort) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config"); assertFalse(builder.getForce()); @@ -221,7 +221,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setPort(this.locatorPort) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config"); assertFalse(builder.getForce()); @@ -339,7 +339,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setMemberName(getUniqueName()) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config") .build(); @@ -498,7 +498,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setPort(freeTCPPort) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config") .build(); @@ -550,7 +550,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setPort(this.locatorPort) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config") .build(); @@ -612,7 +612,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setPort(this.locatorPort) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config"); assertFalse(builder.getForce()); @@ -675,7 +675,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setPort(this.locatorPort) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config"); assertFalse(builder.getForce()); @@ -738,7 +738,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setPort(this.locatorPort) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config"); assertFalse(builder.getForce()); @@ -790,7 +790,7 @@ public class LocatorLauncherLocalIntegrationTest extends AbstractLocatorLauncher .setPort(this.locatorPort) .setRedirectOutput(true) .setWorkingDirectory(this.workingDirectory) - .set(DistributionConfig.CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) + .set(CLUSTER_CONFIGURATION_DIR, this.clusterConfigDirectory) .set(LOG_LEVEL, "config"); assertFalse(builder.getForce()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java index 29d9b4c..e635af6 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherTest.java @@ -314,18 +314,18 @@ public class LocatorLauncherTest { LocatorLauncher launcher = new Builder() .setCommand(LocatorLauncher.Command.START) .setMemberName(null) - .set(SystemConfigurationProperties.NAME, "locatorABC") + .set(NAME, "locatorABC") .build(); assertNotNull(launcher); assertEquals(LocatorLauncher.Command.START, launcher.getCommand()); assertNull(launcher.getMemberName()); - assertEquals("locatorABC", launcher.getProperties().getProperty(SystemConfigurationProperties.NAME)); + assertEquals("locatorABC", launcher.getProperties().getProperty(NAME)); } @Test public void testBuildWithMemberNameSetInSystemPropertiesOnStart() { - System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.NAME, "locatorXYZ"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + NAME, "locatorXYZ"); LocatorLauncher launcher = new Builder() .setCommand(LocatorLauncher.Command.START) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java index 49c6446..f781374 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherIntegrationTest.java @@ -183,7 +183,7 @@ public class ServerLauncherIntegrationTest { public void testBuildWithMemberNameSetInGemFirePropertiesOnStart() throws Exception { // given: gemfire.properties with a name Properties gemfireProperties = new Properties(); - gemfireProperties.setProperty(SystemConfigurationProperties.NAME, "server123"); + gemfireProperties.setProperty(NAME, "server123"); useGemFirePropertiesFileInTemporaryFolder(DistributionConfig.GEMFIRE_PREFIX + "properties", gemfireProperties); // when: starting with null MemberName http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java index d039aef..e15da94 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherLocalIntegrationTest.java @@ -113,7 +113,7 @@ public class ServerLauncherLocalIntegrationTest extends AbstractServerLauncherIn assertEquals("true", distributedSystem.getProperties().getProperty(DISABLE_AUTO_RECONNECT)); assertEquals("config", distributedSystem.getProperties().getProperty(LOG_LEVEL)); assertEquals("0", distributedSystem.getProperties().getProperty(MCAST_PORT)); - assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(SystemConfigurationProperties.NAME)); + assertEquals(getUniqueName(), distributedSystem.getProperties().getProperty(NAME)); } catch (Throwable e) { this.errorCollector.addError(e); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java index 864d8f9..7d694cd 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/ServerLauncherTest.java @@ -500,18 +500,18 @@ public class ServerLauncherTest { ServerLauncher launcher = new Builder() .setCommand(ServerLauncher.Command.START) .setMemberName(null) - .set(SystemConfigurationProperties.NAME, "serverABC") + .set(NAME, "serverABC") .build(); assertNotNull(launcher); assertEquals(ServerLauncher.Command.START, launcher.getCommand()); assertNull(launcher.getMemberName()); - assertEquals("serverABC", launcher.getProperties().getProperty(SystemConfigurationProperties.NAME)); + assertEquals("serverABC", launcher.getProperties().getProperty(NAME)); } @Test public void testBuildWithMemberNameSetInSystemPropertiesOnStart() { - System.setProperty(DistributionConfig.GEMFIRE_PREFIX + SystemConfigurationProperties.NAME, "serverXYZ"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + NAME, "serverXYZ"); ServerLauncher launcher = new Builder() .setCommand(ServerLauncher.Command.START) http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java index c78c077..b6eb757 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionManagerDUnitTest.java @@ -254,7 +254,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase { props.setProperty(MCAST_PORT, "0"); props.setProperty(ACK_WAIT_THRESHOLD, "3"); props.setProperty(ACK_SEVERE_ALERT_THRESHOLD, "3"); - props.setProperty(SystemConfigurationProperties.NAME, "putter"); + props.setProperty(NAME, "putter"); getSystem(props); Region rgn = (new RegionFactory()) @@ -265,7 +265,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase { vm1.invoke(new SerializableRunnable("Connect to distributed system") { public void run() { - props.setProperty(SystemConfigurationProperties.NAME, "sleeper"); + props.setProperty(NAME, "sleeper"); getSystem(props); IgnoredException.addIgnoredException("elapsed while waiting for replies"); RegionFactory rf = new RegionFactory(); @@ -396,7 +396,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase { props.setProperty(MCAST_PORT, "0"); // loner props.setProperty(ACK_WAIT_THRESHOLD, "5"); props.setProperty(ACK_SEVERE_ALERT_THRESHOLD, "5"); - props.setProperty(SystemConfigurationProperties.NAME, "putter"); + props.setProperty(NAME, "putter"); getSystem(props); Region rgn = (new RegionFactory()) @@ -407,7 +407,7 @@ public class DistributionManagerDUnitTest extends DistributedTestCase { vm1.invoke(new SerializableRunnable("Connect to distributed system") { public void run() { - props.setProperty(SystemConfigurationProperties.NAME, "sleeper"); + props.setProperty(NAME, "sleeper"); getSystem(props); LogWriter log = basicGetSystem().getLogWriter(); log.info("<ExpectedException action=add>service failure</ExpectedException>"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java index e9f2fb6..442c3d7 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystemJUnitTest.java @@ -155,7 +155,7 @@ public class InternalDistributedSystemJUnitTest String name = "testGetName"; Properties props = new Properties(); - props.put(SystemConfigurationProperties.NAME, name); + props.put(NAME, name); // a loner is all this test needs props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); @@ -617,7 +617,7 @@ public class InternalDistributedSystemJUnitTest // a loner is all this test needs props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, ""); - props.setProperty(SystemConfigurationProperties.NAME, name); + props.setProperty(NAME, name); createSystem(props); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java index 57bde39..6defbba 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCacheXmlJUnitTest.java @@ -69,7 +69,7 @@ public class DiskRegCacheXmlJUnitTest dirs[2] = file3; // Connect to the GemFire distributed system Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, "test"); + props.setProperty(NAME, "test"); String path = TestUtil.getResourcePath(getClass(), "DiskRegCacheXmlJUnitTest.xml"); props.setProperty(MCAST_PORT, "0"); props.setProperty(CACHE_XML_FILE, path); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java index c7f1d18..fc15247 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegCachexmlGeneratorJUnitTest.java @@ -197,7 +197,7 @@ public class DiskRegCachexmlGeneratorJUnitTest extends DiskRegionTestingBase ds.disconnect(); // Connect to the GemFire distributed system Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, "DiskRegCachexmlGeneratorJUnitTest"); + props.setProperty(NAME, "DiskRegCachexmlGeneratorJUnitTest"); props.setProperty(MCAST_PORT, "0"); String path = "DiskRegCachexmlGeneratorJUnitTest.xml"; props.setProperty(CACHE_XML_FILE, path); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java index 43775c8..47828e8 100755 --- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/execute/DistributedRegionFunctionExecutionDUnitTest.java @@ -888,7 +888,7 @@ public class DistributedRegionFunctionExecutionDUnitTest extends DistributedTest public static void createCacheInVm_41367() { Properties props = new Properties(); - props.put(SystemConfigurationProperties.NAME, "SecurityServer"); + props.put(NAME, "SecurityServer"); props.put(SECURITY_CLIENT_AUTHENTICATOR, DummyAuthenticator.class.getName() + ".create"); new DistributedRegionFunctionExecutionDUnitTest("temp").createCache(props); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java index f33bd3b..0111d6d 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/HeadlessGfshIntegrationTest.java @@ -54,7 +54,7 @@ public class HeadlessGfshIntegrationTest { int port = getRandomAvailablePort(SOCKET); Properties properties = new Properties(); - properties.put(SystemConfigurationProperties.NAME, this.testName.getMethodName()); + properties.put(NAME, this.testName.getMethodName()); properties.put(JMX_MANAGER, "true"); properties.put(JMX_MANAGER_START, "true"); properties.put(JMX_MANAGER_PORT, String.valueOf(port)); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java index e82768f..f9cfd0c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java @@ -134,8 +134,8 @@ public abstract class CliCommandTestBase extends JUnit4CacheTestCase { jmxHost = "localhost"; } - if (!localProps.containsKey(SystemConfigurationProperties.NAME)) { - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + if (!localProps.containsKey(NAME)) { + localProps.setProperty(NAME, "Manager"); } final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java index 8a2aab7..47183af 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java @@ -160,7 +160,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { @Test public void testExportConfig() throws Exception { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(NAME, "Manager"); localProps.setProperty(GROUPS, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); @@ -168,7 +168,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { Host.getHost(0).getVM(1).invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "VM1"); + localProps.setProperty(NAME, "VM1"); localProps.setProperty(GROUPS, "Group2"); getSystem(localProps); getCache(); @@ -179,7 +179,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { Host.getHost(0).getVM(2).invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "VM2"); + localProps.setProperty(NAME, "VM2"); localProps.setProperty(GROUPS, "Group2"); getSystem(localProps); getCache(); @@ -188,7 +188,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { // Create a cache in the local VM localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Shell"); + localProps.setProperty(NAME, "Shell"); getSystem(localProps); Cache cache = getCache(); @@ -260,7 +260,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { setUpJmxManagerOnVm0ThenConnect(null); Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, controller); + localProps.setProperty(NAME, controller); localProps.setProperty(LOG_LEVEL, "error"); getSystem(localProps); @@ -305,7 +305,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { setUpJmxManagerOnVm0ThenConnect(null); Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, controller); + localProps.setProperty(NAME, controller); localProps.setProperty(LOG_LEVEL, "error"); getSystem(localProps); @@ -315,7 +315,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { Host.getHost(0).getVM(1).invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, member1); + localProps.setProperty(NAME, member1); getSystem(localProps); Cache cache = getCache(); } @@ -353,7 +353,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { setUpJmxManagerOnVm0ThenConnect(null); Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, controller); + localProps.setProperty(NAME, controller); localProps.setProperty(LOG_LEVEL, "error"); getSystem(localProps); @@ -363,7 +363,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { Host.getHost(0).getVM(1).invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, member1); + localProps.setProperty(NAME, member1); getSystem(localProps); Cache cache = getCache(); } @@ -430,7 +430,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File(locatorDirectory, "locator-" + locatorPort + ".log"); final Properties locatorProps = new Properties(); - locatorProps.setProperty(SystemConfigurationProperties.NAME, "Locator"); + locatorProps.setProperty(NAME, "Locator"); locatorProps.setProperty(MCAST_PORT, "0"); locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); locatorProps.setProperty(CLUSTER_CONFIGURATION_DIR, locatorDirectory); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java index d3f8b11..f6013ec 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java @@ -401,7 +401,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas this.alterVm1Name = "VM" + this.alterVm1.getPid(); this.alterVm1.invoke(() -> { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, alterVm1Name); + localProps.setProperty(NAME, alterVm1Name); localProps.setProperty(GROUPS, "Group1"); getSystem(localProps); Cache cache = getCache(); @@ -434,7 +434,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas this.alterVm2Name = "VM" + this.alterVm2.getPid(); this.alterVm2.invoke(() -> { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, alterVm2Name); + localProps.setProperty(NAME, alterVm2Name); localProps.setProperty(GROUPS, "Group1,Group2"); getSystem(localProps); Cache cache = getCache(); @@ -770,7 +770,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas Host.getHost(0).getVM(3).invoke(() -> { 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"); @@ -904,7 +904,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest extends CliCommandTestBas Host.getHost(0).getVM(3).invoke(() -> { 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/DeployCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java index 3d77dad..f40675c 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java @@ -98,7 +98,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { final String vmName = "VM" + vm.getPid(); // Create the cache in this VM - props.setProperty(SystemConfigurationProperties.NAME, "Controller"); + props.setProperty(NAME, "Controller"); props.setProperty(GROUPS, "Group1"); getSystem(props); getCache(); @@ -106,7 +106,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { // Create the cache in the other VM vm.invoke(new SerializableRunnable() { public void run() { - props.setProperty(SystemConfigurationProperties.NAME, vmName); + props.setProperty(NAME, vmName); props.setProperty(GROUPS, "Group2"); getSystem(props); getCache(); @@ -184,7 +184,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { final String vmName = "VM" + vm.getPid(); // Create the cache in this VM - props.setProperty(SystemConfigurationProperties.NAME, "Controller"); + props.setProperty(NAME, "Controller"); props.setProperty(GROUPS, "Group1"); getSystem(props); getCache(); @@ -192,7 +192,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { // Create the cache in the other VM vm.invoke(new SerializableRunnable() { public void run() { - props.setProperty(SystemConfigurationProperties.NAME, vmName); + props.setProperty(NAME, vmName); props.setProperty(GROUPS, "Group2"); getSystem(props); getCache(); @@ -261,7 +261,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { final String vmName = "VM" + vm.getPid(); // Create the cache in this VM - props.setProperty(SystemConfigurationProperties.NAME, "Controller"); + props.setProperty(NAME, "Controller"); props.setProperty(GROUPS, "Group1"); getSystem(props); getCache(); @@ -269,7 +269,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { // Create the cache in the other VM vm.invoke(new SerializableRunnable() { public void run() { - props.setProperty(SystemConfigurationProperties.NAME, vmName); + props.setProperty(NAME, vmName); props.setProperty(GROUPS, "Group2"); getSystem(props); getCache(); @@ -337,7 +337,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase { final File locatorLogFile = new File(locatorLogPath); 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/DiskStoreCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java index 02c4ba3..09f51d0 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java @@ -83,7 +83,7 @@ public class DiskStoreCommandsDUnitTest 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(); } @@ -747,7 +747,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { filesToBeDeleted.add(fullBackupDirPath); Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, controllerName); + props.setProperty(NAME, controllerName); getSystem(props); @@ -762,7 +762,7 @@ public class DiskStoreCommandsDUnitTest 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(); @@ -840,7 +840,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { diskStore1Dir2.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); + localProps.setProperty(NAME, vm1Name); localProps.setProperty(GROUPS, "Group1"); getSystem(localProps); getCache(); @@ -856,7 +856,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { diskStore2Dir.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name); + localProps.setProperty(NAME, vm2Name); localProps.setProperty(GROUPS, "Group2"); getSystem(localProps); getCache(); @@ -959,7 +959,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { diskStore2Dir1.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); + localProps.setProperty(NAME, vm1Name); localProps.setProperty(GROUPS, "Group1,Group2"); getSystem(localProps); Cache cache = getCache(); @@ -985,7 +985,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase { diskStore2Dir2.mkdirs(); Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, vm2Name); + localProps.setProperty(NAME, vm2Name); localProps.setProperty(GROUPS, "Group2"); 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/FunctionCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java index 4fa3ddb..09cd629 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/FunctionCommandsDUnitTest.java @@ -302,7 +302,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testExecuteFunctionOnMembers() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(NAME, "Manager"); localProps.setProperty(GROUPS, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); @@ -336,7 +336,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testExecuteFunctionOnMembersWithArgs() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(NAME, "Manager"); localProps.setProperty(GROUPS, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_RETURN_ARGS); @@ -372,7 +372,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testExecuteFunctionOnMembersWithArgsAndCustomResultCollector() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(NAME, "Manager"); localProps.setProperty(GROUPS, "Group1"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION_RETURN_ARGS); @@ -409,7 +409,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testExecuteFunctionOnGroups() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(NAME, "Manager"); localProps.setProperty(GROUPS, "Group0"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); @@ -488,7 +488,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { @Test public void testDestroyOnGroups() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, "Manager"); + localProps.setProperty(NAME, "Manager"); localProps.setProperty(GROUPS, "Group0"); setUpJmxManagerOnVm0ThenConnect(localProps); Function function = new TestFunction(true, TestFunction.TEST_FUNCTION1); @@ -578,7 +578,7 @@ public class FunctionCommandsDUnitTest extends CliCommandTestBase { vm1.invoke(new SerializableRunnable() { public void run() { Properties localProps = new Properties(); - localProps.setProperty(SystemConfigurationProperties.NAME, vm1Name); + localProps.setProperty(NAME, vm1Name); localProps.setProperty(GROUPS, "Group2"); getSystem(localProps); getCache(); @@ -597,7 +597,7 @@ public class FunctionCommandsDUnitTest 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, "Group3"); getSystem(localProps); 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/GemfireDataCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java index 28424a5..59eab66 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java @@ -104,7 +104,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase { final VM vm1 = Host.getHost(0).getVM(1); final VM vm2 = Host.getHost(0).getVM(2); Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, testName + "Manager"); + props.setProperty(NAME, testName + "Manager"); HeadlessGfsh gfsh = setUpJmxManagerOnVm0ThenConnect(props); assertNotNull(gfsh); assertEquals(true, gfsh.isConnectedAndReady()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java index f284f02..79e8b23 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest.java @@ -42,7 +42,7 @@ import java.util.Map; import java.util.Properties; import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOG_LEVEL; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.NAME; +import static com.gemstone.gemfire.distributed.NAME; import static com.gemstone.gemfire.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.Host.getHost; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; @@ -265,7 +265,7 @@ public class GetCommandOnRegionWithCacheLoaderDuringCacheMissDUnitTest extends C } public String getName() { - return getConfiguration().getProperty(SystemConfigurationProperties.NAME); + return getConfiguration().getProperty(NAME); } public VM getVm() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java index b4a1f5f..fc7aaab 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java @@ -765,7 +765,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase { @Override public Object call() throws Exception { Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, VM1Name); + props.setProperty(NAME, VM1Name); props.setProperty(GROUPS, group1); getSystem(props); Region parReg = createParReg(parRegName, getCache(), String.class, Stock.class); @@ -799,7 +799,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase { @Override public Object call() throws Exception { Properties props = new Properties(); - props.setProperty(SystemConfigurationProperties.NAME, VM1Name); + props.setProperty(NAME, VM1Name); props.setProperty(GROUPS, group1); getSystem(props); Region parReg = createParReg(parRegName, getCache(), String.class, Stock.class); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java index 469ff7b..d6ae20f 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeDiskStoreCommandsDUnitTest.java @@ -123,7 +123,7 @@ public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBas final Properties distributedSystemProperties = new Properties(); distributedSystemProperties.setProperty(SystemConfigurationProperties.LOG_LEVEL, getDUnitLogLevel()); - distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, gemfireName); + distributedSystemProperties.setProperty(NAME, gemfireName); return distributedSystemProperties; } @@ -170,7 +170,7 @@ public class ListAndDescribeDiskStoreCommandsDUnitTest extends CliCommandTestBas } public String getName() { - return getDistributedSystemConfiguration().getProperty(SystemConfigurationProperties.NAME); + return getDistributedSystemConfiguration().getProperty(NAME); } public VM getVm() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java index 3123399..2352113 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListAndDescribeRegionDUnitTest.java @@ -67,7 +67,7 @@ public class ListAndDescribeRegionDUnitTest 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/cli/commands/ListIndexCommandDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java index 931cdbe..26b858e 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ListIndexCommandDUnitTest.java @@ -128,7 +128,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase { final Properties distributedSystemProperties = new Properties(); distributedSystemProperties.setProperty(LOG_LEVEL, getDUnitLogLevel()); - distributedSystemProperties.setProperty(SystemConfigurationProperties.NAME, gemfireName); + distributedSystemProperties.setProperty(NAME, gemfireName); return distributedSystemProperties; } @@ -318,7 +318,7 @@ public class ListIndexCommandDUnitTest extends CliCommandTestBase { } public String getName() { - return getConfiguration().getProperty(SystemConfigurationProperties.NAME); + return getConfiguration().getProperty(NAME); } public VM getVm() { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ff81dbfc/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java index 1377551..7703a7b 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/MemberCommandsDUnitTest.java @@ -80,7 +80,7 @@ public class MemberCommandsDUnitTest extends JUnit4CacheTestCase { 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; }
