geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [17/25] incubator-geode git commit: GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties
Date Fri, 10 Jun 2016 22:00:16 GMT
GEODE-1377: Renaming of DistributedSystemConfigProperties to ConfigurationProperties


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b5ed0935
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b5ed0935
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b5ed0935

Branch: refs/heads/feature/GEODE-835
Commit: b5ed093507a3a48fdd1f5cc556656b7cbb902f55
Parents: cc249d5
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Fri Jun 10 06:06:49 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Fri Jun 10 06:06:56 2016 +1000

----------------------------------------------------------------------
 .../ClientServerRegionFactoryDelegate.java      |    2 +-
 .../internal/RegionFactoryDelegate.java         |    2 +-
 .../gemfire/modules/HibernateJUnitTest.java     |    2 +-
 .../gemstone/gemfire/modules/SecondVMTest.java  |    2 +-
 .../session/bootstrap/AbstractCache.java        |    2 +-
 .../modules/session/TestSessionsBase.java       |    2 +-
 .../LocatorLauncherAssemblyIntegrationTest.java |    2 +-
 .../LauncherLifecycleCommandsDUnitTest.java     |    2 +-
 .../LauncherLifecycleCommandsJUnitTest.java     |    2 +-
 .../SharedConfigurationEndToEndDUnitTest.java   |    2 +-
 .../internal/web/RestInterfaceJUnitTest.java    |    2 +-
 .../web/controllers/RestAPITestBase.java        |    2 +-
 .../RestAPIsAndInterOpsDUnitTest.java           |    4 +-
 ...APIsOnMembersFunctionExecutionDUnitTest.java |    2 +-
 .../RestAPIsQueryAndFEJUnitTest.java            |    2 +-
 .../controllers/RestAPIsWithSSLDUnitTest.java   |    4 +-
 .../gemfire/admin/DistributedSystemConfig.java  |    2 +-
 .../internal/AdminDistributedSystemImpl.java    |    2 +-
 .../admin/internal/CacheServerConfigImpl.java   |    2 +-
 .../gemfire/admin/internal/CacheServerImpl.java |    2 +-
 .../internal/DistributedSystemConfigImpl.java   |    2 +-
 .../internal/DistributionLocatorConfigImpl.java |    2 +-
 .../EnabledManagedEntityController.java         |    2 +-
 .../admin/internal/ManagedEntityConfigXml.java  |    4 +-
 .../admin/internal/ManagedSystemMemberImpl.java |    2 +-
 .../admin/jmx/internal/AgentConfigImpl.java     |    2 +-
 .../jmx/internal/MemberInfoWithStatsMBean.java  |    2 +-
 .../cache/client/ClientCacheFactory.java        |    4 +-
 .../client/internal/AuthenticateUserOp.java     |    2 +-
 .../gemfire/distributed/AbstractLauncher.java   |    2 +-
 .../distributed/ConfigurationProperties.java    | 1583 +++++++++++++++++
 .../gemfire/distributed/DistributedSystem.java  |    4 +-
 .../DistributedSystemConfigProperties.java      | 1590 ------------------
 .../gemfire/distributed/LocatorLauncher.java    |    2 +-
 .../gemfire/distributed/ServerLauncher.java     |    4 +-
 .../internal/AbstractDistributionConfig.java    |    2 +-
 .../internal/DistributionConfig.java            | 1003 +++++------
 .../internal/DistributionConfigImpl.java        |    4 +-
 .../internal/InternalDistributedSystem.java     |    4 +-
 .../distributed/internal/InternalLocator.java   |    2 +-
 .../distributed/internal/LocatorStats.java      |    2 +-
 .../internal/RuntimeDistributionConfigImpl.java |    2 +-
 .../internal/SharedConfiguration.java           |    2 +-
 .../membership/gms/auth/GMSAuthenticator.java   |    2 +-
 .../membership/gms/membership/GMSJoinLeave.java |    4 +-
 .../gemfire/internal/AbstractConfig.java        |    2 +-
 .../gemfire/internal/MigrationClient.java       |    6 +-
 .../gemfire/internal/MigrationServer.java       |    6 +-
 .../gemstone/gemfire/internal/SystemAdmin.java  |    4 +-
 .../gemfire/internal/admin/SSLConfig.java       |    2 +-
 .../admin/remote/RemoteTransportConfig.java     |    2 +-
 .../internal/cache/CacheServerLauncher.java     |   10 +-
 .../gemfire/internal/cache/DiskStoreImpl.java   |    2 +-
 .../gemfire/internal/cache/PoolStats.java       |    2 +-
 .../cache/tier/sockets/AcceptorImpl.java        |    2 +-
 .../cache/tier/sockets/CacheClientNotifier.java |    2 +-
 .../tier/sockets/ClientProxyMembershipID.java   |    2 +-
 .../internal/cache/tier/sockets/HandShake.java  |    2 +-
 .../cache/tier/sockets/ServerConnection.java    |    2 +-
 .../tier/sockets/ServerHandShakeProcessor.java  |    2 +-
 .../internal/cache/xmlcache/CacheXml.java       |    4 +-
 .../internal/logging/LogWriterFactory.java      |    2 +-
 .../internal/security/GeodeSecurityUtil.java    |    3 +-
 .../security/shiro/CustomAuthRealm.java         |    2 +-
 .../gemfire/internal/tcp/Connection.java        |    2 +-
 .../management/internal/cli/CommandManager.java |    6 +-
 .../internal/cli/commands/ConfigCommands.java   |    2 +-
 .../cli/commands/LauncherLifecycleCommands.java |    2 +-
 .../internal/cli/commands/ShellCommands.java    |    2 +-
 .../cli/functions/ChangeLogLevelFunction.java   |    2 +-
 .../GetMemberConfigInformationFunction.java     |    2 +-
 .../internal/cli/i18n/CliStrings.java           |   14 +-
 .../internal/cli/shell/JmxOperationInvoker.java |    2 +-
 .../DurableClientCommandsController.java        |   12 +-
 .../gemfire/redis/GemFireRedisServer.java       |    2 +-
 .../com/gemstone/gemfire/CopyJUnitTest.java     |    2 +-
 .../gemfire/DiskInstantiatorsJUnitTest.java     |    2 +-
 .../com/gemstone/gemfire/GemFireTestCase.java   |    2 +-
 .../gemfire/JtaNoninvolvementJUnitTest.java     |    2 +-
 .../gemfire/LocalStatisticsJUnitTest.java       |    2 +-
 .../com/gemstone/gemfire/LonerDMJUnitTest.java  |    2 +-
 .../com/gemstone/gemfire/TXExpiryJUnitTest.java |    2 +-
 .../java/com/gemstone/gemfire/TXJUnitTest.java  |    2 +-
 .../com/gemstone/gemfire/TXWriterTestCase.java  |    2 +-
 .../BindDistributedSystemJUnitTest.java         |    4 +-
 .../internal/DistributedSystemTestCase.java     |    2 +-
 .../admin/internal/HealthEvaluatorTestCase.java |    2 +-
 .../gemfire/cache/CacheListenerJUnitTest.java   |    4 +-
 .../cache/CacheRegionClearStatsDUnitTest.java   |    2 +-
 .../cache/ClientServerTimeSyncDUnitTest.java    |   21 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |    2 +-
 .../cache/ConnectionPoolFactoryJUnitTest.java   |    2 +-
 .../gemfire/cache/PoolManagerJUnitTest.java     |    4 +-
 .../gemstone/gemfire/cache/ProxyJUnitTest.java  |    4 +-
 .../gemfire/cache/RegionFactoryJUnitTest.java   |    2 +-
 ...ventQueueEvictionAndExpirationJUnitTest.java |    2 +-
 .../SerialAsyncEventQueueImplJUnitTest.java     |    2 +-
 .../client/ClientCacheFactoryJUnitTest.java     |    2 +-
 .../client/ClientRegionFactoryJUnitTest.java    |    4 +-
 .../ClientServerRegisterInterestsDUnitTest.java |    2 +-
 .../AutoConnectionSourceImplJUnitTest.java      |    4 +-
 .../CacheServerSSLConnectionDUnitTest.java      |    2 +-
 .../internal/ConnectionPoolImplJUnitTest.java   |    4 +-
 .../cache/client/internal/LocatorTestBase.java  |    9 +-
 .../client/internal/QueueManagerJUnitTest.java  |    4 +-
 .../internal/SSLNoClientAuthDUnitTest.java      |    2 +-
 .../pooling/ConnectionManagerJUnitTest.java     |    4 +-
 .../management/MXMemoryPoolListenerExample.java |   12 +-
 .../management/MemoryThresholdsDUnitTest.java   |    2 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |    2 +-
 .../ExceptionHandlingJUnitTest.java             |    4 +-
 .../mapInterface/MapFunctionalJUnitTest.java    |    4 +-
 .../mapInterface/PutAllGlobalLockJUnitTest.java |    2 +-
 .../PutOperationContextJUnitTest.java           |    4 +-
 .../GetOperationContextImplJUnitTest.java       |    4 +-
 .../query/Bug32947ValueConstraintJUnitTest.java |    2 +-
 .../gemfire/cache/query/CacheUtils.java         |    2 +-
 .../cache/query/PdxStringQueryJUnitTest.java    |    2 +-
 .../gemfire/cache/query/QueryTestUtils.java     |    2 +-
 .../cache/query/dunit/HelperTestCase.java       |    2 +-
 ...itionedRegionCompactRangeIndexDUnitTest.java |    2 +-
 .../QueryParamsAuthorizationDUnitTest.java      |    4 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |    2 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |    2 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |    2 +-
 .../functional/IUMRSingleRegionJUnitTest.java   |    2 +-
 .../functional/IndexCreationJUnitTest.java      |    2 +-
 .../MultiRegionIndexUsageJUnitTest.java         |    2 +-
 .../NegativeNumberQueriesJUnitTest.java         |    2 +-
 ...syncIndexUpdaterThreadShutdownJUnitTest.java |    2 +-
 .../index/CompactRangeIndexJUnitTest.java       |    2 +-
 .../index/CopyOnReadIndexDUnitTest.java         |    2 +-
 .../index/CopyOnReadIndexJUnitTest.java         |    2 +-
 .../DeclarativeIndexCreationJUnitTest.java      |    2 +-
 .../NewDeclarativeIndexCreationJUnitTest.java   |    2 +-
 .../index/PdxCopyOnReadQueryJUnitTest.java      |    2 +-
 ...gRegionCreationIndexUpdateTypeJUnitTest.java |    2 +-
 .../index/PutAllWithIndexPerfDUnitTest.java     |    2 +-
 .../cache/snapshot/RegionSnapshotJUnitTest.java |    2 +-
 .../cache/snapshot/SnapshotTestCase.java        |    4 +-
 .../gemfire/cache30/Bug38741DUnitTest.java      |    2 +-
 .../gemfire/cache30/Bug40255JUnitTest.java      |    2 +-
 .../gemfire/cache30/Bug40662JUnitTest.java      |    2 +-
 .../gemfire/cache30/Bug44418JUnitTest.java      |    4 +-
 .../gemfire/cache30/CacheLogRollDUnitTest.java  |    2 +-
 ...cheRegionsReliablityStatsCheckDUnitTest.java |    2 +-
 .../gemfire/cache30/CacheXml45DUnitTest.java    |    2 +-
 .../cache30/CacheXmlGeode10DUnitTest.java       |    2 +-
 .../gemfire/cache30/CacheXmlTestCase.java       |    2 +-
 .../cache30/ClientMembershipDUnitTest.java      |    4 +-
 .../ClientRegisterInterestDUnitTest.java        |    2 +-
 .../cache30/ClientServerCCEDUnitTest.java       |    2 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |    2 +-
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |    2 +-
 .../DistributedAckRegionCCEDUnitTest.java       |    2 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |    2 +-
 .../cache30/DistributedAckRegionDUnitTest.java  |    2 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |    2 +-
 .../DistributedMulticastRegionDUnitTest.java    |    2 +-
 .../DistributedNoAckRegionCCEDUnitTest.java     |    2 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |    2 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |    2 +-
 .../cache30/GlobalRegionCCEDUnitTest.java       |    2 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |    9 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |    2 +-
 .../OffHeapLRUEvictionControllerDUnitTest.java  |    2 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |    2 +-
 .../gemfire/cache30/QueueMsgDUnitTest.java      |    2 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |    4 +-
 .../RegionReliabilityListenerDUnitTest.java     |    2 +-
 .../cache30/RegionReliabilityTestCase.java      |    2 +-
 .../gemfire/cache30/RequiredRolesDUnitTest.java |    2 +-
 .../cache30/RolePerformanceDUnitTest.java       |    2 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       |    2 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |    2 +-
 .../AbstractLauncherIntegrationTest.java        |    2 +-
 .../AbstractLauncherIntegrationTestCase.java    |    2 +-
 .../distributed/AbstractLauncherTest.java       |    2 +-
 ...stractServerLauncherIntegrationTestCase.java |    2 +-
 .../distributed/DistributedMemberDUnitTest.java |    2 +-
 .../DistributedSystemConnectPerf.java           |    2 +-
 .../distributed/DistributedSystemDUnitTest.java |    2 +-
 .../distributed/HostedLocatorsDUnitTest.java    |    2 +-
 .../LauncherMemberMXBeanIntegrationTest.java    |    4 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |    4 +-
 .../gemfire/distributed/LocatorJUnitTest.java   |    6 +-
 .../LocatorLauncherIntegrationTest.java         |    2 +-
 .../LocatorLauncherLocalIntegrationTest.java    |    2 +-
 .../LocatorLauncherRemoteIntegrationTest.java   |    2 +-
 .../distributed/LocatorLauncherTest.java        |    2 +-
 .../gemfire/distributed/RoleDUnitTest.java      |    2 +-
 .../ServerLauncherIntegrationTest.java          |    2 +-
 .../ServerLauncherLocalIntegrationTest.java     |    8 +-
 .../ServerLauncherRemoteIntegrationTest.java    |    6 +-
 .../gemfire/distributed/ServerLauncherTest.java |    2 +-
 ...rverLauncherWithProviderIntegrationTest.java |    2 +-
 .../distributed/internal/Bug40751DUnitTest.java |    4 +-
 .../ConsoleDistributionManagerDUnitTest.java    |    2 +-
 .../internal/DistributionConfigJUnitTest.java   |    2 +-
 .../internal/DistributionManagerDUnitTest.java  |    2 +-
 .../InternalDistributedSystemJUnitTest.java     |    2 +-
 .../gemfire/distributed/internal/LDM.java       |    2 +-
 .../internal/ProductUseLogDUnitTest.java        |    2 +-
 .../locks/DLockReentrantLockJUnitTest.java      |    4 +-
 .../membership/MembershipJUnitTest.java         |    2 +-
 .../gms/auth/GMSAuthenticatorJUnitTest.java     |    2 +-
 .../gms/fd/GMSHealthMonitorJUnitTest.java       |    2 +-
 .../locator/GMSLocatorRecoveryJUnitTest.java    |    2 +-
 .../gms/membership/StatRecorderJUnitTest.java   |    4 +-
 .../messenger/JGroupsMessengerJUnitTest.java    |    2 +-
 .../gms/mgr/GMSMembershipManagerJUnitTest.java  |    2 +-
 .../TcpServerBackwardCompatDUnitTest.java       |    2 +-
 .../gemfire/disttx/CacheMapDistTXDUnitTest.java |    4 +-
 .../gemfire/disttx/DistTXExpiryJUnitTest.java   |    6 +-
 .../gemfire/disttx/DistTXJUnitTest.java         |    2 +-
 .../disttx/DistTXManagerImplJUnitTest.java      |    6 +-
 .../gemfire/disttx/DistTXOrderDUnitTest.java    |    2 +-
 .../DistTXReleasesOffHeapOnCloseJUnitTest.java  |   10 +-
 .../disttx/DistTXRestrictionsDUnitTest.java     |    2 +-
 .../disttx/DistTXWithDeltaDUnitTest.java        |    2 +-
 .../gemfire/disttx/DistTXWriterJUnitTest.java   |    6 +-
 .../disttx/DistTXWriterOOMEJUnitTest.java       |    6 +-
 .../gemfire/disttx/PRDistTXDUnitTest.java       |    2 +-
 .../gemfire/disttx/PRDistTXJUnitTest.java       |    6 +-
 .../disttx/PRDistTXWithVersionsDUnitTest.java   |    2 +-
 ...entPartitionedRegionWithDistTXDUnitTest.java |    2 +-
 .../internal/AbstractConfigJUnitTest.java       |    2 +-
 .../gemfire/internal/Bug51616JUnitTest.java     |    4 +-
 .../internal/GemFireStatSamplerJUnitTest.java   |    2 +-
 .../GemFireVersionIntegrationJUnitTest.java     |    2 +-
 .../gemfire/internal/InlineKeyJUnitTest.java    |    4 +-
 .../gemfire/internal/JSSESocketJUnitTest.java   |    2 +-
 .../internal/JarClassLoaderJUnitTest.java       |    2 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |    4 +-
 .../internal/PdxDeleteFieldDUnitTest.java       |    2 +-
 .../internal/PdxDeleteFieldJUnitTest.java       |    4 +-
 .../gemfire/internal/PdxRenameDUnitTest.java    |    2 +-
 .../gemfire/internal/PdxRenameJUnitTest.java    |    4 +-
 ...lityShouldUseArrayEqualsIntegrationTest.java |    4 +-
 .../internal/SSLConfigIntegrationJUnitTest.java |    2 +-
 .../gemfire/internal/SSLConfigJUnitTest.java    |    2 +-
 .../gemfire/internal/cache/BackupJUnitTest.java |    2 +-
 .../internal/cache/Bug33726JUnitTest.java       |    2 +-
 .../internal/cache/Bug34583JUnitTest.java       |    2 +-
 .../internal/cache/Bug37244JUnitTest.java       |    2 +-
 .../internal/cache/Bug39079DUnitTest.java       |    2 +-
 .../internal/cache/Bug41091DUnitTest.java       |    2 +-
 .../internal/cache/Bug41957DUnitTest.java       |    2 +-
 .../internal/cache/Bug45934DUnitTest.java       |    2 +-
 .../internal/cache/Bug48182JUnitTest.java       |    8 +-
 .../cache/CacheLifecycleListenerJUnitTest.java  |    2 +-
 .../internal/cache/CacheServiceJUnitTest.java   |    2 +-
 ...ssagesRegionCreationAndDestroyJUnitTest.java |    2 +-
 .../cache/ClientServerGetAllDUnitTest.java      |    2 +-
 ...ServerInvalidAndDestroyedEntryDUnitTest.java |    2 +-
 .../cache/ClientServerTransactionDUnitTest.java |   16 +-
 .../cache/ConcurrentMapLocalJUnitTest.java      |    2 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |    2 +-
 .../cache/ConnectDisconnectDUnitTest.java       |    2 +-
 .../cache/DeltaPropagationDUnitTest.java        |    2 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |    2 +-
 .../cache/DiskOfflineCompactionJUnitTest.java   |    2 +-
 .../internal/cache/DiskOldAPIsJUnitTest.java    |   10 +-
 .../cache/DiskRegCacheXmlJUnitTest.java         |    2 +-
 .../DiskRegCachexmlGeneratorJUnitTest.java      |    2 +-
 .../cache/DiskRegionClearJUnitTest.java         |    2 +-
 .../DiskRegionIllegalArguementsJUnitTest.java   |    2 +-
 ...iskRegionIllegalCacheXMLvaluesJUnitTest.java |    2 +-
 .../internal/cache/DiskRegionTestingBase.java   |    2 +-
 .../cache/DiskStoreFactoryJUnitTest.java        |    2 +-
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |    2 +-
 .../cache/FixedPRSinglehopDUnitTest.java        |    2 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |    2 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |    2 +-
 .../cache/IncrementalBackupDUnitTest.java       |    2 +-
 .../internal/cache/InterruptDiskJUnitTest.java  |    2 +-
 ...InterruptsConserveSocketsFalseDUnitTest.java |    2 +-
 .../LIFOEvictionAlgoEnabledRegionJUnitTest.java |    2 +-
 ...victionAlgoMemoryEnabledRegionJUnitTest.java |    2 +-
 .../internal/cache/MapInterfaceJUnitTest.java   |    2 +-
 .../cache/OffHeapEvictionDUnitTest.java         |    2 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |    2 +-
 .../cache/OfflineSnapshotJUnitTest.java         |    2 +-
 .../cache/P2PDeltaPropagationDUnitTest.java     |    2 +-
 .../cache/PRConcurrentMapOpsJUnitTest.java      |    2 +-
 .../cache/PRDataStoreMemoryJUnitTest.java       |    2 +-
 .../PRDataStoreMemoryOffHeapJUnitTest.java      |    2 +-
 ...dRegionAPIConserveSocketsFalseDUnitTest.java |    2 +-
 ...gionBucketCreationDistributionDUnitTest.java |    2 +-
 ...rtitionedRegionCacheXMLExampleDUnitTest.java |    2 +-
 .../PartitionedRegionDataStoreJUnitTest.java    |    2 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |    2 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |    2 +-
 ...artitionedRegionRedundancyZoneDUnitTest.java |    2 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |    2 +-
 ...RegionSingleHopWithServerGroupDUnitTest.java |    2 +-
 .../cache/PartitionedRegionTestHelper.java      |    4 +-
 .../PersistentPartitionedRegionJUnitTest.java   |    2 +-
 .../internal/cache/RegionListenerJUnitTest.java |    2 +-
 .../cache/RemoteTransactionDUnitTest.java       |    2 +-
 .../internal/cache/RunCacheInOldGemfire.java    |    6 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |    2 +-
 .../internal/cache/TXManagerImplJUnitTest.java  |    4 +-
 .../cache/TXReservationMgrJUnitTest.java        |    4 +-
 .../cache/TombstoneCreationJUnitTest.java       |    2 +-
 .../cache/TransactionsWithDeltaDUnitTest.java   |    4 +-
 .../internal/cache/UpdateVersionJUnitTest.java  |    2 +-
 .../cache/control/MemoryMonitorJUnitTest.java   |    2 +-
 .../control/MemoryMonitorOffHeapJUnitTest.java  |    2 +-
 .../control/RebalanceOperationDUnitTest.java    |    2 +-
 ...ltiThreadedOplogPerJUnitPerformanceTest.java |    2 +-
 .../cache/execute/Bug51193DUnitTest.java        |    2 +-
 ...ributedRegionFunctionExecutionDUnitTest.java |    2 +-
 .../execute/FunctionServiceStatsDUnitTest.java  |    2 +-
 .../MemberFunctionExecutionDUnitTest.java       |    2 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |    2 +-
 ...egionFunctionExecutionFailoverDUnitTest.java |    3 +-
 .../cache/execute/PRClientServerTestBase.java   |    2 +-
 .../execute/PRFunctionExecutionDUnitTest.java   |    2 +-
 .../cache/ha/BlockingHARegionJUnitTest.java     |    2 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |    2 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |    2 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |    2 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |   10 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |    2 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |    2 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |    2 +-
 .../cache/ha/HAConflationDUnitTest.java         |    2 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |    2 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |    2 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |    2 +-
 .../cache/ha/HARQAddOperationJUnitTest.java     |    2 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |    3 +-
 .../internal/cache/ha/HARegionJUnitTest.java    |    2 +-
 .../cache/ha/HARegionQueueJUnitTest.java        |    2 +-
 .../ha/HARegionQueueStartStopJUnitTest.java     |    4 +-
 .../cache/ha/HARegionQueueStatsJUnitTest.java   |    2 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |    2 +-
 .../ha/OperationsPropagationDUnitTest.java      |    2 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |    2 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |    2 +-
 .../cache/locks/TXLockServiceDUnitTest.java     |    2 +-
 .../internal/cache/lru/LRUClockJUnitTest.java   |    2 +-
 .../cache/lru/TransactionsWithOverflowTest.java |    4 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |    2 +-
 .../cache/partitioned/Bug47388DUnitTest.java    |    2 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |    2 +-
 .../PersistentPartitionedRegionDUnitTest.java   |    2 +-
 .../PersistentRecoveryOrderDUnitTest.java       |    2 +-
 .../tier/sockets/AcceptorImplJUnitTest.java     |    2 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |    2 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |    8 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |    2 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |    2 +-
 .../CacheServerMaxConnectionsJUnitTest.java     |    2 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |    2 +-
 .../CacheServerTransactionsDUnitTest.java       |    2 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |    2 +-
 .../tier/sockets/ClientConflationDUnitTest.java |    2 +-
 .../sockets/ClientHealthMonitorJUnitTest.java   |    4 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |    9 +-
 .../ClientServerForceInvalidateDUnitTest.java   |    2 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java |    2 +-
 .../cache/tier/sockets/ConflationDUnitTest.java |    2 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java  |    4 +-
 .../DataSerializerPropogationDUnitTest.java     |    2 +-
 .../DestroyEntryPropagationDUnitTest.java       |    2 +-
 .../sockets/DurableClientBug39997DUnitTest.java |    2 +-
 .../DurableClientQueueSizeDUnitTest.java        |    2 +-
 .../DurableClientReconnectDUnitTest.java        |    2 +-
 .../sockets/DurableClientStatsDUnitTest.java    |    2 +-
 .../sockets/DurableRegistrationDUnitTest.java   |    2 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |    2 +-
 .../sockets/EventIDVerificationDUnitTest.java   |    2 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |    2 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |    2 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |    2 +-
 .../InstantiatorPropagationDUnitTest.java       |    2 +-
 .../tier/sockets/InterestListDUnitTest.java     |    2 +-
 .../sockets/InterestListEndpointDUnitTest.java  |    2 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |    2 +-
 .../sockets/InterestRegrListenerDUnitTest.java  |    2 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |    2 +-
 .../tier/sockets/RedundancyLevelJUnitTest.java  |    2 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |    2 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |    2 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |    2 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |    2 +-
 .../sockets/ReliableMessagingDUnitTest.java     |    2 +-
 .../sockets/UnregisterInterestDUnitTest.java    |    2 +-
 .../sockets/UpdatePropagationDUnitTest.java     |    2 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |    2 +-
 .../cache/wan/AsyncEventQueueTestBase.java      |    2 +-
 .../asyncqueue/AsyncEventListenerDUnitTest.java |    2 +-
 .../AsyncEventQueueValidationsJUnitTest.java    |    2 +-
 .../CompressionCacheConfigDUnitTest.java        |    2 +-
 ...ompressionCacheListenerOffHeapDUnitTest.java |    2 +-
 ...ressionRegionOperationsOffHeapDUnitTest.java |    2 +-
 .../datasource/AbstractPoolCacheJUnitTest.java  |    2 +-
 .../internal/datasource/CleanUpJUnitTest.java   |    2 +-
 .../ConnectionPoolCacheImplJUnitTest.java       |    2 +-
 .../datasource/ConnectionPoolingJUnitTest.java  |    2 +-
 .../datasource/DataSourceFactoryJUnitTest.java  |    2 +-
 .../internal/datasource/RestartJUnitTest.java   |    2 +-
 .../internal/jta/BlockingTimeOutJUnitTest.java  |    2 +-
 .../gemfire/internal/jta/CacheUtils.java        |    2 +-
 .../internal/jta/DataSourceJTAJUnitTest.java    |    2 +-
 .../internal/jta/ExceptionJUnitTest.java        |    2 +-
 .../jta/GlobalTransactionJUnitTest.java         |    2 +-
 .../internal/jta/JtaIntegrationJUnitTest.java   |    2 +-
 .../internal/jta/TransactionImplJUnitTest.java  |    2 +-
 .../jta/TransactionManagerImplJUnitTest.java    |    2 +-
 .../jta/TransactionTimeOutJUnitTest.java        |    2 +-
 .../jta/UserTransactionImplJUnitTest.java       |    2 +-
 .../internal/jta/dunit/ExceptionsDUnitTest.java |    4 +-
 .../jta/dunit/IdleTimeOutDUnitTest.java         |    4 +-
 .../jta/dunit/LoginTimeOutDUnitTest.java        |    2 +-
 .../jta/dunit/MaxPoolSizeDUnitTest.java         |    2 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java  |    2 +-
 .../dunit/TxnManagerMultiThreadDUnitTest.java   |    2 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java |    2 +-
 .../DistributedSystemLogFileJUnitTest.java      |    2 +-
 .../logging/LocatorLogFileJUnitTest.java        |    2 +-
 .../logging/LogWriterPerformanceTest.java       |    2 +-
 .../CustomConfigWithCacheIntegrationTest.java   |    2 +-
 .../internal/offheap/InlineKeyJUnitTest.java    |    8 +-
 .../internal/offheap/OffHeapIndexJUnitTest.java |    8 +-
 .../internal/offheap/OffHeapRegionBase.java     |    8 +-
 .../offheap/OffHeapValidationJUnitTest.java     |    8 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java    |    2 +-
 .../TxReleasesOffHeapOnCloseJUnitTest.java      |    8 +-
 .../statistics/StatisticsDUnitTest.java         |    2 +-
 .../internal/stats50/AtomicStatsJUnitTest.java  |    2 +-
 .../ConcurrentHashMapIteratorJUnitTest.java     |    2 +-
 .../management/CacheManagementDUnitTest.java    |    2 +-
 .../management/ClientHealthStatsDUnitTest.java  |    2 +-
 .../DataBrowserJSONValidationJUnitTest.java     |    4 +-
 .../management/LocatorManagementDUnitTest.java  |    2 +-
 .../gemfire/management/ManagementTestBase.java  |    2 +-
 .../management/OffHeapManagementDUnitTest.java  |    2 +-
 .../gemfire/management/TypedJsonJUnitTest.java  |    2 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |    2 +-
 .../stats/DistributedSystemStatsJUnitTest.java  |    2 +-
 .../bean/stats/MBeanStatsTestCase.java          |    4 +-
 .../internal/cli/CliUtilDUnitTest.java          |    2 +-
 .../cli/HeadlessGfshIntegrationTest.java        |    2 +-
 .../cli/commands/CliCommandTestBase.java        |    2 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |    2 +-
 ...eateAlterDestroyRegionCommandsDUnitTest.java |    2 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |    2 +-
 .../commands/DiskStoreCommandsDUnitTest.java    |    2 +-
 .../cli/commands/FunctionCommandsDUnitTest.java |    2 +-
 .../commands/GemfireDataCommandsDUnitTest.java  |    2 +-
 ...WithCacheLoaderDuringCacheMissDUnitTest.java |    2 +-
 .../HTTPServiceSSLSupportJUnitTest.java         |    2 +-
 .../commands/HelpCommandsIntegrationTest.java   |    2 +-
 .../cli/commands/IndexCommandsDUnitTest.java    |    2 +-
 ...stAndDescribeDiskStoreCommandsDUnitTest.java |    6 +-
 .../ListAndDescribeRegionDUnitTest.java         |    4 +-
 .../cli/commands/ListIndexCommandDUnitTest.java |    2 +-
 .../cli/commands/MemberCommandsDUnitTest.java   |    2 +-
 .../MiscellaneousCommandsDUnitTest.java         |    2 +-
 ...laneousCommandsExportLogsPart3DUnitTest.java |    2 +-
 .../cli/commands/QueueCommandsDUnitTest.java    |    6 +-
 .../SharedConfigurationCommandsDUnitTest.java   |    2 +-
 .../cli/commands/ShowDeadlockDUnitTest.java     |    4 +-
 .../cli/commands/ShowMetricsDUnitTest.java      |    2 +-
 .../cli/commands/ShowStackTraceDUnitTest.java   |    4 +-
 .../cli/commands/UserCommandsDUnitTest.java     |    4 +-
 .../functions/DataCommandFunctionJUnitTest.java |    2 +-
 .../SharedConfigurationDUnitTest.java           |    2 +-
 .../SharedConfigurationUsingDirDUnitTest.java   |    2 +-
 .../utils/XmlUtilsAddNewNodeJUnitTest.java      |    2 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |    2 +-
 .../pulse/TestSubscriptionsDUnitTest.java       |    2 +-
 .../GeodeSecurityUtilCustomRealmJUnitTest.java  |    2 +-
 .../GeodeSecurityUtilWithIniFileJUnitTest.java  |    2 +-
 .../JsonAuthorizationCacheStartRule.java        |    2 +-
 .../internal/security/MultiUserDUnitTest.java   |    2 +-
 .../internal/security/ShiroCacheStartRule.java  |    2 +-
 .../ReadOpFileAccessControllerJUnitTest.java    |    4 +-
 .../DomainObjectsAsValuesJUnitTest.java         |    3 +-
 .../GemcachedDevelopmentJUnitTest.java          |    2 +-
 .../gemfire/memcached/IntegrationJUnitTest.java |    2 +-
 .../gemfire/pdx/AutoSerializableJUnitTest.java  |    2 +-
 .../ClientsWithVersioningRetryDUnitTest.java    |    2 +-
 .../pdx/DistributedSystemIdDUnitTest.java       |    2 +-
 .../gemfire/pdx/JSONFormatterJUnitTest.java     |    2 +-
 .../pdx/JSONPdxClientServerDUnitTest.java       |    2 +-
 .../gemfire/pdx/PdxAttributesJUnitTest.java     |    2 +-
 .../gemfire/pdx/PdxClientServerDUnitTest.java   |    2 +-
 .../pdx/PdxInstanceFactoryJUnitTest.java        |    2 +-
 .../gemfire/pdx/PdxInstanceJUnitTest.java       |    2 +-
 .../gemfire/pdx/PdxSerializableJUnitTest.java   |    2 +-
 .../gemfire/pdx/PdxStringJUnitTest.java         |    2 +-
 .../gemstone/gemfire/redis/AuthJUnitTest.java   |    6 +-
 .../gemfire/redis/ConcurrentStartTest.java      |    4 +-
 .../gemstone/gemfire/redis/HashesJUnitTest.java |    2 +-
 .../gemstone/gemfire/redis/ListsJUnitTest.java  |    2 +-
 .../gemfire/redis/RedisDistDUnitTest.java       |    8 +-
 .../gemstone/gemfire/redis/SetsJUnitTest.java   |    2 +-
 .../gemfire/redis/SortedSetsJUnitTest.java      |    2 +-
 .../gemfire/redis/StringsJunitTest.java         |    2 +-
 .../security/ClientAuthenticationTestUtils.java |    2 +-
 .../security/ClientAuthorizationTestCase.java   |    2 +-
 .../security/P2PAuthenticationDUnitTest.java    |   10 +-
 .../gemfire/security/SecurityTestUtils.java     |    2 +-
 .../generator/LdapUserCredentialGenerator.java  |    2 +-
 .../generator/SSLCredentialGenerator.java       |    2 +-
 .../test/dunit/DistributedTestUtils.java        |    2 +-
 .../gemfire/test/dunit/LogWriterUtils.java      |    2 +-
 .../cache/internal/JUnit4CacheTestCase.java     |    2 +-
 .../internal/JUnit4DistributedTestCase.java     |    6 +-
 .../test/dunit/standalone/DUnitLauncher.java    |    2 +-
 .../test/dunit/standalone/ProcessManager.java   |    2 +-
 ...ingGetPropertiesDisconnectsAllDUnitTest.java |    2 +-
 ...ingGetPropertiesDisconnectsAllDUnitTest.java |    2 +-
 .../gemfire/test/golden/GoldenTestCase.java     |    4 +-
 .../gemfire/test/process/ProcessWrapper.java    |    2 +-
 .../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 |    2 +-
 .../gemfire/cache/query/cq/CQJUnitTest.java     |    2 +-
 .../cq/dunit/CqDataUsingPoolDUnitTest.java      |    2 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java  |    2 +-
 .../cq/dunit/CqQueryUsingPoolDUnitTest.java     |    2 +-
 .../cache/query/cq/dunit/CqStateDUnitTest.java  |    2 +-
 .../PartitionedRegionCqQueryDUnitTest.java      |    2 +-
 .../cache/query/dunit/PdxQueryCQTestBase.java   |    2 +-
 .../query/dunit/QueryMonitorDUnitTest.java      |  330 ++--
 .../cache/snapshot/ClientSnapshotDUnitTest.java |    2 +-
 .../cache/PRDeltaPropagationDUnitTest.java      |    2 +-
 .../internal/cache/PutAllCSDUnitTest.java       |    2 +-
 .../cache/RemoteCQTransactionDUnitTest.java     |    2 +-
 .../internal/cache/ha/CQListGIIDUnitTest.java   |    2 +-
 .../cache/ha/HADispatcherDUnitTest.java         |    4 +-
 .../sockets/ClientToServerDeltaDUnitTest.java   |    2 +-
 .../DeltaPropagationWithCQDUnitTest.java        |    2 +-
 ...ToRegionRelationCQRegistrationDUnitTest.java |    2 +-
 .../tier/sockets/DurableClientTestCase.java     |    2 +-
 .../CacheServerManagementDUnitTest.java         |    4 +-
 .../cli/commands/ClientCommandsDUnitTest.java   |    2 +-
 .../DurableClientCommandsDUnitTest.java         |    3 +-
 .../security/ClientAuthzObjectModDUnitTest.java |    8 +-
 .../gemfire/security/MultiUserAPIDUnitTest.java |    4 +-
 ...ceneIndexCreationOffHeapIntegrationTest.java |    4 +-
 .../cache/lucene/LuceneIntegrationTest.java     |    9 +-
 .../LuceneIndexRecoveryHAIntegrationTest.java   |    2 +-
 .../LuceneServiceImplIntegrationTest.java       |    2 +-
 .../IndexRepositoryImplPerformanceTest.java     |    2 +-
 ...neIndexXmlGeneratorIntegrationJUnitTest.java |    2 +-
 ...uceneIndexXmlParserIntegrationJUnitTest.java |    2 +-
 .../pulse/testbed/GemFireDistributedSystem.java |    2 +-
 .../gemfire/tools/pulse/tests/Server.java       |    2 +-
 .../util/AutoBalancerIntegrationJUnitTest.java  |    2 +-
 .../internal/cache/UpdateVersionDUnitTest.java  |    2 +-
 .../cache/wan/CacheClientNotifierDUnitTest.java |    2 +-
 .../gemfire/internal/cache/wan/WANTestBase.java |    2 +-
 .../cache/wan/disttx/DistTXWANDUnitTest.java    |    2 +-
 .../wan/misc/NewWanAuthenticationDUnitTest.java |    2 +-
 .../SenderWithTransportFilterDUnitTest.java     |    2 +-
 .../wan/misc/WANConfigurationJUnitTest.java     |    2 +-
 .../wan/misc/WANLocatorServerDUnitTest.java     |    2 +-
 ...llelGatewaySenderQueueOverflowDUnitTest.java |    2 +-
 .../SerialGatewaySenderQueueDUnitTest.java      |    2 +-
 .../wan/wancommand/WANCommandTestBase.java      |    2 +-
 ...anCommandCreateGatewayReceiverDUnitTest.java |    4 +-
 .../WanCommandCreateGatewaySenderDUnitTest.java |    2 +-
 ...WanCommandGatewayReceiverStartDUnitTest.java |    4 +-
 .../WanCommandGatewayReceiverStopDUnitTest.java |    4 +-
 .../WanCommandGatewaySenderStartDUnitTest.java  |    2 +-
 .../WanCommandGatewaySenderStopDUnitTest.java   |    2 +-
 .../wan/wancommand/WanCommandListDUnitTest.java |    2 +-
 .../WanCommandPauseResumeDUnitTest.java         |    2 +-
 .../wancommand/WanCommandStatusDUnitTest.java   |    4 +-
 .../ClusterConfigurationDUnitTest.java          |    2 +-
 .../ConnectCommandWithHttpAndSSLDUnitTest.java  |    2 +-
 582 files changed, 2996 insertions(+), 3062 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
