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/03f5e0c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/03f5e0c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/03f5e0c0 Branch: refs/heads/develop Commit: 03f5e0c0864d4e955029f39fe682723dea0efe71 Parents: ff81dbf Author: Udo Kohlmeyer <[email protected]> Authored: Tue May 31 13:05:56 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Thu Jun 2 10:01:42 2016 +1000 ---------------------------------------------------------------------- .../SharedConfigurationEndToEndDUnitTest.java | 18 +++++++++--------- .../gemfire/distributed/AbstractLauncher.java | 2 ++ .../internal/cli/help/utils/HelpUtils.java | 3 ++- .../com/gemstone/gemfire/GemFireTestCase.java | 4 +--- .../gemfire/distributed/AbstractLauncherTest.java | 1 + .../LocatorLauncherIntegrationTest.java | 1 + .../gemfire/distributed/LocatorLauncherTest.java | 1 + .../ServerLauncherIntegrationTest.java | 1 + .../gemfire/distributed/ServerLauncherTest.java | 1 + .../commands/GemfireDataCommandsDUnitTest.java | 2 +- ...onWithCacheLoaderDuringCacheMissDUnitTest.java | 3 +-- ...ListAndDescribeDiskStoreCommandsDUnitTest.java | 1 + .../cli/commands/ShowMetricsDUnitTest.java | 2 +- 13 files changed, 23 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 5c3d99f..e1bd685 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 @@ -51,7 +51,7 @@ import java.util.Set; import static com.gemstone.gemfire.cache.RegionShortcut.PARTITION; import static com.gemstone.gemfire.cache.RegionShortcut.REPLICATE; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts; import static com.gemstone.gemfire.internal.FileUtil.delete; import static com.gemstone.gemfire.internal.FileUtil.deleteMatching; @@ -347,13 +347,13 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase { final Properties locatorProps = new Properties(); locatorProps.setProperty(NAME, locator1Name); locatorProps.setProperty(MCAST_PORT, "0"); - locatorProps.setProperty(SystemConfigurationProperties.LOG_LEVEL, "config"); - locatorProps.setProperty(SystemConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "true"); - locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER, "true"); - locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER_START, "true"); - locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER_BIND_ADDRESS, String.valueOf(jmxHost)); - locatorProps.setProperty(SystemConfigurationProperties.JMX_MANAGER_PORT, String.valueOf(jmxPort)); - locatorProps.setProperty(SystemConfigurationProperties.HTTP_SERVICE_PORT, String.valueOf(httpPort)); + locatorProps.setProperty(LOG_LEVEL, "config"); + locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true"); + locatorProps.setProperty(JMX_MANAGER, "true"); + locatorProps.setProperty(JMX_MANAGER_START, "true"); + locatorProps.setProperty(JMX_MANAGER_BIND_ADDRESS, String.valueOf(jmxHost)); + locatorProps.setProperty(JMX_MANAGER_PORT, String.valueOf(jmxPort)); + locatorProps.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpPort)); final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps); @@ -392,7 +392,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase { public Object call() { Properties localProps = new Properties(); localProps.setProperty(MCAST_PORT, "0"); - localProps.setProperty(SystemConfigurationProperties.LOCATORS, "localhost:" + locator1Port); + localProps.setProperty(LOCATORS, "localhost:" + locator1Port); localProps.setProperty(NAME, "DataMember"); getSystem(localProps); Cache cache = getCache(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 cc27a03..7178ca6 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 @@ -46,6 +46,8 @@ import java.util.logging.FileHandler; import java.util.logging.Level; import java.util.logging.Logger; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * The AbstractLauncher class is a base class for implementing various launchers to construct and run different GemFire * processes, like Cache Servers, Locators, Managers, HTTP servers and so on. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 b15feda..5d74fa0 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 @@ -16,7 +16,6 @@ */ package com.gemstone.gemfire.management.internal.cli.help.utils; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.management.cli.CliMetaData; import com.gemstone.gemfire.management.internal.cli.help.format.*; import com.gemstone.gemfire.management.internal.cli.modes.CommandModes; @@ -30,6 +29,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * @since GemFire 7.0 */ http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 cd4e615..7e623e2 100644 --- a/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java +++ b/geode-core/src/test/java/com/gemstone/gemfire/GemFireTestCase.java @@ -17,7 +17,6 @@ package com.gemstone.gemfire; import com.gemstone.gemfire.distributed.DistributedSystem; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem; import org.junit.After; import org.junit.Before; @@ -26,8 +25,7 @@ import org.junit.rules.TestName; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.assertTrue; /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 1d05217..9d4a169 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 @@ -27,6 +27,7 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; import static org.junit.Assert.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * The AbstractLauncherTest class is a test suite of unit tests testing the contract and functionality http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 63e7b99..f5f43f4 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 @@ -39,6 +39,7 @@ import static com.googlecode.catchexception.apis.BDDCatchException.caughtExcepti import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.BDDAssertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * Integration tests for LocatorLauncher. These tests require file system I/O. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 e635af6..0e87ae0 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 @@ -32,6 +32,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import static org.junit.Assert.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * The LocatorLauncherTest class is a test suite of test cases for testing the contract and functionality of http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 f781374..da7d4e4 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 @@ -38,6 +38,7 @@ import static com.googlecode.catchexception.apis.BDDCatchException.caughtExcepti import static com.googlecode.catchexception.apis.BDDCatchException.when; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.BDDAssertions.then; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * Integration tests for ServerLauncher class. These tests may require file system and/or network I/O. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 7d694cd..0d1f4f3 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 @@ -45,6 +45,7 @@ import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; import static org.junit.Assert.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * The ServerLauncherTest class is a test suite of unit tests testing the contract, functionality and invariants http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 59eab66..0ced468 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 @@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.query.data.Portfolio; import com.gemstone.gemfire.cache.query.internal.CompiledValue; import com.gemstone.gemfire.cache.query.internal.QCompiler; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.internal.lang.StringUtils; import com.gemstone.gemfire.management.DistributedRegionMXBean; @@ -57,6 +56,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * Dunit class for testing gemfire data commands : get, put, remove, select, rebalance http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 79e8b23..ebfe3f0 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 @@ -41,8 +41,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOG_LEVEL; -import static com.gemstone.gemfire.distributed.NAME; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; 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; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 d6ae20f..1aa21f8 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 @@ -35,6 +35,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.assertNotNull; import static com.gemstone.gemfire.test.dunit.Host.getHost; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getDUnitLogLevel; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * The ListAndDescribeDiskStoreCommandsDUnitTest class is a test suite of functional tests cases testing the proper http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03f5e0c0/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 b439e20..6bb228c 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 @@ -22,7 +22,6 @@ import com.gemstone.gemfire.cache.RegionFactory; import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache.server.CacheServer; import com.gemstone.gemfire.distributed.DistributedMember; -import com.gemstone.gemfire.distributed.SystemConfigurationProperties; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.management.*; import com.gemstone.gemfire.management.cli.Result; @@ -45,6 +44,7 @@ import static com.gemstone.gemfire.test.dunit.Assert.assertEquals; import static com.gemstone.gemfire.test.dunit.Assert.assertTrue; import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter; import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; @Category(DistributedTest.class) public class ShowMetricsDUnitTest extends CliCommandTestBase {
