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/cb291539 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cb291539 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cb291539 Branch: refs/heads/develop Commit: cb2915390ee5afb8a9d8aff50442986c81321f1f Parents: 7061201 Author: Udo Kohlmeyer <[email protected]> Authored: Mon May 30 19:26:52 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Thu Jun 2 10:01:42 2016 +1000 ---------------------------------------------------------------------- .../internal/RegionFactoryDelegate.java | 6 +- .../gemstone/gemfire/modules/SecondVMTest.java | 5 +- .../session/bootstrap/AbstractCache.java | 20 +- .../modules/session/TestSessionsBase.java | 5 +- .../LocatorLauncherAssemblyIntegrationTest.java | 22 +- .../LauncherLifecycleCommandsDUnitTest.java | 4 +- .../LauncherLifecycleCommandsJUnitTest.java | 7 +- .../internal/web/RestInterfaceJUnitTest.java | 4 +- .../controllers/RestAPIsWithSSLDUnitTest.java | 41 +- .../gemfire/admin/DistributedSystemConfig.java | 26 +- .../internal/AdminDistributedSystemImpl.java | 2 +- .../admin/internal/CacheServerConfigImpl.java | 5 +- .../gemfire/admin/internal/CacheServerImpl.java | 5 +- .../internal/DistributedSystemConfigImpl.java | 4 +- .../EnabledManagedEntityController.java | 10 +- .../admin/jmx/internal/AgentConfigImpl.java | 8 +- .../jmx/internal/MemberInfoWithStatsMBean.java | 6 +- .../client/internal/AuthenticateUserOp.java | 8 +- .../gemfire/distributed/DistributedSystem.java | 4 +- .../gemfire/distributed/LocatorLauncher.java | 4 +- .../gemfire/distributed/ServerLauncher.java | 4 +- .../internal/AbstractDistributionConfig.java | 346 +-- .../internal/DistributionConfig.java | 2191 ++++++++++-------- .../internal/DistributionConfigImpl.java | 406 ++-- .../distributed/internal/InternalLocator.java | 5 +- .../internal/RuntimeDistributionConfigImpl.java | 36 +- .../gemfire/internal/AbstractConfig.java | 11 +- .../gemfire/internal/MigrationClient.java | 6 +- .../gemfire/internal/MigrationServer.java | 6 +- .../gemstone/gemfire/internal/SystemAdmin.java | 4 +- .../gemfire/internal/admin/SSLConfig.java | 10 +- .../admin/remote/RemoteTransportConfig.java | 4 +- .../internal/cache/CacheServerLauncher.java | 15 +- .../gemfire/internal/cache/DiskStoreImpl.java | 5 +- .../tier/sockets/ClientProxyMembershipID.java | 4 +- .../internal/cache/tier/sockets/HandShake.java | 14 +- .../internal/cache/xmlcache/CacheXml.java | 3 +- .../internal/logging/LogWriterFactory.java | 4 +- .../management/internal/cli/CommandManager.java | 5 +- .../internal/cli/commands/ConfigCommands.java | 5 +- .../internal/cli/commands/ShellCommands.java | 7 +- .../cli/functions/ChangeLogLevelFunction.java | 4 +- .../GetMemberConfigInformationFunction.java | 6 +- .../internal/cli/i18n/CliStrings.java | 2 +- .../gemfire/redis/GemFireRedisServer.java | 5 +- .../gemfire/DiskInstantiatorsJUnitTest.java | 7 +- .../gemfire/LocalStatisticsJUnitTest.java | 8 +- .../com/gemstone/gemfire/LonerDMJUnitTest.java | 11 +- .../internal/DistributedSystemTestCase.java | 6 +- .../admin/internal/HealthEvaluatorTestCase.java | 6 +- .../cache/ConnectionPoolFactoryJUnitTest.java | 5 +- .../gemfire/cache/RegionFactoryJUnitTest.java | 6 +- .../client/ClientCacheFactoryJUnitTest.java | 11 +- .../ClientServerRegisterInterestsDUnitTest.java | 8 +- .../cache/client/internal/LocatorTestBase.java | 4 +- ...itionedRegionCompactRangeIndexDUnitTest.java | 5 +- .../QueryParamsAuthorizationDUnitTest.java | 8 +- .../functional/IndexCreationJUnitTest.java | 22 +- .../DeclarativeIndexCreationJUnitTest.java | 5 +- .../NewDeclarativeIndexCreationJUnitTest.java | 7 +- ...gRegionCreationIndexUpdateTypeJUnitTest.java | 5 +- .../cache/snapshot/RegionSnapshotJUnitTest.java | 6 +- .../cache/snapshot/SnapshotTestCase.java | 5 +- .../gemfire/cache30/Bug40255JUnitTest.java | 8 +- .../gemfire/cache30/Bug40662JUnitTest.java | 6 +- .../gemfire/cache30/CacheLogRollDUnitTest.java | 36 +- ...cheRegionsReliablityStatsCheckDUnitTest.java | 186 +- .../gemfire/cache30/CacheXml45DUnitTest.java | 5 +- .../gemfire/cache30/CacheXmlTestCase.java | 6 +- .../cache30/ClientServerCCEDUnitTest.java | 10 +- .../DistributedAckRegionCCEDUnitTest.java | 4 +- .../cache30/DistributedAckRegionDUnitTest.java | 7 +- .../DistributedMulticastRegionDUnitTest.java | 8 +- .../DistributedNoAckRegionCCEDUnitTest.java | 9 +- .../cache30/GlobalRegionCCEDUnitTest.java | 4 +- .../gemfire/cache30/QueueMsgDUnitTest.java | 9 +- .../gemfire/cache30/ReconnectDUnitTest.java | 75 +- .../RegionReliabilityListenerDUnitTest.java | 6 +- .../cache30/RegionReliabilityTestCase.java | 29 +- .../gemfire/cache30/RequiredRolesDUnitTest.java | 13 +- .../cache30/RolePerformanceDUnitTest.java | 5 +- .../gemfire/cache30/SlowRecDUnitTest.java | 36 +- .../gemfire/cache30/TXDistributedDUnitTest.java | 5 +- .../distributed/DistributedMemberDUnitTest.java | 9 +- .../DistributedSystemConnectPerf.java | 7 +- .../distributed/DistributedSystemDUnitTest.java | 16 +- .../gemfire/distributed/LocatorDUnitTest.java | 100 +- .../LocatorLauncherLocalIntegrationTest.java | 30 +- .../LocatorLauncherRemoteIntegrationTest.java | 3 +- .../gemfire/distributed/RoleDUnitTest.java | 11 +- .../ServerLauncherLocalIntegrationTest.java | 40 +- .../ServerLauncherRemoteIntegrationTest.java | 9 +- .../distributed/internal/Bug40751DUnitTest.java | 4 +- .../ConsoleDistributionManagerDUnitTest.java | 4 +- .../internal/DistributionConfigJUnitTest.java | 34 +- .../internal/DistributionManagerDUnitTest.java | 23 +- .../InternalDistributedSystemJUnitTest.java | 56 +- .../internal/ProductUseLogDUnitTest.java | 6 +- .../membership/MembershipJUnitTest.java | 19 +- .../gms/fd/GMSHealthMonitorJUnitTest.java | 12 +- .../locator/GMSLocatorRecoveryJUnitTest.java | 6 +- .../messenger/JGroupsMessengerJUnitTest.java | 8 +- .../gms/mgr/GMSMembershipManagerJUnitTest.java | 12 +- .../TcpServerBackwardCompatDUnitTest.java | 7 +- .../gemfire/disttx/CacheMapDistTXDUnitTest.java | 7 +- .../gemfire/disttx/DistTXJUnitTest.java | 2 +- .../gemfire/disttx/DistTXOrderDUnitTest.java | 6 +- .../disttx/DistTXRestrictionsDUnitTest.java | 7 +- .../disttx/DistTXWithDeltaDUnitTest.java | 7 +- .../disttx/DistributedTransactionDUnitTest.java | 2 +- .../gemfire/disttx/PRDistTXDUnitTest.java | 7 +- .../gemfire/disttx/PRDistTXJUnitTest.java | 2 +- .../disttx/PRDistTXWithVersionsDUnitTest.java | 7 +- ...entPartitionedRegionWithDistTXDUnitTest.java | 7 +- .../internal/AbstractConfigJUnitTest.java | 99 +- .../internal/GemFireStatSamplerJUnitTest.java | 29 +- .../gemfire/internal/JSSESocketJUnitTest.java | 12 +- .../gemfire/internal/JarDeployerDUnitTest.java | 3 +- .../internal/PdxDeleteFieldDUnitTest.java | 2 +- .../gemfire/internal/PdxRenameDUnitTest.java | 2 +- .../gemfire/internal/SSLConfigJUnitTest.java | 571 +++-- .../gemfire/internal/cache/BackupJUnitTest.java | 14 +- .../internal/cache/Bug37244JUnitTest.java | 6 +- .../internal/cache/Bug41091DUnitTest.java | 13 +- .../internal/cache/Bug45934DUnitTest.java | 7 +- ...ServerInvalidAndDestroyedEntryDUnitTest.java | 9 +- .../cache/ClientServerTransactionDUnitTest.java | 38 +- .../cache/ConcurrentMapOpsDUnitTest.java | 5 +- .../cache/ConnectDisconnectDUnitTest.java | 7 +- .../cache/DeltaPropagationDUnitTest.java | 13 +- .../cache/DiskOfflineCompactionJUnitTest.java | 11 +- .../internal/cache/DiskOldAPIsJUnitTest.java | 14 +- .../cache/DiskRegCacheXmlJUnitTest.java | 5 +- .../DiskRegCachexmlGeneratorJUnitTest.java | 306 +-- .../DiskRegionIllegalArguementsJUnitTest.java | 10 +- ...iskRegionIllegalCacheXMLvaluesJUnitTest.java | 5 +- .../internal/cache/DiskRegionTestingBase.java | 14 +- .../cache/DiskStoreFactoryJUnitTest.java | 11 +- .../cache/FixedPRSinglehopDUnitTest.java | 6 +- .../internal/cache/GridAdvisorDUnitTest.java | 1308 +++++------ .../cache/IncrementalBackupDUnitTest.java | 5 +- .../internal/cache/InterruptDiskJUnitTest.java | 11 +- ...InterruptsConserveSocketsFalseDUnitTest.java | 4 +- .../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 6 +- ...victionAlgoMemoryEnabledRegionJUnitTest.java | 6 +- .../cache/OfflineSnapshotJUnitTest.java | 5 +- ...dRegionAPIConserveSocketsFalseDUnitTest.java | 4 +- ...rtitionedRegionCacheXMLExampleDUnitTest.java | 7 +- .../PartitionedRegionSingleHopDUnitTest.java | 11 +- ...RegionSingleHopWithServerGroupDUnitTest.java | 9 +- .../PersistentPartitionedRegionJUnitTest.java | 5 +- .../cache/RemoteTransactionDUnitTest.java | 7 +- .../internal/cache/RunCacheInOldGemfire.java | 5 +- .../cache/TombstoneCreationJUnitTest.java | 10 +- .../cache/TransactionsWithDeltaDUnitTest.java | 5 +- ...ltiThreadedOplogPerJUnitPerformanceTest.java | 6 +- ...ributedRegionFunctionExecutionDUnitTest.java | 7 +- .../OnGroupsFunctionExecutionDUnitTest.java | 18 +- ...egionFunctionExecutionFailoverDUnitTest.java | 6 +- .../internal/cache/ha/Bug48571DUnitTest.java | 22 +- .../internal/cache/ha/Bug48879DUnitTest.java | 6 +- .../cache/ha/HARegionQueueJUnitTest.java | 5 +- .../cache/locks/TXLockServiceDUnitTest.java | 4 +- .../cache/partitioned/Bug43684DUnitTest.java | 15 +- .../cache/partitioned/Bug47388DUnitTest.java | 7 +- .../cache/partitioned/Bug51400DUnitTest.java | 4 +- .../PersistentRecoveryOrderDUnitTest.java | 3 +- .../cache/tier/sockets/Bug36829DUnitTest.java | 8 +- .../cache/tier/sockets/Bug37805DUnitTest.java | 8 +- .../cache/tier/sockets/CacheServerTestUtil.java | 26 +- .../tier/sockets/ClientConflationDUnitTest.java | 5 +- .../sockets/DurableClientBug39997DUnitTest.java | 6 +- .../DurableClientQueueSizeDUnitTest.java | 10 +- .../DurableClientReconnectDUnitTest.java | 7 +- .../sockets/DurableClientStatsDUnitTest.java | 8 +- .../sockets/DurableRegistrationDUnitTest.java | 7 +- .../sockets/DurableResponseMatrixDUnitTest.java | 8 +- .../sockets/InterestRegrListenerDUnitTest.java | 7 +- .../tier/sockets/RedundancyLevelJUnitTest.java | 6 +- .../CompressionCacheConfigDUnitTest.java | 5 +- .../datasource/AbstractPoolCacheJUnitTest.java | 6 +- .../internal/datasource/CleanUpJUnitTest.java | 5 +- .../ConnectionPoolCacheImplJUnitTest.java | 5 +- .../datasource/ConnectionPoolingJUnitTest.java | 5 +- .../datasource/DataSourceFactoryJUnitTest.java | 5 +- .../internal/datasource/RestartJUnitTest.java | 5 +- .../internal/jta/BlockingTimeOutJUnitTest.java | 6 +- .../gemfire/internal/jta/CacheUtils.java | 9 +- .../internal/jta/DataSourceJTAJUnitTest.java | 12 +- .../jta/GlobalTransactionJUnitTest.java | 5 +- .../jta/TransactionTimeOutJUnitTest.java | 7 +- .../internal/jta/dunit/ExceptionsDUnitTest.java | 5 +- .../jta/dunit/IdleTimeOutDUnitTest.java | 5 +- .../jta/dunit/LoginTimeOutDUnitTest.java | 5 +- .../jta/dunit/MaxPoolSizeDUnitTest.java | 5 +- .../jta/dunit/TransactionTimeOutDUnitTest.java | 5 +- .../dunit/TxnManagerMultiThreadDUnitTest.java | 5 +- .../internal/jta/dunit/TxnTimeOutDUnitTest.java | 6 +- .../DistributedSystemLogFileJUnitTest.java | 73 +- .../logging/LocatorLogFileJUnitTest.java | 10 +- .../logging/LogWriterPerformanceTest.java | 6 +- .../CustomConfigWithCacheIntegrationTest.java | 6 +- .../offheap/OutOfOffHeapMemoryDUnitTest.java | 4 +- .../statistics/StatisticsDUnitTest.java | 15 +- .../internal/stats50/AtomicStatsJUnitTest.java | 5 +- .../management/ClientHealthStatsDUnitTest.java | 16 +- .../DataBrowserJSONValidationJUnitTest.java | 8 +- .../management/LocatorManagementDUnitTest.java | 5 +- .../gemfire/management/ManagementTestBase.java | 10 +- ...ersalMembershipListenerAdapterDUnitTest.java | 19 +- .../stats/DistributedSystemStatsJUnitTest.java | 8 +- .../bean/stats/MBeanStatsTestCase.java | 10 +- .../cli/commands/ConfigCommandsDUnitTest.java | 2 +- ...eateAlterDestroyRegionCommandsDUnitTest.java | 17 +- .../cli/commands/DeployCommandsDUnitTest.java | 7 +- .../commands/DiskStoreCommandsDUnitTest.java | 10 +- .../HTTPServiceSSLSupportJUnitTest.java | 30 +- .../cli/commands/IndexCommandsDUnitTest.java | 13 +- .../ListAndDescribeRegionDUnitTest.java | 8 +- .../cli/commands/ListIndexCommandDUnitTest.java | 5 +- .../cli/commands/MemberCommandsDUnitTest.java | 17 +- .../MiscellaneousCommandsDUnitTest.java | 8 +- .../cli/commands/QueueCommandsDUnitTest.java | 8 +- .../cli/commands/ShowDeadlockDUnitTest.java | 10 +- .../cli/commands/ShowStackTraceDUnitTest.java | 8 +- .../cli/commands/UserCommandsDUnitTest.java | 3 +- .../security/ExampleJSONAuthorization.java | 7 +- .../internal/security/JSONAuthorization.java | 11 +- .../ClientsWithVersioningRetryDUnitTest.java | 4 +- .../gemstone/gemfire/redis/AuthJUnitTest.java | 11 +- .../gemstone/gemfire/redis/HashesJUnitTest.java | 6 +- .../gemstone/gemfire/redis/ListsJUnitTest.java | 9 +- .../gemfire/redis/RedisDistDUnitTest.java | 6 +- .../gemstone/gemfire/redis/SetsJUnitTest.java | 6 +- .../gemfire/redis/SortedSetsJUnitTest.java | 6 +- .../gemfire/redis/StringsJunitTest.java | 6 +- .../generator/SSLCredentialGenerator.java | 10 +- .../gemfire/test/dunit/LogWriterUtils.java | 4 +- .../internal/JUnit4DistributedTestCase.java | 10 +- .../test/dunit/standalone/DUnitLauncher.java | 11 +- .../gemfire/test/golden/GoldenTestCase.java | 4 +- .../gemfire/test/process/ProcessWrapper.java | 5 +- .../com/main/WANBootStrapping_Site1_Add.java | 2 +- .../com/main/WANBootStrapping_Site1_Remove.java | 4 +- .../com/main/WANBootStrapping_Site2_Add.java | 2 +- .../com/main/WANBootStrapping_Site2_Remove.java | 4 +- .../gemfire/cache/query/cq/CQJUnitTest.java | 5 +- .../cq/dunit/CqDataUsingPoolDUnitTest.java | 8 +- .../cache/query/cq/dunit/CqStateDUnitTest.java | 4 +- .../PartitionedRegionCqQueryDUnitTest.java | 6 +- .../cache/snapshot/ClientSnapshotDUnitTest.java | 5 +- .../cache/RemoteCQTransactionDUnitTest.java | 5 +- .../tier/sockets/DurableClientTestCase.java | 7 +- .../CacheServerManagementDUnitTest.java | 7 +- .../cli/commands/ClientCommandsDUnitTest.java | 20 +- .../DurableClientCommandsDUnitTest.java | 8 +- .../IndexRepositoryImplPerformanceTest.java | 1 - ...uceneIndexXmlParserIntegrationJUnitTest.java | 5 +- .../spark/connector/JavaApiIntegrationTest.java | 2 +- .../internal/cache/UpdateVersionDUnitTest.java | 14 +- .../cache/wan/CacheClientNotifierDUnitTest.java | 8 +- .../gemfire/internal/cache/wan/WANTestBase.java | 10 +- .../cache/wan/disttx/DistTXWANDUnitTest.java | 4 +- .../wan/misc/NewWanAuthenticationDUnitTest.java | 6 +- 264 files changed, 4095 insertions(+), 3815 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java index 65b0eb2..e217195 100644 --- a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java +++ b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/RegionFactoryDelegate.java @@ -31,11 +31,9 @@ import org.slf4j.LoggerFactory; import java.util.Iterator; import java.util.Properties; -public class RegionFactoryDelegate { - - private static final String LOG_FILE = DistributionConfig.LOG_FILE_NAME; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; - private static final String CACHE_XML_FILE = DistributionConfig.CACHE_XML_FILE_NAME; +public class RegionFactoryDelegate { private static final String DEFAULT_REGION_TYPE = RegionShortcut.REPLICATE_HEAP_LRU.name(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java index 386e22f..cde19c6 100644 --- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java +++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/SecondVMTest.java @@ -21,7 +21,6 @@ import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.GemFireCache; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.Region.Entry; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import junit.framework.TestCase; @@ -36,7 +35,7 @@ import java.util.Iterator; import java.util.Properties; import java.util.logging.Level; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; @Ignore("Can this test be deleted?") @Category(IntegrationTest.class) @@ -50,7 +49,7 @@ public class SecondVMTest extends TestCase { public void _testStartEmptyVM() throws IOException { Properties gemfireProperties = new Properties(); gemfireProperties.setProperty(MCAST_PORT, "5555"); - gemfireProperties.setProperty(DistributionConfig.LOG_LEVEL_NAME, "fine"); + gemfireProperties.setProperty(LOG_LEVEL, "fine"); Cache cache = new CacheFactory(gemfireProperties).create(); System.in.read(); Iterator it = cache.rootRegions().iterator(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java index 481ec09..c9b9da6 100644 --- a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java +++ b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/session/bootstrap/AbstractCache.java @@ -36,6 +36,8 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicBoolean; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + public abstract class AbstractCache { protected GemFireCache cache; @@ -111,7 +113,7 @@ public abstract class AbstractCache { } public String getLogFileName() { - String logFileName = getGemFireProperties().get(DistributionConfig.LOG_FILE_NAME); + String logFileName = getGemFireProperties().get(LOG_FILE); if (logFileName == null) { logFileName = DEFAULT_LOG_FILE_NAME; } @@ -119,7 +121,7 @@ public abstract class AbstractCache { } public String getStatisticArchiveFileName() { - String statisticsArchiveFileName = getGemFireProperties().get(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME); + String statisticsArchiveFileName = getGemFireProperties().get(STATISTIC_ARCHIVE_FILE); if (statisticsArchiveFileName == null) { statisticsArchiveFileName = DEFAULT_STATISTIC_ARCHIVE_FILE_NAME; } @@ -127,7 +129,7 @@ public abstract class AbstractCache { } public String getCacheXmlFileName() { - String cacheXmlFileName = getGemFireProperties().get(DistributionConfig.CACHE_XML_FILE_NAME); + String cacheXmlFileName = getGemFireProperties().get(CACHE_XML_FILE); if (cacheXmlFileName == null) { cacheXmlFileName = getDefaultCacheXmlFileName(); } @@ -219,19 +221,19 @@ public abstract class AbstractCache { if (getCacheXmlFileName().equals(getDefaultCacheXmlFileName()) && !cacheXmlFile.exists()) { absoluteCacheXmlFileName = DistributionConfig.DEFAULT_CACHE_XML_FILE.getName(); } - properties.put(DistributionConfig.CACHE_XML_FILE_NAME, absoluteCacheXmlFileName); + properties.put(CACHE_XML_FILE, absoluteCacheXmlFileName); // Replace the log file in the properties - properties.put(DistributionConfig.LOG_FILE_NAME, getLogFile().getAbsolutePath()); + properties.put(LOG_FILE, getLogFile().getAbsolutePath()); // Replace the statistics archive file in the properties File statisticArchiveFile = getStatisticArchiveFile(); if (statisticArchiveFile == null) { // Remove the statistics archive file name since statistic sampling is disabled - properties.remove(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME); - properties.remove(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME); + properties.remove(STATISTIC_ARCHIVE_FILE); + properties.remove(STATISTIC_SAMPLING_ENABLED); } else { - properties.put(DistributionConfig.STATISTIC_ARCHIVE_FILE_NAME, statisticArchiveFile.getAbsolutePath()); + properties.put(STATISTIC_ARCHIVE_FILE, statisticArchiveFile.getAbsolutePath()); } getLogger().info("Creating distributed system from: " + properties); @@ -269,7 +271,7 @@ public abstract class AbstractCache { protected File getStatisticArchiveFile() { File statisticsArchiveFile = null; - String statisticSamplingEnabled = getGemFireProperties().get(DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME); + String statisticSamplingEnabled = getGemFireProperties().get(STATISTIC_SAMPLING_ENABLED); if (statisticSamplingEnabled != null && statisticSamplingEnabled.equals("true")) { String statisticsArchiveFileName = getStatisticArchiveFileName(); statisticsArchiveFile = new File(statisticsArchiveFileName); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java index 4f2d06d..fac2472 100644 --- a/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java +++ b/extensions/geode-modules/src/test/java/com/gemstone/gemfire/modules/session/TestSessionsBase.java @@ -17,7 +17,6 @@ package com.gemstone.gemfire.modules.session; import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.AvailablePortHelper; import com.gemstone.gemfire.modules.session.catalina.DeltaSessionManager; import com.gemstone.gemfire.modules.session.catalina.PeerToPeerCacheLifecycleListener; @@ -37,7 +36,7 @@ import java.beans.PropertyChangeEvent; import java.io.IOException; import java.io.PrintWriter; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static junit.framework.Assert.*; public abstract class TestSessionsBase { @@ -59,7 +58,7 @@ public abstract class TestSessionsBase { PeerToPeerCacheLifecycleListener p2pListener = new PeerToPeerCacheLifecycleListener(); p2pListener.setProperty(MCAST_PORT, "0"); - p2pListener.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); + p2pListener.setProperty(LOG_LEVEL, "config"); server.getEmbedded().addLifecycleListener(p2pListener); sessionManager = manager; sessionManager.setEnableCommitValve(true); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java index 84d4aba..b8c9cca 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherAssemblyIntegrationTest.java @@ -39,6 +39,8 @@ import java.io.File; import static org.junit.Assert.*; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * These tests are part of assembly as they require the REST war file to be present. */ @@ -70,11 +72,11 @@ public class LocatorLauncherAssemblyIntegrationTest extends AbstractLocatorLaunc .setPort(this.locatorPort) .setRedirectOutput(false) .setWorkingDirectory(rootFolder) - .set(DistributionConfig.LOG_LEVEL_NAME, "config") - .set(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false") - .set(DistributionConfig.JMX_MANAGER_NAME, "true") - .set(DistributionConfig.JMX_MANAGER_START_NAME, "true") - .set(DistributionConfig.JMX_MANAGER_PORT_NAME, "0"); + .set(LOG_LEVEL, "config") + .set(ENABLE_CLUSTER_CONFIGURATION, "false") + .set(JMX_MANAGER, "true") + .set(JMX_MANAGER_START, "true") + .set(JMX_MANAGER_PORT, "0"); performTest(builder); } @@ -91,11 +93,11 @@ public class LocatorLauncherAssemblyIntegrationTest extends AbstractLocatorLaunc .setPort(this.locatorPort) .setRedirectOutput(false) .setWorkingDirectory(rootFolder) - .set(DistributionConfig.LOG_LEVEL_NAME, "config") - .set(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false") - .set(DistributionConfig.JMX_MANAGER_NAME, "true") - .set(DistributionConfig.JMX_MANAGER_START_NAME, "true") - .set(DistributionConfig.JMX_MANAGER_PORT_NAME, Integer.toString(jmxPort)); + .set(LOG_LEVEL, "config") + .set(ENABLE_CLUSTER_CONFIGURATION, "false") + .set(JMX_MANAGER, "true") + .set(JMX_MANAGER_START, "true") + .set(JMX_MANAGER_PORT, Integer.toString(jmxPort)); performTest(builder); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java index e04e012..d468a4a 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java @@ -64,7 +64,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.TimeUnit; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.START_LOCATOR; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static com.gemstone.gemfire.test.dunit.Assert.*; import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion; @@ -917,7 +917,7 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase { } private ClientCache setupClientCache(final String durableClientId, final int serverPort) { - ClientCache clientCache = new ClientCacheFactory().set(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId).create(); + ClientCache clientCache = new ClientCacheFactory().set(DURABLE_CLIENT_ID, durableClientId).create(); PoolFactory poolFactory = PoolManager.createFactory(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/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 3fc1fcc..b97cef3 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 @@ -35,8 +35,7 @@ import org.junit.experimental.categories.Category; import java.io.File; import java.util.*; -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.*; /** @@ -101,8 +100,8 @@ public class LauncherLifecycleCommandsJUnitTest { final Properties gemfireProperties = new Properties(); gemfireProperties.setProperty(LOCATORS, "localhost[11235]"); - gemfireProperties.setProperty(DistributionConfig.LOG_LEVEL_NAME, "config"); - gemfireProperties.setProperty(DistributionConfig.LOG_FILE_NAME, StringUtils.EMPTY_STRING); + gemfireProperties.setProperty(LOG_LEVEL, "config"); + gemfireProperties.setProperty(LOG_FILE, StringUtils.EMPTY_STRING); gemfireProperties.setProperty(MCAST_PORT, "0"); gemfireProperties.setProperty(SystemConfigurationProperties.NAME, "tidepool"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java index 6861f64..62131fe 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/RestInterfaceJUnitTest.java @@ -50,7 +50,7 @@ import java.io.InputStreamReader; import java.text.SimpleDateFormat; import java.util.*; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.*; /** @@ -110,7 +110,7 @@ public class RestInterfaceJUnitTest { .setPdxIgnoreUnreadFields(false) .set("name", getClass().getSimpleName()) .set(MCAST_PORT, "0") - .set(DistributionConfig.LOG_LEVEL_NAME, "config") + .set(LOG_LEVEL, "config") .set(DistributionConfig.HTTP_SERVICE_BIND_ADDRESS_NAME, "localhost") .set(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(getHttpServicePort())) //.set("http-service-ssl-enabled", "false") http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java index 604e3cf..4be3b0f 100644 --- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java +++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java @@ -53,8 +53,7 @@ import java.util.HashMap; import java.util.Map; 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.*; /** * @@ -245,26 +244,26 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase { private void configureSSL(Properties props, Properties sslProperties, boolean clusterLevel) { if (clusterLevel) { - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, DistributionConfig.CLUSTER_SSL_ENABLED_NAME); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, DistributionConfig.CLUSTER_SSL_KEYSTORE_NAME); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, - DistributionConfig.CLUSTER_SSL_KEYSTORE_PASSWORD_NAME); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, DistributionConfig.CLUSTER_SSL_KEYSTORE_TYPE_NAME); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, DistributionConfig.CLUSTER_SSL_PROTOCOLS_NAME); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME, - DistributionConfig.CLUSTER_SSL_REQUIRE_AUTHENTICATION_NAME); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_NAME, DistributionConfig.CLUSTER_SSL_TRUSTSTORE_NAME); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME, - DistributionConfig.CLUSTER_SSL_TRUSTSTORE_PASSWORD_NAME); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_ENABLED, CLUSTER_SSL_ENABLED); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE, CLUSTER_SSL_KEYSTORE); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, + CLUSTER_SSL_KEYSTORE_PASSWORD); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_TYPE, CLUSTER_SSL_KEYSTORE_TYPE); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_PROTOCOLS, CLUSTER_SSL_PROTOCOLS); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, + CLUSTER_SSL_REQUIRE_AUTHENTICATION); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE, CLUSTER_SSL_TRUSTSTORE); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, + CLUSTER_SSL_TRUSTSTORE_PASSWORD); } else { - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_ENABLED_NAME, null); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_NAME, null); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_PASSWORD_NAME, null); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME, null); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_PROTOCOLS_NAME, null); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION_NAME, null); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_NAME, null); - sslPropertyConverter(sslProperties, props, DistributionConfig.HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD_NAME, null); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_ENABLED, null); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE, null); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, null); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_TYPE, null); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_PROTOCOLS, null); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, null); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE, null); + sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, null); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/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 726b228..e5e2d6e 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 @@ -24,8 +24,6 @@ import java.util.Properties; import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; -//import com.gemstone.gemfire.admin.jmx.AgentConfig; -//import java.net.InetAddress; /** * Configuration for defining a GemFire distributed system to @@ -114,8 +112,7 @@ public interface DistributedSystemConfig extends Cloneable { /** The name of the "membership-port-range" property * @since GemFire 6.5 */ - String MEMBERSHIP_PORT_RANGE_NAME = - DistributionConfig.MEMBERSHIP_PORT_RANGE_NAME; + String MEMBERSHIP_PORT_RANGE_NAME = MEMBERSHIP_PORT_RANGE; /** * The default membership-port-range. @@ -197,32 +194,28 @@ public interface DistributedSystemConfig extends Cloneable { "rsh -n {HOST} {CMD}"; /** The name of the "SSLEnabled" property */ - String SSL_ENABLED_NAME = - DistributionConfig.SSL_ENABLED_NAME; + String SSL_ENABLED_NAME = SSL_ENABLED; /** The default ssl-enabled state (<code>false</code>) */ boolean DEFAULT_SSL_ENABLED = DistributionConfig.DEFAULT_SSL_ENABLED; /** The name of the "SSLProtocols" property */ - String SSL_PROTOCOLS_NAME = - DistributionConfig.SSL_PROTOCOLS_NAME; + String SSL_PROTOCOLS_NAME = SSL_PROTOCOLS; /** The default ssl-protocols value (<code>any</code>) */ String DEFAULT_SSL_PROTOCOLS = DistributionConfig.DEFAULT_SSL_PROTOCOLS; /** The name of the "SSLCiphers" property */ - String SSL_CIPHERS_NAME = - DistributionConfig.SSL_CIPHERS_NAME; + String SSL_CIPHERS_NAME = SSL_CIPHERS; /** The default ssl-ciphers value. (<code>any</code>) */ String DEFAULT_SSL_CIPHERS = DistributionConfig.DEFAULT_SSL_CIPHERS; /** The name of the "SSLRequireAuthentication" property */ - String SSL_REQUIRE_AUTHENTICATION_NAME = - DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME; + String SSL_REQUIRE_AUTHENTICATION_NAME = SSL_REQUIRE_AUTHENTICATION; /** The default ssl-require-authentication value (<code>true</code>) */ boolean DEFAULT_SSL_REQUIRE_AUTHENTICATION = @@ -241,21 +234,21 @@ public interface DistributedSystemConfig extends Cloneable { int DEFAULT_MEMBER_TIMEOUT = DistributionConfig.DEFAULT_MEMBER_TIMEOUT; /** The name of the "logFile" property */ - String LOG_FILE_NAME = DistributionConfig.LOG_FILE_NAME; + String LOG_FILE_NAME = LOG_FILE; /** The default log-file value ("" which directs logging to standard * output) */ String DEFAULT_LOG_FILE = ""; /** The name of the "logLevel" property */ - String LOG_LEVEL_NAME = DistributionConfig.LOG_LEVEL_NAME; + String LOG_LEVEL_NAME = LOG_LEVEL; /** The default log level ("config") */ String DEFAULT_LOG_LEVEL = "config"; /** The name of the "LogDiskSpaceLimit" property */ String LOG_DISK_SPACE_LIMIT_NAME = - DistributionConfig.LOG_DISK_SPACE_LIMIT_NAME; + LOG_DISK_SPACE_LIMIT; /** The default log disk space limit in megabytes (0) */ int DEFAULT_LOG_DISK_SPACE_LIMIT = @@ -270,8 +263,7 @@ public interface DistributedSystemConfig extends Cloneable { DistributionConfig.MAX_LOG_DISK_SPACE_LIMIT; /** The name of the "LogFileSizeLimit" property */ - String LOG_FILE_SIZE_LIMIT_NAME = - DistributionConfig.LOG_FILE_SIZE_LIMIT_NAME; + String LOG_FILE_SIZE_LIMIT_NAME = LOG_FILE_SIZE_LIMIT; /** The default log file size limit in megabytes (0) */ int DEFAULT_LOG_FILE_SIZE_LIMIT = http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java index 9438d91..38b9218 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java @@ -573,7 +573,7 @@ implements com.gemstone.gemfire.admin.AdminDistributedSystem, MCAST_ADDRESS, InetAddressUtil.toInetAddress(this.config.getMcastAddress())), new ConfigurationParameterImpl( - DistributionConfig.DISABLE_TCP_NAME, + DISABLE_TCP, Boolean.valueOf(this.config.getDisableTcp()) ), }; member.setConfiguration(configParms); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java index 225b4de..1994f05 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerConfigImpl.java @@ -18,9 +18,10 @@ package com.gemstone.gemfire.admin.internal; import com.gemstone.gemfire.admin.CacheServerConfig; import com.gemstone.gemfire.admin.CacheVmConfig; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.admin.GemFireVM; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * An implementation of <code>CacheVmConfig</code> * @@ -54,7 +55,7 @@ public class CacheServerConfigImpl extends ManagedEntityConfigImpl public CacheServerConfigImpl(GemFireVM vm) { super(vm); - String name = DistributionConfig.CACHE_XML_FILE_NAME; + String name = CACHE_XML_FILE; this.cacheXMLFile = vm.getConfig().getAttribute(name); this.classpath = null; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java index 524578d..ee6f597 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/CacheServerImpl.java @@ -18,11 +18,12 @@ package com.gemstone.gemfire.admin.internal; import com.gemstone.gemfire.admin.*; import com.gemstone.gemfire.distributed.internal.DM; -import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionManager; import com.gemstone.gemfire.internal.admin.GemFireVM; import com.gemstone.gemfire.internal.admin.remote.RemoteApplicationVM; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * Implements the administrative interface to a cache server. * @@ -142,7 +143,7 @@ public class CacheServerImpl extends ManagedSystemMemberImpl String file = this.getConfig().getCacheXMLFile(); if (file != null && file.length() > 0) { sb.append(" "); - sb.append(DistributionConfig.CACHE_XML_FILE_NAME); + sb.append(CACHE_XML_FILE); sb.append("="); sb.append(file); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java index 9f3c6c9..cad20d0 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributedSystemConfigImpl.java @@ -1088,7 +1088,7 @@ public class DistributedSystemConfigImpl buf.append(lf); buf.append(" " + TCP_PORT + "=" + this.tcpPort); buf.append(lf); - buf.append(" " + DistributionConfig.DISABLE_TCP_NAME + "="); + buf.append(" " + DISABLE_TCP + "="); buf.append(String.valueOf(this.disableTcp)); buf.append(lf); buf.append(" " + DistributionConfig.DISABLE_AUTO_RECONNECT_NAME + "="); @@ -1097,7 +1097,7 @@ public class DistributedSystemConfigImpl buf.append(" " + REMOTE_COMMAND_NAME + "="); buf.append(String.valueOf(this.remoteCommand)); buf.append(lf); - buf.append(" " + SSL_ENABLED_NAME + "="); + buf.append(" " + SSL_ENABLED + "="); buf.append(String.valueOf(this.sslEnabled)); buf.append(lf); buf.append(" " + SSL_CIPHERS_NAME + "="); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java index ab39935..0c1eab5 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/EnabledManagedEntityController.java @@ -32,7 +32,7 @@ import java.io.File; import java.util.Iterator; import java.util.Properties; -import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; /** * Implements the actual administration (starting, stopping, etc.) of @@ -318,16 +318,16 @@ class EnabledManagedEntityController implements ManagedEntityController { MCAST_PORT, "0"); sslProps.setProperty(prefix + - DistributionConfig.SSL_ENABLED_NAME, + SSL_ENABLED, String.valueOf(config.isSSLEnabled())); sslProps.setProperty(prefix + - DistributionConfig.SSL_CIPHERS_NAME, + SSL_CIPHERS, config.getSSLCiphers()); sslProps.setProperty(prefix + - DistributionConfig.SSL_PROTOCOLS_NAME, + SSL_PROTOCOLS, config.getSSLProtocols()); sslProps.setProperty(prefix + - DistributionConfig.SSL_REQUIRE_AUTHENTICATION_NAME, + SSL_REQUIRE_AUTHENTICATION, String.valueOf(config.isSSLAuthenticationRequired())); return sslProps; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java index 5aaa184..0f56d0f 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/AgentConfigImpl.java @@ -287,7 +287,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl props.setProperty(STATE_SAVE_FILE_NAME, String.valueOf(DEFAULT_STATE_SAVE_FILE)); - props.setProperty(SSL_ENABLED_NAME, + props.setProperty(SSL_ENABLED, String.valueOf(DEFAULT_SSL_ENABLED)); props.setProperty(SSL_PROTOCOLS_NAME, @@ -695,7 +695,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME, toString(EMAIL_NOTIFICATIONS_FROM_NAME, getEmailNotificationFrom())); props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME, toString(EMAIL_NOTIFICATIONS_TO_LIST_NAME, getEmailNotificationToList())); - props.setProperty(SSL_ENABLED_NAME, toString(SSL_ENABLED_NAME, isSSLEnabled())); + props.setProperty(SSL_ENABLED, toString(SSL_ENABLED, isSSLEnabled())); props.setProperty(SSL_PROTOCOLS_NAME, toString(SSL_PROTOCOLS_NAME, getSSLProtocols())); props.setProperty(SSL_CIPHERS_NAME, toString(SSL_CIPHERS_NAME, getSSLCiphers())); props.setProperty(SSL_REQUIRE_AUTHENTICATION_NAME, toString(SSL_REQUIRE_AUTHENTICATION_NAME, isSSLAuthenticationRequired())); @@ -1071,7 +1071,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl DEFAULT_HTTP_AUTHENTICATION_PASSWORD); this.sslEnabled = validateBoolean(props.getProperty( - SSL_ENABLED_NAME), + SSL_ENABLED), DEFAULT_SSL_ENABLED); this.sslProtocols = validateNonEmptyString(props.getProperty( SSL_PROTOCOLS_NAME), @@ -1280,7 +1280,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl return LocalizedStrings.AgentConfigImpl_REFRESH_INTERVAL_IN_SECONDS_FOR_AUTOREFRESH_OF_MEMBERS_AND_STATISTIC_RESOURCES.toLocalizedString(); } else if (prop.equals(REMOTE_COMMAND_NAME)) { return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_FOR_LAUNCHING_MEMBERS_OF_THE_DISTRIBUTED_SYSTEM.toLocalizedString(); - } else if (prop.equals(SSL_ENABLED_NAME)) { + } else if (prop.equals(SSL_ENABLED)) { return LocalizedStrings.AgentConfigImpl_DOES_THE_DISTRIBUTED_SYSTEM_COMMUNICATE_USING_SSL.toLocalizedString(); } else if (prop.equals(SSL_PROTOCOLS_NAME)) { return LocalizedStrings.AgentConfigImpl_SSL_PROTOCOLS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM.toLocalizedString(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java index 2667ec7..9e80cf3 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/MemberInfoWithStatsMBean.java @@ -16,6 +16,8 @@ */ package com.gemstone.gemfire.admin.jmx.internal; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.admin.*; import com.gemstone.gemfire.admin.jmx.Agent; import com.gemstone.gemfire.cache.InterestPolicy; @@ -658,10 +660,10 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean //assuming will never return as per current implementation ConfigurationParameter[] configParams = member.getConfiguration(); for (ConfigurationParameter configParam : configParams) { - if (DistributionConfig.STATISTIC_SAMPLING_ENABLED_NAME.equals(configParam.getName())) { + if (STATISTIC_SAMPLING_ENABLED.equals(configParam.getName())) { allDetails.put(MEMBER_STATSAMPLING_ENABLED, configParam.getValue()); statSamplingEnabled = Boolean.parseBoolean(""+configParam.getValue()); - } else if (DistributionConfig.ENABLE_TIME_STATISTICS_NAME.equals(configParam.getName())) { + } else if (ENABLE_TIME_STATISTICS.equals(configParam.getName())) { allDetails.put(MEMBER_TIME_STATS_ENABLED, configParam.getValue()); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java index b85e17a..94c8ecf 100644 --- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java @@ -45,6 +45,8 @@ import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.util.Properties; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * Authenticates this client (or a user) on a server. This op ideally should get * executed once-per-server. @@ -111,8 +113,7 @@ public class AuthenticateUserOp { DistributedMember server = new InternalDistributedMember(con.getSocket() .getInetAddress(), con.getSocket().getPort(), false); DistributedSystem sys = InternalDistributedSystem.getConnectedInstance(); - String authInitMethod = sys.getProperties().getProperty( - DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME); + String authInitMethod = sys.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT); Properties tmpSecurityProperties = sys.getSecurityProperties(); // LOG: following passes the DS API LogWriters into the security API @@ -158,8 +159,7 @@ public class AuthenticateUserOp { .getSocket().getInetAddress(), cnx.getSocket().getPort(), false); DistributedSystem sys = InternalDistributedSystem .getConnectedInstance(); - String authInitMethod = sys.getProperties().getProperty( - DistributionConfig.SECURITY_CLIENT_AUTH_INIT_NAME); + String authInitMethod = sys.getProperties().getProperty(SECURITY_CLIENT_AUTH_INIT); Properties credentials = HandShake.getCredentials(authInitMethod, this.securityProperties, server, false, (InternalLogWriter)sys.getLogWriter(), (InternalLogWriter)sys http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java index 96ea8ea..80f1b82 100755 --- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/DistributedSystem.java @@ -43,6 +43,8 @@ import java.net.URL; import java.util.*; import java.util.concurrent.TimeUnit; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + /** * A "connection" to a GemFire distributed system. A * <code>DistributedSystem</code> is created by invoking the {@link @@ -1742,7 +1744,7 @@ public abstract class DistributedSystem implements StatisticsFactory { // String prop=(String)en.nextElement(); // logger.info(prop + "=" + props.getProperty(prop)); //} - props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, "true"); + props.setProperty(CONSERVE_SOCKETS, "true"); // LOG: no longer using the LogWriter that was passed in return connect(props); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/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 52e9c34..1e350e7 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 @@ -17,6 +17,8 @@ package com.gemstone.gemfire.distributed; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.cache.client.internal.locator.LocatorStatusResponse; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.InternalLocator; @@ -1089,7 +1091,7 @@ public final class LocatorLauncher extends AbstractLauncher<String> { private Properties getOverriddenDefaults() { Properties overriddenDefaults = new Properties(); - overriddenDefaults.put(ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX.concat(DistributionConfig.LOG_FILE_NAME), + overriddenDefaults.put(ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX.concat(LOG_FILE), getLogFileName()); for (String key : System.getProperties().stringPropertyNames()) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb291539/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 252f701..fe441fd 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 @@ -17,6 +17,8 @@ package com.gemstone.gemfire.distributed; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; + import com.gemstone.gemfire.SystemFailure; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.partition.PartitionRegionHelper; @@ -1258,7 +1260,7 @@ public class ServerLauncher extends AbstractLauncher<String> { final Properties overriddenDefaults = new Properties(); overriddenDefaults.put( - ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX.concat(DistributionConfig.LOG_FILE_NAME), + ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX.concat(LOG_FILE), getLogFileName()); for (String key : System.getProperties().stringPropertyNames()) {