index 5facd2f..f493e99 100644
--- a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
+++ b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/internal/ClientServerRegionFactoryDelegate.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.modules.util.RegionConfiguration;
 
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
 
 public class ClientServerRegionFactoryDelegate extends RegionFactoryDelegate {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 d3c098d..82a74b7 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,7 +31,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Iterator;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public class RegionFactoryDelegate  {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
index d92d688..d2802c6 100644
--- a/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
+++ b/extensions/geode-modules-hibernate/src/test/java/com/gemstone/gemfire/modules/HibernateJUnitTest.java
@@ -44,7 +44,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.logging.Level;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertEquals;
 
 @Category(IntegrationTest.class)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 d4df02c..bcfeab4 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
@@ -16,7 +16,7 @@
 */
 package com.gemstone.gemfire.modules;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.io.IOException;
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 74c7152..c14f829 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,7 +36,7 @@ import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 public abstract class AbstractCache {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 f2ef993..5726013 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
@@ -16,7 +16,7 @@
 */
 package com.gemstone.gemfire.modules.session;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.beans.PropertyChangeEvent;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 9bec901..c37c0b5 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
@@ -38,7 +38,7 @@ import java.io.File;
 
 import static org.junit.Assert.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * These tests are part of assembly as they require the REST war file to be present.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 a0d65b0..da4c4ab 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.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 54460c3..fe8d0be 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
@@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category;
 import java.io.File;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 93cb31a..899f187 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
@@ -50,7 +50,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.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.internal.AvailablePortHelper.getRandomAvailableTCPPorts;
 import static com.gemstone.gemfire.internal.FileUtil.delete;
 import static com.gemstone.gemfire.internal.FileUtil.deleteMatching;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 fdba506..8246671 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
@@ -49,7 +49,7 @@ import java.io.InputStreamReader;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
index d5bc12f..e61743a 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPITestBase.java
@@ -17,7 +17,7 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.io.BufferedReader;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index b601b3a..837aebe 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -21,8 +21,6 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 import com.gemstone.gemfire.cache.*;
@@ -58,7 +56,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Dunit Test containing inter - operations between REST Client and Gemfire cache client

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index 80d30e6..7199e1b 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import java.util.Properties;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
index b63b6ec..8321caf 100644
--- a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
+++ b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.rest.internal.web.controllers;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.net.InetAddress;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 e6b16d0..f01ab4b 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
@@ -21,8 +21,6 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 import com.gemstone.gemfire.cache.*;
@@ -61,7 +59,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 303242b..5ef389f 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
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 a5ca836..25dce1d 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
@@ -49,7 +49,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Represents a GemFire distributed system for remote administration/management.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 2653e8f..eb5b646 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
@@ -20,7 +20,7 @@ import com.gemstone.gemfire.admin.CacheServerConfig;
 import com.gemstone.gemfire.admin.CacheVmConfig;
 import com.gemstone.gemfire.internal.admin.GemFireVM;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * An implementation of <code>CacheVmConfig</code>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 114dc5b..325c943 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
@@ -22,7 +22,7 @@ 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.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Implements the administrative interface to a cache server.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 d85a610..517f5a6 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
@@ -32,7 +32,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.*;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * An implementation of the configuration object for an

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
index 1a73767..88d939a 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/DistributionLocatorConfigImpl.java
@@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import java.net.InetAddress;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Provides an implementation of

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 3f944d6..ff139c5 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.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Implements the actual administration (starting, stopping, etc.) of

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
index 5e26d61..ff6deca 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedEntityConfigXml.java
@@ -16,7 +16,7 @@
  */
 package com.gemstone.gemfire.admin.internal;
 
-import com.gemstone.gemfire.distributed.DistributedSystemConfigProperties;
+import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import org.xml.sax.*;
@@ -58,7 +58,7 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
   public static final String REMOTE_COMMAND = "remote-command";
 
   /** The name of the <code>locators</code> element. */
-  public static final String LOCATORS = DistributedSystemConfigProperties.LOCATORS;
+  public static final String LOCATORS = ConfigurationProperties.LOCATORS;
 
   /** The name of the <code>ssl</code> element. */
   public static final String SSL = "ssl";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
index 4cd93b1..e0ba1bb 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/admin/internal/ManagedSystemMemberImpl.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.admin.ConfigurationParameter;
 import com.gemstone.gemfire.admin.ManagedEntityConfig;
 import com.gemstone.gemfire.internal.admin.GemFireVM;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
 
 /**
  * A <code>SystemMember</code> that is also managed (or manageable) by

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 bffb59f..6c24816 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
@@ -35,7 +35,7 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Provides the JMX Agent configuration properties.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 cf90a3e..d14e5e6 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,7 +16,7 @@
  */
 package com.gemstone.gemfire.admin.jmx.internal;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 import com.gemstone.gemfire.admin.*;
 import com.gemstone.gemfire.admin.jmx.Agent;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
index 250df74..19cc8f5 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCacheFactory.java
@@ -30,8 +30,8 @@ import com.gemstone.gemfire.pdx.PdxSerializer;
 
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.LOCATORS;
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.MCAST_PORT;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.LOCATORS;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.MCAST_PORT;
 
 /**
  * Factory class used to create the singleton {@link ClientCache client cache} and connect to one or more GemFire Cache Servers. If the application wants to connect to GemFire as a peer it should use {@link com.gemstone.gemfire.cache.CacheFactory} instead.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 1d3360f..ca3b6f0 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
@@ -44,7 +44,7 @@ import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.util.Properties;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * Authenticates this client (or a user) on a server. This op ideally should get

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b5ed0935/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 ec1a4f9..7fccfb1 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,7 +46,7 @@ import java.util.logging.FileHandler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import static com.gemstone.gemfire.distributed.DistributedSystemConfigProperties.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 
 /**
  * The AbstractLauncher class is a base class for implementing various launchers to construct and run different GemFire


Mime
View raw message