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/70612010 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/70612010 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/70612010 Branch: refs/heads/develop Commit: 706120101a93e120453bd2adf725f187eb4f61ee Parents: 1e97dbb Author: Udo Kohlmeyer <[email protected]> Authored: Fri May 27 10:32:28 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Thu Jun 2 10:01:42 2016 +1000 ---------------------------------------------------------------------- .../modules/hibernate/GemFireCacheProvider.java | 8 +- .../modules/hibernate/GemFireRegionFactory.java | 56 +- .../ClientServerRegionFactoryDelegate.java | 23 +- .../internal/RegionFactoryDelegate.java | 25 +- .../gemfire/modules/HibernateJUnitTest.java | 105 +- .../gemstone/gemfire/modules/SecondVMTest.java | 29 +- .../internal/filter/GemfireSessionManager.java | 5 +- .../session/filter/SessionCachingFilter.java | 19 +- .../SessionReplicationIntegrationJUnitTest.java | 45 +- .../filter/SessionReplicationJUnitTest.java | 3 +- .../SessionReplicationLocalCacheJUnitTest.java | 5 +- .../session/bootstrap/AbstractCache.java | 4 +- .../modules/session/TestSessionsBase.java | 6 +- .../LauncherLifecycleCommandsDUnitTest.java | 114 +- .../LauncherLifecycleCommandsJUnitTest.java | 37 +- .../SharedConfigurationEndToEndDUnitTest.java | 68 +- .../internal/web/RestInterfaceJUnitTest.java | 55 +- .../web/controllers/RestAPITestBase.java | 3 +- .../RestAPIsAndInterOpsDUnitTest.java | 15 +- ...APIsOnMembersFunctionExecutionDUnitTest.java | 5 +- .../RestAPIsQueryAndFEJUnitTest.java | 52 +- .../controllers/RestAPIsWithSSLDUnitTest.java | 24 +- .../com/gemstone/gemfire/SystemFailure.java | 11 +- .../admin/AdminDistributedSystemFactory.java | 3 +- .../gemfire/admin/DistributedSystemConfig.java | 125 +- .../gemfire/admin/GemFireMemberStatus.java | 23 +- .../internal/AdminDistributedSystemImpl.java | 68 +- .../gemfire/admin/internal/CacheServerImpl.java | 4 +- .../internal/DistributedSystemConfigImpl.java | 495 ++--- .../DistributedSystemHealthEvaluator.java | 11 +- .../internal/DistributionLocatorConfigImpl.java | 5 +- .../admin/internal/DistributionLocatorImpl.java | 130 +- .../EnabledManagedEntityController.java | 15 +- .../admin/internal/ManagedEntityConfigXml.java | 7 +- .../admin/internal/ManagedSystemMemberImpl.java | 5 +- .../admin/internal/SystemMemberImpl.java | 24 +- .../gemstone/gemfire/admin/jmx/AgentConfig.java | 4 +- .../internal/AdminDistributedSystemJmxImpl.java | 98 +- .../admin/jmx/internal/AgentConfigImpl.java | 533 +++--- .../jmx/internal/MX4JServerSocketFactory.java | 11 +- .../jmx/internal/MemberInfoWithStatsMBean.java | 134 +- .../admin/jmx/internal/SystemMemberJmx.java | 53 +- .../gemfire/cache/DiskStoreFactory.java | 4 +- .../cache/client/ClientCacheFactory.java | 18 +- .../client/internal/AuthenticateUserOp.java | 8 +- .../client/internal/ClientMetadataService.java | 30 +- .../client/internal/ConnectionFactoryImpl.java | 12 +- .../internal/ExplicitConnectionSourceImpl.java | 17 +- .../cache/client/internal/OpExecutorImpl.java | 45 +- .../gemfire/cache/client/internal/PoolImpl.java | 68 +- .../cache/client/internal/ServerBlackList.java | 20 +- .../locator/wan/LocatorMembershipListener.java | 6 +- .../internal/pooling/ConnectionManagerImpl.java | 38 +- .../internal/FunctionServiceManager.java | 27 +- .../internal/AbstractGroupOrRangeJunction.java | 19 +- .../cache/query/internal/CompiledValue.java | 9 +- .../cache/query/internal/DefaultQuery.java | 40 +- .../query/internal/DefaultQueryService.java | 53 +- .../query/internal/cq/CqServiceProvider.java | 11 +- .../query/internal/index/IndexManager.java | 69 +- .../gemfire/cache/wan/GatewayReceiver.java | 7 +- .../gemfire/cache/wan/GatewaySender.java | 29 +- .../gemfire/distributed/AbstractLauncher.java | 40 +- .../gemfire/distributed/DistributedSystem.java | 21 +- .../gemfire/distributed/LocatorLauncher.java | 60 +- .../gemfire/distributed/ServerLauncher.java | 77 +- .../SystemConfigurationProperties.java | 183 ++ .../internal/AbstractDistributionConfig.java | 88 +- .../gemfire/distributed/internal/DSClock.java | 11 +- .../internal/DistributionAdvisor.java | 33 +- .../internal/DistributionConfig.java | 1422 +++++++------- .../internal/DistributionConfigImpl.java | 52 +- .../internal/DistributionManager.java | 68 +- .../FunctionExecutionPooledExecutor.java | 18 +- .../internal/InternalDistributedSystem.java | 82 +- .../distributed/internal/InternalLocator.java | 51 +- .../distributed/internal/LocatorStats.java | 17 +- .../internal/LonerDistributionManager.java | 28 +- .../internal/PooledExecutorWithDMStats.java | 14 +- .../distributed/internal/ReplyProcessor21.java | 16 +- .../distributed/internal/StartupMessage.java | 30 +- .../internal/direct/DirectChannel.java | 49 +- .../internal/locks/DLockGrantor.java | 23 +- .../internal/locks/DLockService.java | 54 +- .../internal/locks/LockGrantorId.java | 3 +- .../membership/InternalDistributedMember.java | 32 +- .../internal/membership/MemberFactory.java | 6 +- .../internal/membership/MemberServices.java | 7 +- .../internal/membership/gms/GMSMember.java | 18 +- .../membership/gms/GMSMemberFactory.java | 14 +- .../internal/membership/gms/ServiceConfig.java | 15 +- .../internal/membership/gms/Services.java | 14 +- .../membership/gms/auth/GMSAuthenticator.java | 22 +- .../membership/gms/membership/GMSJoinLeave.java | 19 +- .../membership/gms/messenger/JGAddress.java | 24 +- .../gms/messenger/JGroupsMessenger.java | 91 +- .../gms/mgr/GMSMembershipManager.java | 69 +- .../internal/tcpserver/TcpServer.java | 61 +- .../gemfire/internal/AbstractConfig.java | 24 +- .../com/gemstone/gemfire/internal/Assert.java | 5 +- .../gemfire/internal/AvailablePort.java | 10 +- .../com/gemstone/gemfire/internal/Banner.java | 5 +- .../gemfire/internal/ClassPathLoader.java | 30 +- .../com/gemstone/gemfire/internal/Config.java | 30 +- .../gemfire/internal/DistributionLocator.java | 20 +- .../com/gemstone/gemfire/internal/FileUtil.java | 14 +- .../gemfire/internal/HeapDataOutputStream.java | 24 +- .../gemfire/internal/HostStatSampler.java | 20 +- .../internal/InternalDataSerializer.java | 115 +- .../gemfire/internal/LinuxProcFsStatistics.java | 17 +- .../gemfire/internal/MigrationClient.java | 16 +- .../gemfire/internal/MigrationServer.java | 24 +- .../gemstone/gemfire/internal/OSProcess.java | 39 +- .../gemstone/gemfire/internal/PureJavaMode.java | 6 +- .../gemfire/internal/SharedLibrary.java | 3 +- .../gemfire/internal/SocketCreator.java | 98 +- .../gemfire/internal/StatArchiveWriter.java | 31 +- .../gemstone/gemfire/internal/SystemAdmin.java | 85 +- .../admin/remote/DistributionLocatorId.java | 12 +- .../admin/remote/FetchHostResponse.java | 22 +- .../internal/admin/remote/RemoteCacheInfo.java | 18 +- .../admin/remote/RemoteGfManagerAgent.java | 41 +- .../admin/remote/RemoteTransportConfig.java | 23 +- .../admin/remote/RootRegionResponse.java | 29 +- .../admin/remote/ShutdownAllRequest.java | 30 +- .../internal/admin/remote/TailLogResponse.java | 18 +- .../cache/AbstractBucketRegionQueue.java | 30 +- .../internal/cache/AbstractCacheServer.java | 6 +- .../gemfire/internal/cache/AbstractRegion.java | 72 +- .../internal/cache/AbstractRegionEntry.java | 43 +- .../internal/cache/AbstractRegionMap.java | 40 +- .../gemfire/internal/cache/BucketAdvisor.java | 39 +- .../gemfire/internal/cache/BucketRegion.java | 62 +- .../gemfire/internal/cache/CacheServerImpl.java | 49 +- .../internal/cache/CacheServerLauncher.java | 56 +- .../cache/CachedDeserializableFactory.java | 9 +- .../cache/ClusterConfigurationLoader.java | 23 +- .../internal/cache/ColocationHelper.java | 24 +- .../gemfire/internal/cache/DiskStoreImpl.java | 137 +- .../internal/cache/DiskStoreMonitor.java | 31 +- .../internal/cache/DiskWriteAttributesImpl.java | 11 +- .../internal/cache/DistributedRegion.java | 82 +- .../gemfire/internal/cache/EntryEventImpl.java | 52 +- .../gemfire/internal/cache/EntryExpiryTask.java | 19 +- .../gemfire/internal/cache/EventID.java | 24 +- .../gemfire/internal/cache/EventTracker.java | 24 +- .../internal/cache/ExpirationScheduler.java | 10 +- .../gemfire/internal/cache/ExpiryTask.java | 23 +- .../cache/FixedPartitionAttributesImpl.java | 11 +- .../internal/cache/GemFireCacheImpl.java | 183 +- .../internal/cache/InitialImageOperation.java | 73 +- .../gemfire/internal/cache/InlineKeyHelper.java | 4 +- .../gemfire/internal/cache/LocalRegion.java | 156 +- .../gemstone/gemfire/internal/cache/Oplog.java | 101 +- .../internal/cache/PRHARedundancyProvider.java | 68 +- .../internal/cache/PRQueryProcessor.java | 42 +- .../internal/cache/PartitionedRegion.java | 183 +- .../cache/PartitionedRegionDataStore.java | 73 +- .../internal/cache/PartitionedRegionHelper.java | 40 +- .../cache/PartitionedRegionQueryEvaluator.java | 59 +- .../gemfire/internal/cache/PoolFactoryImpl.java | 28 +- .../gemfire/internal/cache/PoolStats.java | 12 +- .../internal/cache/RegionEvictorTask.java | 14 +- .../cache/SearchLoadAndWriteProcessor.java | 59 +- .../gemfire/internal/cache/TXEntryState.java | 40 +- .../gemfire/internal/cache/TXManagerImpl.java | 61 +- .../internal/cache/TombstoneService.java | 181 +- .../cache/control/HeapMemoryMonitor.java | 127 +- .../cache/control/InternalResourceManager.java | 29 +- .../cache/control/MemoryThresholds.java | 15 +- .../cache/control/RebalanceOperationImpl.java | 26 +- .../internal/cache/execute/FunctionStats.java | 9 +- .../util/FindRestEnabledServersFunction.java | 1 - .../internal/cache/ha/HARegionQueue.java | 82 +- .../cache/ha/HARegionQueueAttributes.java | 4 +- .../gemfire/internal/cache/lru/HeapEvictor.java | 44 +- .../cache/lru/HeapLRUCapacityController.java | 13 +- .../internal/cache/lru/NewLRUClockHand.java | 19 +- .../internal/cache/lru/OffHeapEvictor.java | 5 +- .../internal/cache/partitioned/GetMessage.java | 43 +- .../cache/partitioned/PRSanityCheckMessage.java | 15 +- .../PartitionedRegionRebalanceOp.java | 31 +- .../cache/partitioned/RegionAdvisor.java | 51 +- .../cache/partitioned/SizedBasedLoadProbe.java | 4 +- .../cache/persistence/BackupManager.java | 21 +- .../persistence/PersistenceAdvisorImpl.java | 27 +- .../snapshot/RegionSnapshotServiceImpl.java | 47 +- .../cache/snapshot/WindowedExporter.java | 39 +- .../cache/tier/sockets/AcceptorImpl.java | 61 +- .../cache/tier/sockets/BaseCommand.java | 57 +- .../cache/tier/sockets/CacheClientNotifier.java | 13 +- .../cache/tier/sockets/CacheClientProxy.java | 86 +- .../cache/tier/sockets/CacheClientUpdater.java | 74 +- .../cache/tier/sockets/ClientHealthMonitor.java | 29 +- .../tier/sockets/ClientProxyMembershipID.java | 30 +- .../internal/cache/tier/sockets/HandShake.java | 83 +- .../internal/cache/tier/sockets/Message.java | 28 +- .../cache/tier/sockets/ServerConnection.java | 42 +- .../tier/sockets/command/TXFailoverCommand.java | 16 +- .../internal/cache/tx/ClientTXStateStub.java | 17 +- .../cache/versions/RegionVersionVector.java | 39 +- .../AbstractGatewaySenderEventProcessor.java | 43 +- .../wan/serial/SerialGatewaySenderQueue.java | 55 +- .../internal/cache/xmlcache/CacheXml.java | 21 +- .../gemfire/internal/concurrent/Atomics.java | 7 +- .../gemfire/internal/jndi/JNDIInvoker.java | 29 +- .../gemfire/internal/logging/LogConfig.java | 16 +- .../internal/logging/LogWriterFactory.java | 1 - .../internal/logging/ManagerLogWriter.java | 23 +- .../internal/logging/SecurityLogConfig.java | 4 +- .../internal/logging/SecurityLogWriter.java | 3 +- .../logging/SecurityManagerLogWriter.java | 5 +- .../internal/logging/log4j/AppenderContext.java | 6 +- .../logging/log4j/LogWriterAppenders.java | 28 +- .../internal/logging/log4j/LogWriterLogger.java | 20 +- .../internal/offheap/FreeListManager.java | 30 +- .../internal/offheap/MemoryAllocatorImpl.java | 30 +- .../internal/offheap/OffHeapStorage.java | 15 +- .../internal/offheap/ReferenceCountHelper.java | 8 +- .../internal/process/FileProcessController.java | 16 +- .../internal/process/LocalProcessLauncher.java | 4 +- .../process/ProcessControllerFactory.java | 11 +- .../process/ProcessLauncherContext.java | 13 +- .../gemfire/internal/process/ProcessType.java | 4 +- .../internal/security/GeodeSecurityUtil.java | 11 +- .../security/shiro/CustomAuthRealm.java | 33 +- .../internal/sequencelog/EntryLogger.java | 13 +- .../sequencelog/SequenceLoggerImpl.java | 14 +- .../gemfire/internal/size/ObjectGraphSizer.java | 10 +- .../internal/statistics/StatMonitorHandler.java | 16 +- .../gemfire/internal/stats50/VMStats50.java | 35 +- .../gemfire/internal/tcp/Connection.java | 70 +- .../gemfire/internal/tcp/MsgStreamer.java | 24 +- .../gemfire/internal/tcp/TCPConduit.java | 44 +- .../gemfire/internal/util/Breadcrumbs.java | 8 +- .../internal/util/JavaCommandBuilder.java | 4 +- .../concurrent/StoppableCountDownLatch.java | 9 +- .../gemfire/management/JMXNotificationType.java | 50 +- .../gemfire/management/internal/AgentUtil.java | 12 +- .../management/internal/JmxManagerAdvisee.java | 10 +- .../management/internal/ManagementAgent.java | 54 +- .../internal/ManagementConstants.java | 7 +- .../internal/beans/BeanUtilFuncs.java | 16 +- .../internal/beans/MemberMBeanBridge.java | 85 +- .../management/internal/cli/CommandManager.java | 45 +- .../internal/cli/commands/ConfigCommands.java | 17 +- .../cli/commands/LauncherLifecycleCommands.java | 1802 ++++++++---------- .../internal/cli/commands/ShellCommands.java | 19 +- .../functions/AlterRuntimeConfigFunction.java | 8 +- .../cli/functions/ChangeLogLevelFunction.java | 15 +- .../GetMemberConfigInformationFunction.java | 21 +- .../functions/GetMemberInformationFunction.java | 17 +- .../internal/cli/help/utils/HelpUtils.java | 19 +- .../internal/cli/i18n/CliStrings.java | 86 +- .../internal/cli/shell/JmxOperationInvoker.java | 53 +- .../configuration/utils/DtdResolver.java | 14 +- .../DurableClientCommandsController.java | 18 +- .../support/LoginHandlerInterceptor.java | 20 +- .../pdx/internal/AutoSerializableManager.java | 50 +- .../gemfire/pdx/internal/PdxWriterImpl.java | 22 +- .../gemfire/pdx/internal/TypeRegistry.java | 16 +- .../gemfire/redis/GemFireRedisServer.java | 46 +- .../internal/i18n/StringIdResourceBundle_ja.txt | 2 +- .../com/gemstone/gemfire/CopyJUnitTest.java | 14 +- .../gemfire/DiskInstantiatorsJUnitTest.java | 26 +- .../com/gemstone/gemfire/GemFireTestCase.java | 20 +- .../gemfire/JtaNoninvolvementJUnitTest.java | 28 +- .../gemfire/LocalStatisticsJUnitTest.java | 17 +- .../com/gemstone/gemfire/LonerDMJUnitTest.java | 44 +- .../com/gemstone/gemfire/TXExpiryJUnitTest.java | 47 +- .../java/com/gemstone/gemfire/TXJUnitTest.java | 98 +- .../com/gemstone/gemfire/TXWriterTestCase.java | 30 +- .../BindDistributedSystemJUnitTest.java | 29 +- .../internal/DistributedSystemTestCase.java | 15 +- .../admin/internal/HealthEvaluatorTestCase.java | 13 +- .../gemfire/cache/CacheListenerJUnitTest.java | 24 +- .../cache/CacheRegionClearStatsDUnitTest.java | 22 +- .../cache/ClientServerTimeSyncDUnitTest.java | 24 +- .../cache/ConnectionPoolAndLoaderDUnitTest.java | 22 +- .../cache/ConnectionPoolFactoryJUnitTest.java | 28 +- .../gemfire/cache/PoolManagerJUnitTest.java | 24 +- .../gemstone/gemfire/cache/ProxyJUnitTest.java | 25 +- .../gemfire/cache/RegionFactoryJUnitTest.java | 56 +- ...ventQueueEvictionAndExpirationJUnitTest.java | 32 +- .../SerialAsyncEventQueueImplJUnitTest.java | 14 +- .../client/ClientCacheFactoryJUnitTest.java | 83 +- .../client/ClientRegionFactoryJUnitTest.java | 46 +- .../ClientServerRegisterInterestsDUnitTest.java | 34 +- .../AutoConnectionSourceImplJUnitTest.java | 55 +- .../CacheServerSSLConnectionDUnitTest.java | 24 +- .../internal/ConnectionPoolImplJUnitTest.java | 27 +- .../cache/client/internal/LocatorTestBase.java | 20 +- .../client/internal/QueueManagerJUnitTest.java | 46 +- .../internal/SSLNoClientAuthDUnitTest.java | 23 +- .../pooling/ConnectionManagerJUnitTest.java | 59 +- .../management/MXMemoryPoolListenerExample.java | 32 +- .../management/MemoryThresholdsDUnitTest.java | 79 +- .../MemoryThresholdsOffHeapDUnitTest.java | 70 +- .../ExceptionHandlingJUnitTest.java | 28 +- .../mapInterface/MapFunctionalJUnitTest.java | 28 +- .../mapInterface/PutAllGlobalLockJUnitTest.java | 32 +- .../PutOperationContextJUnitTest.java | 25 +- .../GetOperationContextImplJUnitTest.java | 27 +- .../query/Bug32947ValueConstraintJUnitTest.java | 29 +- .../gemfire/cache/query/CacheUtils.java | 25 +- .../cache/query/PdxStringQueryJUnitTest.java | 26 +- .../gemfire/cache/query/QueryTestUtils.java | 33 +- .../cache/query/dunit/HelperTestCase.java | 42 +- ...itionedRegionCompactRangeIndexDUnitTest.java | 31 +- .../dunit/QueryIndexUsingXMLDUnitTest.java | 45 +- .../QueryParamsAuthorizationDUnitTest.java | 11 +- .../query/dunit/QueryUsingPoolDUnitTest.java | 4 +- .../cache/query/dunit/RemoteQueryDUnitTest.java | 74 +- ...esourceManagerWithQueryMonitorDUnitTest.java | 72 +- .../query/functional/CountStarJUnitTest.java | 29 +- ...ctResultsWithDupValuesInRegionJUnitTest.java | 29 +- .../functional/IUMRSingleRegionJUnitTest.java | 46 +- .../functional/IndexCreationJUnitTest.java | 97 +- .../functional/IndexOnEntrySetJUnitTest.java | 33 +- .../MultiRegionIndexUsageJUnitTest.java | 49 +- .../NegativeNumberQueriesJUnitTest.java | 26 +- .../query/functional/NumericQueryJUnitTest.java | 39 +- .../functional/QueryUndefinedJUnitTest.java | 24 +- .../query/functional/SelectToDateJUnitTest.java | 35 +- ...syncIndexUpdaterThreadShutdownJUnitTest.java | 22 +- .../index/AsynchIndexMaintenanceJUnitTest.java | 35 +- .../CompactRangeIndexIndexMapJUnitTest.java | 34 +- .../index/CompactRangeIndexJUnitTest.java | 34 +- ...pdateWithInplaceObjectModFalseDUnitTest.java | 35 +- ...ConcurrentIndexUpdateWithoutWLDUnitTest.java | 34 +- .../index/CopyOnReadIndexDUnitTest.java | 42 +- .../index/CopyOnReadIndexJUnitTest.java | 24 +- .../DeclarativeIndexCreationJUnitTest.java | 27 +- .../internal/index/IndexHintJUnitTest.java | 33 +- .../IndexTrackingQueryObserverJUnitTest.java | 33 +- .../NewDeclarativeIndexCreationJUnitTest.java | 32 +- .../index/PdxCopyOnReadQueryJUnitTest.java | 22 +- ...gRegionCreationIndexUpdateTypeJUnitTest.java | 23 +- .../index/PutAllWithIndexPerfDUnitTest.java | 37 +- .../cache/snapshot/RegionSnapshotJUnitTest.java | 41 +- .../cache/snapshot/SnapshotTestCase.java | 22 +- .../gemfire/cache30/Bug38741DUnitTest.java | 40 +- .../gemfire/cache30/Bug40255JUnitTest.java | 32 +- .../gemfire/cache30/Bug40662JUnitTest.java | 26 +- .../gemfire/cache30/Bug44418JUnitTest.java | 31 +- .../gemfire/cache30/CacheLogRollDUnitTest.java | 55 +- .../gemfire/cache30/CacheMapTxnDUnitTest.java | 23 +- ...cheRegionsReliablityStatsCheckDUnitTest.java | 16 +- .../gemfire/cache30/CacheXml30DUnitTest.java | 54 +- .../gemfire/cache30/CacheXml45DUnitTest.java | 16 +- .../cache30/CacheXmlGeode10DUnitTest.java | 14 +- .../gemfire/cache30/CacheXmlTestCase.java | 17 +- .../cache30/ClearMultiVmCallBkDUnitTest.java | 16 +- .../cache30/ClientMembershipDUnitTest.java | 28 +- .../ClientRegisterInterestDUnitTest.java | 27 +- .../cache30/ClientServerCCEDUnitTest.java | 41 +- .../cache30/DistAckMapMethodsDUnitTest.java | 30 +- ...tedAckOverflowRegionCCEOffHeapDUnitTest.java | 4 +- ...dAckPersistentRegionCCEOffHeapDUnitTest.java | 4 +- .../DistributedAckRegionCCEDUnitTest.java | 49 +- ...DistributedAckRegionCCEOffHeapDUnitTest.java | 4 +- .../cache30/DistributedAckRegionDUnitTest.java | 17 +- .../DistributedAckRegionOffHeapDUnitTest.java | 4 +- .../DistributedMulticastRegionDUnitTest.java | 43 +- .../DistributedNoAckRegionCCEDUnitTest.java | 28 +- ...stributedNoAckRegionCCEOffHeapDUnitTest.java | 4 +- .../DistributedNoAckRegionOffHeapDUnitTest.java | 4 +- .../cache30/GlobalRegionCCEDUnitTest.java | 14 +- .../GlobalRegionCCEOffHeapDUnitTest.java | 4 +- .../cache30/GlobalRegionOffHeapDUnitTest.java | 4 +- .../OffHeapLRUEvictionControllerDUnitTest.java | 8 +- .../PartitionedRegionOffHeapDUnitTest.java | 4 +- .../gemfire/cache30/QueueMsgDUnitTest.java | 26 +- .../cache30/RRSynchronizationDUnitTest.java | 35 +- .../gemfire/cache30/ReconnectDUnitTest.java | 52 +- .../ReconnectedCacheServerDUnitTest.java | 8 +- .../RegionReliabilityListenerDUnitTest.java | 17 +- .../cache30/RegionReliabilityTestCase.java | 57 +- .../gemfire/cache30/RequiredRolesDUnitTest.java | 27 +- .../cache30/RolePerformanceDUnitTest.java | 11 +- .../gemfire/cache30/SlowRecDUnitTest.java | 69 +- .../gemfire/cache30/TXDistributedDUnitTest.java | 67 +- .../AbstractLauncherIntegrationTest.java | 19 +- .../AbstractLauncherIntegrationTestCase.java | 38 +- .../distributed/AbstractLauncherTest.java | 44 +- ...ocatorLauncherRemoteIntegrationTestCase.java | 10 +- ...stractServerLauncherIntegrationTestCase.java | 20 +- ...ServerLauncherRemoteIntegrationTestCase.java | 18 +- .../distributed/DistributedMemberDUnitTest.java | 50 +- .../DistributedSystemConnectPerf.java | 12 +- .../distributed/DistributedSystemDUnitTest.java | 105 +- .../distributed/HostedLocatorsDUnitTest.java | 47 +- .../LauncherMemberMXBeanIntegrationTest.java | 41 +- .../gemfire/distributed/LocatorDUnitTest.java | 184 +- .../gemfire/distributed/LocatorJUnitTest.java | 72 +- .../LocatorLauncherIntegrationTest.java | 36 +- .../LocatorLauncherLocalIntegrationTest.java | 40 +- .../LocatorLauncherRemoteIntegrationTest.java | 187 +- .../distributed/LocatorLauncherTest.java | 25 +- .../gemfire/distributed/RoleDUnitTest.java | 19 +- .../ServerLauncherIntegrationTest.java | 36 +- .../ServerLauncherLocalIntegrationTest.java | 69 +- .../ServerLauncherRemoteIntegrationTest.java | 49 +- .../gemfire/distributed/ServerLauncherTest.java | 37 +- ...rverLauncherWithProviderIntegrationTest.java | 17 +- .../distributed/internal/Bug40751DUnitTest.java | 32 +- .../ConsoleDistributionManagerDUnitTest.java | 34 +- .../internal/DistributionConfigJUnitTest.java | 66 +- .../internal/DistributionManagerDUnitTest.java | 73 +- .../InternalDistributedSystemJUnitTest.java | 181 +- .../gemfire/distributed/internal/LDM.java | 12 +- .../internal/ProductUseLogDUnitTest.java | 26 +- .../locks/DLockReentrantLockJUnitTest.java | 14 +- .../membership/MembershipJUnitTest.java | 60 +- .../gms/auth/GMSAuthenticatorJUnitTest.java | 59 +- .../gms/fd/GMSHealthMonitorJUnitTest.java | 64 +- .../locator/GMSLocatorRecoveryJUnitTest.java | 41 +- .../gms/membership/GMSJoinLeaveJUnitTest.java | 52 +- .../gms/membership/StatRecorderJUnitTest.java | 43 +- .../messenger/JGroupsMessengerJUnitTest.java | 78 +- .../gms/mgr/GMSMembershipManagerJUnitTest.java | 53 +- .../TcpServerBackwardCompatDUnitTest.java | 27 +- .../gemfire/disttx/DistTXExpiryJUnitTest.java | 14 +- .../gemfire/disttx/DistTXJUnitTest.java | 24 +- .../disttx/DistTXManagerImplJUnitTest.java | 18 +- .../gemfire/disttx/DistTXOrderDUnitTest.java | 4 +- .../DistTXReleasesOffHeapOnCloseJUnitTest.java | 19 +- .../disttx/DistTXRestrictionsDUnitTest.java | 6 +- .../disttx/DistTXWithDeltaDUnitTest.java | 4 +- .../gemfire/disttx/DistTXWriterJUnitTest.java | 14 +- .../disttx/DistTXWriterOOMEJUnitTest.java | 14 +- .../disttx/DistributedTransactionDUnitTest.java | 50 +- .../gemfire/disttx/PRDistTXDUnitTest.java | 4 +- .../gemfire/disttx/PRDistTXJUnitTest.java | 20 +- .../disttx/PRDistTXWithVersionsDUnitTest.java | 4 +- ...entPartitionedRegionWithDistTXDUnitTest.java | 6 +- .../internal/AbstractConfigJUnitTest.java | 23 +- .../internal/AvailablePortJUnitTest.java | 17 +- .../gemfire/internal/Bug51616JUnitTest.java | 21 +- .../internal/GemFireStatSamplerJUnitTest.java | 69 +- .../GemFireVersionIntegrationJUnitTest.java | 19 +- .../gemfire/internal/InlineKeyJUnitTest.java | 32 +- .../gemfire/internal/JSSESocketJUnitTest.java | 244 ++- .../internal/JarClassLoaderJUnitTest.java | 49 +- .../gemfire/internal/JarDeployerDUnitTest.java | 35 +- .../internal/PdxDeleteFieldDUnitTest.java | 35 +- .../internal/PdxDeleteFieldJUnitTest.java | 48 +- .../gemfire/internal/PdxRenameDUnitTest.java | 35 +- .../gemfire/internal/PdxRenameJUnitTest.java | 36 +- ...lityShouldUseArrayEqualsIntegrationTest.java | 19 +- .../internal/SSLConfigIntegrationJUnitTest.java | 13 +- .../gemfire/internal/SSLConfigJUnitTest.java | 355 ++-- .../gemfire/internal/cache/BackupJUnitTest.java | 55 +- .../internal/cache/Bug33726JUnitTest.java | 23 +- .../internal/cache/Bug34583JUnitTest.java | 22 +- .../internal/cache/Bug37244JUnitTest.java | 37 +- .../internal/cache/Bug39079DUnitTest.java | 35 +- .../internal/cache/Bug41091DUnitTest.java | 28 +- .../internal/cache/Bug41957DUnitTest.java | 31 +- .../internal/cache/Bug45934DUnitTest.java | 25 +- .../internal/cache/Bug48182JUnitTest.java | 26 +- .../cache/CacheLifecycleListenerJUnitTest.java | 38 +- .../internal/cache/CacheServiceJUnitTest.java | 17 +- .../internal/cache/ClearDAckDUnitTest.java | 28 +- ...ssagesRegionCreationAndDestroyJUnitTest.java | 28 +- .../cache/ClientServerGetAllDUnitTest.java | 37 +- ...ServerInvalidAndDestroyedEntryDUnitTest.java | 27 +- .../cache/ClientServerTransactionDUnitTest.java | 135 +- .../cache/ConcurrentMapLocalJUnitTest.java | 23 +- .../cache/ConcurrentMapOpsDUnitTest.java | 38 +- .../cache/ConnectDisconnectDUnitTest.java | 41 +- .../cache/DeltaPropagationDUnitTest.java | 44 +- .../cache/DeltaPropagationStatsDUnitTest.java | 27 +- .../cache/DiskOfflineCompactionJUnitTest.java | 52 +- .../internal/cache/DiskOldAPIsJUnitTest.java | 33 +- .../cache/DiskRegCacheXmlJUnitTest.java | 33 +- .../DiskRegCachexmlGeneratorJUnitTest.java | 32 +- .../cache/DiskRegionClearJUnitTest.java | 48 +- .../DiskRegionIllegalArguementsJUnitTest.java | 33 +- ...iskRegionIllegalCacheXMLvaluesJUnitTest.java | 28 +- .../internal/cache/DiskRegionTestingBase.java | 48 +- .../cache/DiskStoreFactoryJUnitTest.java | 33 +- ...DistrbutedRegionProfileOffHeapDUnitTest.java | 11 +- .../internal/cache/EventTrackerDUnitTest.java | 36 +- .../internal/cache/EvictionTestBase.java | 35 +- .../cache/FixedPRSinglehopDUnitTest.java | 56 +- .../internal/cache/GIIDeltaDUnitTest.java | 41 +- .../internal/cache/GridAdvisorDUnitTest.java | 61 +- .../HAOverflowMemObjectSizerDUnitTest.java | 23 +- .../cache/IncrementalBackupDUnitTest.java | 38 +- .../internal/cache/InterruptDiskJUnitTest.java | 46 +- ...InterruptsConserveSocketsFalseDUnitTest.java | 4 +- .../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 41 +- ...victionAlgoMemoryEnabledRegionJUnitTest.java | 46 +- .../internal/cache/MapClearGIIDUnitTest.java | 30 +- .../internal/cache/MapInterfaceJUnitTest.java | 48 +- .../MultipleOplogsRollingFeatureJUnitTest.java | 10 +- .../cache/NetSearchMessagingDUnitTest.java | 24 +- .../cache/OffHeapEvictionDUnitTest.java | 16 +- .../cache/OffHeapEvictionStatsDUnitTest.java | 8 +- .../cache/OfflineSnapshotJUnitTest.java | 33 +- .../cache/P2PDeltaPropagationDUnitTest.java | 14 +- .../cache/PRConcurrentMapOpsJUnitTest.java | 27 +- .../cache/PRDataStoreMemoryJUnitTest.java | 22 +- .../PRDataStoreMemoryOffHeapJUnitTest.java | 8 +- ...dRegionAPIConserveSocketsFalseDUnitTest.java | 4 +- ...gionBucketCreationDistributionDUnitTest.java | 43 +- ...rtitionedRegionCacheXMLExampleDUnitTest.java | 15 +- .../PartitionedRegionDataStoreJUnitTest.java | 40 +- .../PartitionedRegionEvictionDUnitTest.java | 41 +- ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java | 4 +- ...rtitionedRegionOffHeapEvictionDUnitTest.java | 8 +- ...artitionedRegionRedundancyZoneDUnitTest.java | 11 +- .../PartitionedRegionSingleHopDUnitTest.java | 79 +- ...RegionSingleHopWithServerGroupDUnitTest.java | 61 +- .../cache/PartitionedRegionTestHelper.java | 32 +- .../PersistentPartitionedRegionJUnitTest.java | 28 +- .../internal/cache/RegionListenerJUnitTest.java | 22 +- .../cache/RemoteTransactionDUnitTest.java | 82 +- .../internal/cache/RunCacheInOldGemfire.java | 16 +- .../internal/cache/SingleHopStatsDUnitTest.java | 8 +- .../internal/cache/TXManagerImplJUnitTest.java | 37 +- .../cache/TXReservationMgrJUnitTest.java | 24 +- .../cache/TombstoneCreationJUnitTest.java | 38 +- .../cache/TransactionsWithDeltaDUnitTest.java | 15 +- .../internal/cache/UpdateVersionJUnitTest.java | 34 +- .../cache/control/MemoryMonitorJUnitTest.java | 47 +- .../control/MemoryMonitorOffHeapJUnitTest.java | 31 +- .../control/RebalanceOperationDUnitTest.java | 76 +- .../DiskRegionPersistOnlySyncJUnitTest.java | 28 +- ...ltiThreadedOplogPerJUnitPerformanceTest.java | 32 +- .../cache/execute/Bug51193DUnitTest.java | 35 +- ...ributedRegionFunctionExecutionDUnitTest.java | 65 +- .../execute/FunctionServiceStatsDUnitTest.java | 44 +- .../MemberFunctionExecutionDUnitTest.java | 36 +- .../OnGroupsFunctionExecutionDUnitTest.java | 50 +- ...egionFunctionExecutionFailoverDUnitTest.java | 39 +- .../cache/execute/PRClientServerTestBase.java | 44 +- .../execute/PRCustomPartitioningDUnitTest.java | 36 +- .../execute/PRFunctionExecutionDUnitTest.java | 66 +- .../cache/ha/BlockingHARegionJUnitTest.java | 22 +- .../cache/ha/Bug36853EventsExpiryDUnitTest.java | 31 +- .../internal/cache/ha/Bug48571DUnitTest.java | 53 +- .../internal/cache/ha/Bug48879DUnitTest.java | 13 +- .../cache/ha/EventIdOptimizationDUnitTest.java | 45 +- .../internal/cache/ha/FailoverDUnitTest.java | 37 +- .../internal/cache/ha/HABugInPutDUnitTest.java | 25 +- .../internal/cache/ha/HAClearDUnitTest.java | 32 +- .../cache/ha/HAConflationDUnitTest.java | 33 +- .../internal/cache/ha/HADuplicateDUnitTest.java | 36 +- .../cache/ha/HAEventIdPropagationDUnitTest.java | 41 +- .../internal/cache/ha/HAGIIDUnitTest.java | 41 +- .../cache/ha/HARQAddOperationJUnitTest.java | 43 +- .../cache/ha/HARQueueNewImplDUnitTest.java | 42 +- .../internal/cache/ha/HARegionJUnitTest.java | 41 +- .../cache/ha/HARegionQueueJUnitTest.java | 51 +- .../ha/HARegionQueueStartStopJUnitTest.java | 22 +- .../cache/ha/HARegionQueueStatsJUnitTest.java | 25 +- .../cache/ha/HASlowReceiverDUnitTest.java | 30 +- .../ha/OperationsPropagationDUnitTest.java | 32 +- .../internal/cache/ha/PutAllDUnitTest.java | 41 +- .../internal/cache/ha/StatsBugDUnitTest.java | 33 +- .../cache/locks/TXLockServiceDUnitTest.java | 24 +- .../internal/cache/lru/LRUClockJUnitTest.java | 36 +- .../cache/lru/TransactionsWithOverflowTest.java | 7 +- .../cache/partitioned/Bug43684DUnitTest.java | 37 +- .../cache/partitioned/Bug47388DUnitTest.java | 19 +- .../cache/partitioned/Bug51400DUnitTest.java | 19 +- .../PersistentPartitionedRegionDUnitTest.java | 67 +- .../fixed/FixedPartitioningTestBase.java | 62 +- .../PersistentRecoveryOrderDUnitTest.java | 63 +- .../tier/sockets/AcceptorImplJUnitTest.java | 29 +- ...mpatibilityHigherVersionClientDUnitTest.java | 32 +- .../cache/tier/sockets/Bug36269DUnitTest.java | 27 +- .../cache/tier/sockets/Bug36457DUnitTest.java | 31 +- .../cache/tier/sockets/Bug36805DUnitTest.java | 31 +- .../cache/tier/sockets/Bug36829DUnitTest.java | 24 +- .../cache/tier/sockets/Bug36995DUnitTest.java | 31 +- .../cache/tier/sockets/Bug37210DUnitTest.java | 34 +- .../cache/tier/sockets/Bug37805DUnitTest.java | 20 +- .../CacheServerMaxConnectionsJUnitTest.java | 36 +- .../cache/tier/sockets/CacheServerTestUtil.java | 105 +- .../CacheServerTransactionsDUnitTest.java | 38 +- .../tier/sockets/ClearPropagationDUnitTest.java | 39 +- .../tier/sockets/ClientConflationDUnitTest.java | 34 +- .../sockets/ClientHealthMonitorJUnitTest.java | 23 +- .../sockets/ClientInterestNotifyDUnitTest.java | 39 +- .../ClientServerForceInvalidateDUnitTest.java | 32 +- .../tier/sockets/ClientServerMiscDUnitTest.java | 50 +- .../cache/tier/sockets/ConflationDUnitTest.java | 45 +- .../tier/sockets/ConnectionProxyJUnitTest.java | 37 +- .../DataSerializerPropogationDUnitTest.java | 43 +- .../DestroyEntryPropagationDUnitTest.java | 59 +- .../sockets/DurableClientBug39997DUnitTest.java | 32 +- .../DurableClientQueueSizeDUnitTest.java | 30 +- .../DurableClientReconnectDUnitTest.java | 40 +- .../sockets/DurableClientStatsDUnitTest.java | 31 +- .../sockets/DurableRegistrationDUnitTest.java | 41 +- .../sockets/DurableResponseMatrixDUnitTest.java | 27 +- .../sockets/EventIDVerificationDUnitTest.java | 37 +- ...ForceInvalidateOffHeapEvictionDUnitTest.java | 8 +- .../cache/tier/sockets/HAInterestTestCase.java | 42 +- .../sockets/HAStartupAndFailoverDUnitTest.java | 55 +- .../InstantiatorPropagationDUnitTest.java | 45 +- .../tier/sockets/InterestListDUnitTest.java | 55 +- .../sockets/InterestListEndpointDUnitTest.java | 40 +- .../sockets/InterestListRecoveryDUnitTest.java | 45 +- .../sockets/InterestRegrListenerDUnitTest.java | 34 +- .../sockets/InterestResultPolicyDUnitTest.java | 37 +- .../tier/sockets/RedundancyLevelJUnitTest.java | 26 +- .../tier/sockets/RedundancyLevelTestBase.java | 35 +- .../tier/sockets/RegionCloseDUnitTest.java | 34 +- ...erInterestBeforeRegionCreationDUnitTest.java | 33 +- .../sockets/RegisterInterestKeysDUnitTest.java | 25 +- .../sockets/ReliableMessagingDUnitTest.java | 37 +- .../sockets/UnregisterInterestDUnitTest.java | 29 +- .../sockets/UpdatePropagationDUnitTest.java | 50 +- ...UpdatesFromNonInterestEndPointDUnitTest.java | 38 +- .../cache/wan/AsyncEventQueueTestBase.java | 79 +- .../asyncqueue/AsyncEventListenerDUnitTest.java | 24 +- .../AsyncEventQueueValidationsJUnitTest.java | 36 +- .../CompressionCacheConfigDUnitTest.java | 20 +- ...ompressionCacheListenerOffHeapDUnitTest.java | 8 +- ...ressionRegionOperationsOffHeapDUnitTest.java | 4 +- .../datasource/AbstractPoolCacheJUnitTest.java | 44 +- .../internal/datasource/CleanUpJUnitTest.java | 29 +- .../ConnectionPoolCacheImplJUnitTest.java | 32 +- .../datasource/ConnectionPoolingJUnitTest.java | 45 +- .../datasource/DataSourceFactoryJUnitTest.java | 28 +- .../internal/datasource/RestartJUnitTest.java | 29 +- .../internal/jta/BlockingTimeOutJUnitTest.java | 50 +- .../gemfire/internal/jta/CacheUtils.java | 25 +- .../internal/jta/DataSourceJTAJUnitTest.java | 46 +- .../internal/jta/ExceptionJUnitTest.java | 24 +- .../jta/GlobalTransactionJUnitTest.java | 33 +- .../internal/jta/JtaIntegrationJUnitTest.java | 27 +- .../internal/jta/TransactionImplJUnitTest.java | 22 +- .../jta/TransactionManagerImplJUnitTest.java | 30 +- .../jta/TransactionTimeOutJUnitTest.java | 47 +- .../jta/UserTransactionImplJUnitTest.java | 25 +- .../internal/jta/dunit/ExceptionsDUnitTest.java | 27 +- .../jta/dunit/IdleTimeOutDUnitTest.java | 38 +- .../jta/dunit/LoginTimeOutDUnitTest.java | 45 +- .../jta/dunit/MaxPoolSizeDUnitTest.java | 38 +- .../jta/dunit/TransactionTimeOutDUnitTest.java | 40 +- .../dunit/TxnManagerMultiThreadDUnitTest.java | 43 +- .../internal/jta/dunit/TxnTimeOutDUnitTest.java | 36 +- .../DistributedSystemLogFileJUnitTest.java | 144 +- .../logging/LocatorLogFileJUnitTest.java | 39 +- .../logging/LogWriterPerformanceTest.java | 17 +- .../logging/LoggingPerformanceTestCase.java | 10 +- .../internal/logging/TestLogWriterFactory.java | 11 +- .../logging/log4j/Log4J2PerformanceTest.java | 22 +- .../log4j/LogWriterLoggerPerformanceTest.java | 22 +- .../CustomConfigWithCacheIntegrationTest.java | 31 +- .../internal/offheap/FreeListManagerTest.java | 31 +- .../offheap/FreeListOffHeapRegionJUnitTest.java | 8 +- .../internal/offheap/InlineKeyJUnitTest.java | 35 +- ...moryAllocatorFillPatternIntegrationTest.java | 19 +- .../MemoryAllocatorFillPatternJUnitTest.java | 14 +- .../offheap/MemoryBlockNodeJUnitTest.java | 27 +- .../internal/offheap/OffHeapIndexJUnitTest.java | 32 +- .../internal/offheap/OffHeapRegionBase.java | 36 +- .../offheap/OffHeapStorageJUnitTest.java | 33 +- .../offheap/OffHeapValidationJUnitTest.java | 56 +- .../OldFreeListOffHeapRegionJUnitTest.java | 10 +- .../offheap/OutOfOffHeapMemoryDUnitTest.java | 19 +- .../TxReleasesOffHeapOnCloseJUnitTest.java | 24 +- .../internal/size/ObjectTraverserJUnitTest.java | 19 +- .../statistics/StatisticsDUnitTest.java | 55 +- .../internal/stats50/AtomicStatsJUnitTest.java | 25 +- .../ConcurrentHashMapIteratorJUnitTest.java | 18 +- .../management/CacheManagementDUnitTest.java | 42 +- .../management/ClientHealthStatsDUnitTest.java | 32 +- .../DataBrowserJSONValidationJUnitTest.java | 38 +- .../management/LocatorManagementDUnitTest.java | 51 +- .../management/OffHeapManagementDUnitTest.java | 33 +- .../gemfire/management/TypedJsonJUnitTest.java | 25 +- ...ersalMembershipListenerAdapterDUnitTest.java | 39 +- .../stats/DistributedSystemStatsJUnitTest.java | 28 +- .../bean/stats/MBeanStatsTestCase.java | 25 +- .../internal/cli/CliUtilDUnitTest.java | 30 +- .../cli/HeadlessGfshIntegrationTest.java | 36 +- .../cli/commands/CliCommandTestBase.java | 30 +- .../cli/commands/ConfigCommandsDUnitTest.java | 113 +- ...eateAlterDestroyRegionCommandsDUnitTest.java | 91 +- .../cli/commands/DeployCommandsDUnitTest.java | 51 +- .../commands/DiskStoreCommandsDUnitTest.java | 83 +- .../cli/commands/FunctionCommandsDUnitTest.java | 38 +- .../commands/GemfireDataCommandsDUnitTest.java | 54 +- ...WithCacheLoaderDuringCacheMissDUnitTest.java | 39 +- .../HTTPServiceSSLSupportJUnitTest.java | 40 +- .../commands/HelpCommandsIntegrationTest.java | 8 +- .../cli/commands/IndexCommandsDUnitTest.java | 57 +- ...stAndDescribeDiskStoreCommandsDUnitTest.java | 32 +- .../ListAndDescribeRegionDUnitTest.java | 28 +- .../cli/commands/ListIndexCommandDUnitTest.java | 39 +- .../cli/commands/MemberCommandsDUnitTest.java | 47 +- .../MiscellaneousCommandsDUnitTest.java | 55 +- ...laneousCommandsExportLogsPart3DUnitTest.java | 23 +- .../cli/commands/QueueCommandsDUnitTest.java | 48 +- .../SharedConfigurationCommandsDUnitTest.java | 72 +- .../cli/commands/ShellCommandsDUnitTest.java | 22 +- .../cli/commands/ShowDeadlockDUnitTest.java | 34 +- .../cli/commands/ShowMetricsDUnitTest.java | 43 +- .../cli/commands/ShowStackTraceDUnitTest.java | 22 +- .../cli/commands/UserCommandsDUnitTest.java | 15 +- .../functions/DataCommandFunctionJUnitTest.java | 10 +- .../SharedConfigurationDUnitTest.java | 87 +- .../SharedConfigurationUsingDirDUnitTest.java | 59 +- .../utils/XmlUtilsAddNewNodeJUnitTest.java | 37 +- .../internal/pulse/TestClientIdsDUnitTest.java | 31 +- .../pulse/TestSubscriptionsDUnitTest.java | 32 +- .../security/ExampleJSONAuthorization.java | 26 +- .../GeodeSecurityUtilCustomRealmJUnitTest.java | 1 - .../GeodeSecurityUtilWithIniFileJUnitTest.java | 9 +- .../internal/security/JSONAuthorization.java | 21 + .../JsonAuthorizationCacheStartRule.java | 14 +- .../internal/security/MultiUserDUnitTest.java | 19 +- .../internal/security/ShiroCacheStartRule.java | 14 +- .../ReadOpFileAccessControllerJUnitTest.java | 49 +- .../DomainObjectsAsValuesJUnitTest.java | 33 +- .../GemcachedDevelopmentJUnitTest.java | 36 +- .../gemfire/memcached/IntegrationJUnitTest.java | 37 +- .../gemfire/pdx/AutoSerializableJUnitTest.java | 57 +- .../ClientsWithVersioningRetryDUnitTest.java | 46 +- .../pdx/DistributedSystemIdDUnitTest.java | 23 +- .../gemfire/pdx/JSONFormatterJUnitTest.java | 31 +- .../pdx/JSONPdxClientServerDUnitTest.java | 24 +- .../gemfire/pdx/PdxAttributesJUnitTest.java | 48 +- .../gemfire/pdx/PdxClientServerDUnitTest.java | 56 +- .../pdx/PdxInstanceFactoryJUnitTest.java | 46 +- .../gemfire/pdx/PdxInstanceJUnitTest.java | 44 +- .../gemfire/pdx/PdxSerializableJUnitTest.java | 79 +- .../gemfire/pdx/PdxStringJUnitTest.java | 30 +- .../gemstone/gemfire/redis/AuthJUnitTest.java | 40 +- .../gemfire/redis/ConcurrentStartTest.java | 21 +- .../gemstone/gemfire/redis/HashesJUnitTest.java | 34 +- .../gemstone/gemfire/redis/ListsJUnitTest.java | 34 +- .../gemfire/redis/RedisDistDUnitTest.java | 33 +- .../gemstone/gemfire/redis/SetsJUnitTest.java | 35 +- .../gemfire/redis/SortedSetsJUnitTest.java | 40 +- .../gemfire/redis/StringsJunitTest.java | 34 +- .../security/ClientAuthenticationTestUtils.java | 12 +- .../security/ClientAuthorizationTestCase.java | 55 +- .../security/P2PAuthenticationDUnitTest.java | 136 +- .../gemfire/security/SecurityTestUtils.java | 116 +- .../generator/LdapUserCredentialGenerator.java | 13 +- .../generator/SSLCredentialGenerator.java | 18 +- .../UserPasswordWithExtraPropsAuthInit.java | 9 +- .../test/dunit/DistributedTestUtils.java | 14 +- .../gemfire/test/dunit/LogWriterUtils.java | 7 +- .../gemfire/test/dunit/NetworkUtils.java | 7 +- .../cache/internal/JUnit4CacheTestCase.java | 19 +- .../internal/JUnit4DistributedTestCase.java | 47 +- .../test/dunit/standalone/DUnitLauncher.java | 80 +- .../test/dunit/standalone/ProcessManager.java | 96 +- ...ingGetPropertiesDisconnectsAllDUnitTest.java | 17 +- ...ingGetPropertiesDisconnectsAllDUnitTest.java | 11 +- .../com/gemstone/gemfire/test/fake/Fakes.java | 12 +- .../gemfire/test/golden/GoldenTestCase.java | 16 +- .../gemfire/test/process/ProcessWrapper.java | 18 +- .../com/main/WANBootStrapping_Site1_Add.java | 15 +- .../com/main/WANBootStrapping_Site1_Remove.java | 10 +- .../com/main/WANBootStrapping_Site2_Add.java | 10 +- .../com/main/WANBootStrapping_Site2_Remove.java | 10 +- .../cache/query/internal/cq/CqServiceImpl.java | 64 +- .../gemfire/cache/query/cq/CQJUnitTest.java | 18 +- .../cq/dunit/CqDataUsingPoolDUnitTest.java | 56 +- .../cache/query/cq/dunit/CqQueryDUnitTest.java | 58 +- .../dunit/CqQueryOptimizedExecuteDUnitTest.java | 11 +- .../cq/dunit/CqQueryUsingPoolDUnitTest.java | 58 +- .../cache/query/cq/dunit/CqStateDUnitTest.java | 29 +- .../PartitionedRegionCqQueryDUnitTest.java | 40 +- ...dRegionCqQueryOptimizedExecuteDUnitTest.java | 10 +- .../cache/query/dunit/PdxQueryCQTestBase.java | 32 +- .../query/dunit/QueryMonitorDUnitTest.java | 40 +- .../cache/snapshot/ClientSnapshotDUnitTest.java | 16 +- .../cache/PRDeltaPropagationDUnitTest.java | 48 +- .../internal/cache/PutAllCSDUnitTest.java | 77 +- .../cache/RemoteCQTransactionDUnitTest.java | 39 +- .../internal/cache/ha/CQListGIIDUnitTest.java | 50 +- .../cache/ha/HADispatcherDUnitTest.java | 57 +- .../sockets/ClientToServerDeltaDUnitTest.java | 37 +- .../DeltaPropagationWithCQDUnitTest.java | 46 +- ...ToRegionRelationCQRegistrationDUnitTest.java | 46 +- .../sockets/DurableClientSimpleDUnitTest.java | 28 +- .../tier/sockets/DurableClientTestCase.java | 62 +- .../CacheServerManagementDUnitTest.java | 7 +- .../cli/commands/ClientCommandsDUnitTest.java | 65 +- .../DurableClientCommandsDUnitTest.java | 40 +- .../security/ClientAuthzObjectModDUnitTest.java | 30 +- .../gemfire/security/MultiUserAPIDUnitTest.java | 27 +- .../repository/IndexRepositoryImpl.java | 25 +- ...ceneIndexCreationOffHeapIntegrationTest.java | 17 +- .../cache/lucene/LuceneIntegrationTest.java | 22 +- .../LuceneIndexRecoveryHAIntegrationTest.java | 37 +- .../LuceneServiceImplIntegrationTest.java | 11 +- .../IndexRepositoryImplPerformanceTest.java | 70 +- ...neIndexXmlGeneratorIntegrationJUnitTest.java | 26 +- ...uceneIndexXmlParserIntegrationJUnitTest.java | 42 +- .../pulse/testbed/GemFireDistributedSystem.java | 4 +- .../gemfire/tools/pulse/tests/Server.java | 38 +- .../util/AutoBalancerIntegrationJUnitTest.java | 36 +- .../spark/connector/JavaApiIntegrationTest.java | 2 +- .../internal/locator/wan/LocatorDiscovery.java | 16 +- .../wan/LocatorMembershipListenerImpl.java | 37 +- .../locator/wan/WanLocatorDiscovererImpl.java | 19 +- .../cache/wan/AbstractRemoteGatewaySender.java | 17 +- .../internal/cache/UpdateVersionDUnitTest.java | 65 +- .../cache/wan/CacheClientNotifierDUnitTest.java | 50 +- .../gemfire/internal/cache/wan/WANTestBase.java | 192 +- .../ConcurrentWANPropogation_1_DUnitTest.java | 7 +- .../cache/wan/disttx/DistTXWANDUnitTest.java | 3 +- .../wan/misc/NewWanAuthenticationDUnitTest.java | 24 +- .../SenderWithTransportFilterDUnitTest.java | 28 +- .../wan/misc/WANConfigurationJUnitTest.java | 79 +- .../wan/misc/WANLocatorServerDUnitTest.java | 23 +- ...arallelGatewaySenderOperationsDUnitTest.java | 16 +- ...llelGatewaySenderQueueOverflowDUnitTest.java | 27 +- .../SerialGatewaySenderQueueDUnitTest.java | 33 +- .../serial/SerialWANPropogationDUnitTest.java | 22 +- .../wan/wancommand/WANCommandTestBase.java | 59 +- ...anCommandCreateGatewayReceiverDUnitTest.java | 62 +- .../WanCommandCreateGatewaySenderDUnitTest.java | 61 +- ...WanCommandGatewayReceiverStartDUnitTest.java | 42 +- .../WanCommandGatewayReceiverStopDUnitTest.java | 42 +- .../WanCommandGatewaySenderStartDUnitTest.java | 26 +- .../WanCommandGatewaySenderStopDUnitTest.java | 41 +- .../wan/wancommand/WanCommandListDUnitTest.java | 22 +- .../WanCommandPauseResumeDUnitTest.java | 57 +- .../wancommand/WanCommandStatusDUnitTest.java | 46 +- .../ClusterConfigurationDUnitTest.java | 120 +- .../web/swagger/config/RestApiPathProvider.java | 5 +- .../ConnectCommandWithHttpAndSSLDUnitTest.java | 115 +- 835 files changed, 13678 insertions(+), 20627 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireCacheProvider.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireCacheProvider.java b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireCacheProvider.java index 9cd6c88..b6db20a 100644 --- a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireCacheProvider.java +++ b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireCacheProvider.java @@ -21,6 +21,7 @@ import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache.execute.FunctionService; import com.gemstone.gemfire.distributed.DistributedLockService; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.logging.LogService; import com.gemstone.gemfire.modules.util.CreateRegionFunction; import com.gemstone.gemfire.modules.util.RegionConfiguration; @@ -125,7 +126,7 @@ public class GemFireCacheProvider implements CacheProvider { */ private String getRegionType(String regionName) { String rType = regionAttributes - .getProperty("gemfire.default-region-attributes-id"); + .getProperty(DistributionConfig.GEMFIRE_PREFIX + "default-region-attributes-id"); if (rType == null) { rType = DEFAULT_REGION_TYPE; } @@ -157,9 +158,8 @@ public class GemFireCacheProvider implements CacheProvider { String key = (String)keyObj; if (key.contains("region-attributes")) { regionAttributes.put(key, properties.get(key)); - } - else if (key.startsWith("gemfire.")) { - gemfireOnlyProperties.setProperty(key.replace("gemfire.", ""), + } else if (key.startsWith(DistributionConfig.GEMFIRE_PREFIX)) { + gemfireOnlyProperties.setProperty(key.replace(DistributionConfig.GEMFIRE_PREFIX, ""), properties.getProperty(key)); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireRegionFactory.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireRegionFactory.java b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireRegionFactory.java index 97e5fdf..31e4551 100644 --- a/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireRegionFactory.java +++ b/extensions/geode-modules-hibernate/src/main/java/com/gemstone/gemfire/modules/hibernate/GemFireRegionFactory.java @@ -16,27 +16,6 @@ */ package com.gemstone.gemfire.modules.hibernate; -import java.util.HashSet; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -import org.hibernate.cache.CacheDataDescription; -import org.hibernate.cache.CacheException; -import org.hibernate.cache.CollectionRegion; -import org.hibernate.cache.EntityRegion; -import org.hibernate.cache.QueryResultsRegion; -import org.hibernate.cache.RegionFactory; -import org.hibernate.cache.Timestamper; -import org.hibernate.cache.TimestampsRegion; -import org.hibernate.cache.access.AccessType; -import org.hibernate.cfg.Settings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.GemFireCache; import com.gemstone.gemfire.cache.Region; @@ -45,20 +24,27 @@ import com.gemstone.gemfire.cache.client.ClientCache; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl; -import com.gemstone.gemfire.modules.hibernate.internal.ClientServerRegionFactoryDelegate; -import com.gemstone.gemfire.modules.hibernate.internal.EntityWrapper; -import com.gemstone.gemfire.modules.hibernate.internal.GemFireCollectionRegion; -import com.gemstone.gemfire.modules.hibernate.internal.GemFireEntityRegion; -import com.gemstone.gemfire.modules.hibernate.internal.GemFireQueryResultsRegion; -import com.gemstone.gemfire.modules.hibernate.internal.RegionFactoryDelegate; +import com.gemstone.gemfire.modules.hibernate.internal.*; import com.gemstone.gemfire.modules.util.Banner; +import org.hibernate.cache.*; +import org.hibernate.cache.access.AccessType; +import org.hibernate.cfg.Settings; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.HashSet; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; public class GemFireRegionFactory implements RegionFactory { - - private static final String GEMFIRE_QUERY_RESULTS_REGION_NAME = "gemfire.hibernateQueryResults"; + private static final String GEMFIRE_QUERY_RESULTS_REGION_NAME = DistributionConfig.GEMFIRE_PREFIX + "hibernateQueryResults"; - private static final String GEMFIRE_TIMESTAMPS_REGION_NAME = "gemfire.hibernateTimestamps"; + private static final String GEMFIRE_TIMESTAMPS_REGION_NAME = DistributionConfig.GEMFIRE_PREFIX + "hibernateTimestamps"; private GemFireCache _cache; @@ -102,15 +88,13 @@ public class GemFireRegionFactory implements RegionFactory { String key = (String)keyObj; if (key.contains("region-attributes")) { regionProperties.put(key, properties.get(key)); - } - else if (key.equals("gemfire.cache-topology")) { + } else if (key.equals(DistributionConfig.GEMFIRE_PREFIX + "cache-topology")) { if (properties.getProperty(key).trim() .equalsIgnoreCase("client-server")) { isClient = true; } - } - else if (key.startsWith("gemfire.") && isGemFireAttribute(key)) { - gemfireProperties.setProperty(key.replace("gemfire.", ""), + } else if (key.startsWith(DistributionConfig.GEMFIRE_PREFIX) && isGemFireAttribute(key)) { + gemfireProperties.setProperty(key.replace(DistributionConfig.GEMFIRE_PREFIX, ""), properties.getProperty(key)); } } @@ -122,7 +106,7 @@ public class GemFireRegionFactory implements RegionFactory { } private boolean isGemFireAttribute(String key) { - String gfKey = key.replace("gemfire.", ""); + String gfKey = key.replace(DistributionConfig.GEMFIRE_PREFIX, ""); Set<String> gemfireAttributes = getGemFireAttributesNames(); return gemfireAttributes.contains(gfKey); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/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 980e6ab..225379a 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 @@ -16,18 +16,6 @@ */ package com.gemstone.gemfire.modules.hibernate.internal; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; -import java.util.StringTokenizer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.gemstone.gemfire.cache.GemFireCache; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.RegionShortcut; @@ -36,10 +24,15 @@ import com.gemstone.gemfire.cache.client.ClientCacheFactory; import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.execute.FunctionService; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.modules.util.BootstrappingFunction; import com.gemstone.gemfire.modules.util.CreateRegionFunction; import com.gemstone.gemfire.modules.util.RegionConfiguration; +import java.util.*; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.LOCATORS; + public class ClientServerRegionFactoryDelegate extends RegionFactoryDelegate { private static final String DEFAULT_SERVER_REGION_TYPE = RegionShortcut.PARTITION.name(); @@ -56,7 +49,7 @@ public class ClientServerRegionFactoryDelegate extends RegionFactoryDelegate { @Override public GemFireCache startCache() { log.info("Creating a GemFire client cache"); - String locatorsString = (String)gemfireProperties.remove("locators"); + String locatorsString = (String) gemfireProperties.remove(LOCATORS); checkExistingCache(); ClientCacheFactory ccf = new ClientCacheFactory(gemfireProperties).setPoolSubscriptionEnabled(true); List<LocatorHolder> locators = getLocatorsMap(locatorsString); @@ -152,7 +145,7 @@ public class ClientServerRegionFactoryDelegate extends RegionFactoryDelegate { if (rType != null) { return rType.toUpperCase(); } - rType = regionProperties.getProperty("gemfire.default-client-region-attributes-id"); + rType = regionProperties.getProperty(DistributionConfig.GEMFIRE_PREFIX + "default-client-region-attributes-id"); if (rType == null) { rType = DEFAULT_CLIENT_REGION_TYPE; } @@ -164,7 +157,7 @@ public class ClientServerRegionFactoryDelegate extends RegionFactoryDelegate { if (rType != null) { return rType.toUpperCase(); } - rType = regionProperties.getProperty("gemfire.default-region-attributes-id"); + rType = regionProperties.getProperty(DistributionConfig.GEMFIRE_PREFIX + "default-region-attributes-id"); if (rType == null) { rType = DEFAULT_SERVER_REGION_TYPE; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/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 76fdf77..65b0eb2 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 @@ -16,31 +16,26 @@ */ package com.gemstone.gemfire.modules.hibernate.internal; -import java.util.Iterator; -import java.util.Properties; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.cache.CacheFactory; -import com.gemstone.gemfire.cache.DataPolicy; -import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionShortcut; +import com.gemstone.gemfire.cache.*; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.execute.FunctionService; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.modules.hibernate.GemFireCacheProvider; import com.gemstone.gemfire.modules.util.BootstrappingFunction; import com.gemstone.gemfire.modules.util.CreateRegionFunction; import com.gemstone.gemfire.modules.util.RegionConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Iterator; +import java.util.Properties; public class RegionFactoryDelegate { - private static final String LOG_FILE = "log-file"; + private static final String LOG_FILE = DistributionConfig.LOG_FILE_NAME; - private static final String CACHE_XML_FILE = "cache-xml-file"; + private static final String CACHE_XML_FILE = DistributionConfig.CACHE_XML_FILE_NAME; private static final String DEFAULT_REGION_TYPE = RegionShortcut.REPLICATE_HEAP_LRU.name(); @@ -131,7 +126,7 @@ public class RegionFactoryDelegate { return rType.toUpperCase(); } rType = regionProperties - .getProperty("gemfire.default-region-attributes-id"); + .getProperty(DistributionConfig.GEMFIRE_PREFIX + "default-region-attributes-id"); if (rType == null) { rType = DEFAULT_REGION_TYPE; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/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 9a86f10..88ffe19 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 @@ -18,6 +18,7 @@ package com.gemstone.gemfire.modules; 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.modules.Owner.Status; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; @@ -43,6 +44,7 @@ import java.util.List; import java.util.Properties; import java.util.logging.Level; +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.*; import static org.junit.Assert.assertEquals; @Category(IntegrationTest.class) @@ -61,16 +63,16 @@ public class HibernateJUnitTest { public void setUp() throws Exception { // Create a per-user scratch directory tmpDir = new File(System.getProperty("java.io.tmpdir"), - "gemfire_modules-" + System.getProperty("user.name")); + "gemfire_modules-" + System.getProperty("user.name")); tmpDir.mkdirs(); tmpDir.deleteOnExit(); gemfireLog = tmpDir.getPath() + - System.getProperty("file.separator") + "gemfire_modules.log"; + System.getProperty("file.separator") + "gemfire_modules.log"; } public static SessionFactory getSessionFactory(Properties overrideProps) { - System.setProperty("gemfire.home", "GEMFIREHOME"); + System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "home", "GEMFIREHOME"); Configuration cfg = new Configuration(); cfg.setProperty("hibernate.dialect", "org.hibernate.dialect.HSQLDialect"); cfg.setProperty("hibernate.connection.driver_class", @@ -88,10 +90,10 @@ public class HibernateJUnitTest { cfg.setProperty("hibernate.show_sql", "true"); cfg.setProperty("hibernate.cache.use_query_cache", "true"); //cfg.setProperty("gemfire.mcast-port", AvailablePort.getRandomAvailablePort(AvailablePort.JGROUPS)+""); - cfg.setProperty("gemfire.mcast-port", "0"); - cfg.setProperty("gemfire.statistic-sampling-enabled", "true"); - cfg.setProperty("gemfire.log-file", gemfireLog); - cfg.setProperty("gemfire.writable-working-dir", tmpDir.getPath()); + cfg.setProperty(DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT, "0"); + cfg.setProperty(DistributionConfig.GEMFIRE_PREFIX + STATISTIC_SAMPLING_ENABLED, "true"); + cfg.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_FILE, gemfireLog); + cfg.setProperty(DistributionConfig.GEMFIRE_PREFIX + "writable-working-dir", tmpDir.getPath()); //cfg.setProperty("gemfire.statistic-archive-file", "plugin-stats-file.gfs"); //cfg.setProperty("gemfire.default-client-region-attributes-id", "CACHING_PROXY"); //cfg.setProperty("gemfire.cache-topology", "client-server"); @@ -103,7 +105,7 @@ public class HibernateJUnitTest { if (overrideProps != null) { Iterator it = overrideProps.keySet().iterator(); while (it.hasNext()) { - String key = (String)it.next(); + String key = (String) it.next(); cfg.setProperty(key, overrideProps.getProperty(key)); } } @@ -124,7 +126,7 @@ public class HibernateJUnitTest { Long id = theEvent.getId(); session.getTransaction().commit(); session.beginTransaction(); - Event ev = (Event)session.get(Event.class, id); + Event ev = (Event) session.get(Event.class, id); log.info("SWAP:load complete: " + ev); session.getTransaction().commit(); } @@ -147,7 +149,7 @@ public class HibernateJUnitTest { session.getTransaction().commit(); log.info("commit complete...doing load"); session.beginTransaction(); - Event ev = (Event)session.load(Event.class, id); + Event ev = (Event) session.load(Event.class, id); log.info("load complete: " + ev); log.trace("SWAP"); ev.setTitle("newTitle"); @@ -157,7 +159,7 @@ public class HibernateJUnitTest { log.info("save complete " + ev); session.beginTransaction(); - ev = (Event)session.load(Event.class, id); + ev = (Event) session.load(Event.class, id); log.info("load complete: " + ev); ev.setTitle("newTitle2"); session.save(ev); @@ -165,32 +167,32 @@ public class HibernateJUnitTest { session.getTransaction().commit(); log.info("save complete " + ev); - ev = (Event)session.load(Event.class, id); + ev = (Event) session.load(Event.class, id); log.info("second load " + ev); session.flush(); session.close(); log.info("flush complete session:" + session); - for (int i=0; i<5; i++) { + for (int i = 0; i < 5; i++) { session = getSessionFactory(null).openSession(); - log.info("doing get "+id); + log.info("doing get " + id); // ev = (Event) session.load(Event.class, id); - ev = (Event)session.get(Event.class, id); + ev = (Event) session.get(Event.class, id); log.info("third load " + ev); } printExistingDB(); Iterator it = GemFireCacheImpl.getInstance().rootRegions().iterator(); while (it.hasNext()) { - Region r = (Region)it.next(); - System.out.println("Region:"+r); + Region r = (Region) it.next(); + System.out.println("Region:" + r); Iterator enIt = r.entrySet().iterator(); while (enIt.hasNext()) { - Region.Entry re = (Entry)enIt.next(); - System.out.println("key:"+re.getKey()+" value:"+re.getValue()); + Region.Entry re = (Entry) enIt.next(); + System.out.println("key:" + re.getKey() + " value:" + re.getValue()); } } Thread.sleep(3000); - //System.in.read(); + //System.in.read(); // try direct data } @@ -205,7 +207,7 @@ public class HibernateJUnitTest { public void testRelationship() throws Exception { //java.util.logging.Logger.getLogger("org.hibernate").setLevel(Level.ALL); Properties props = new Properties(); - props.put("gemfire.topology", "client-server"); + props.put(DistributionConfig.GEMFIRE_PREFIX + "topology", "client-server"); Session session = getSessionFactory(null).openSession(); session.beginTransaction(); @@ -217,14 +219,14 @@ public class HibernateJUnitTest { session.save(thePerson); personId = thePerson.getId(); log.info("person saved"); - + Event theEvent = new Event(); theEvent.setTitle("title"); theEvent.setDate(new Date()); session.save(theEvent); Long eventId = theEvent.getId(); log.info("event saved"); - + Event theEvent2 = new Event(); theEvent2.setTitle("title2"); theEvent2.setDate(new Date()); @@ -232,7 +234,7 @@ public class HibernateJUnitTest { Long eventId2 = theEvent2.getId(); log.info("event2 saved"); session.getTransaction().commit(); - + session.beginTransaction(); Person aPerson = (Person) session.load(Person.class, personId); Event anEvent = (Event) session.load(Event.class, eventId); @@ -248,7 +250,7 @@ public class HibernateJUnitTest { log.info("opening new session"); session = getSessionFactory(null).openSession(); log.info("SWAP:loading person"); - aPerson = (Person)session.load(Person.class, personId); + aPerson = (Person) session.load(Person.class, personId); log.info("loading events"); Iterator<Event> e = aPerson.getE().iterator(); while (e.hasNext()) { @@ -258,42 +260,42 @@ public class HibernateJUnitTest { log.info("opening new session"); session = getSessionFactory(null).openSession(); log.info("SWAP:loading person"); - aPerson = (Person)session.load(Person.class, personId); + aPerson = (Person) session.load(Person.class, personId); log.info("loading events"); e = aPerson.getE().iterator(); while (e.hasNext()) { e.next(); } - log.info(aPerson.getE()+""); + log.info(aPerson.getE() + ""); session.close(); //System.in.read(); -// log.info("opening third session"); -// session = getSessionFactory().openSession(); -// log.info("loading person"); -// aPerson = (Person)session.load(Person.class, personId); -// log.info("loading events"); -// log.info(aPerson.getEvents()+""); + // log.info("opening third session"); + // session = getSessionFactory().openSession(); + // log.info("loading person"); + // aPerson = (Person)session.load(Person.class, personId); + // log.info("loading events"); + // log.info(aPerson.getEvents()+""); } - + public void _testQueryCache() throws Exception { Session session = getSessionFactory(null).openSession(); Query q = session.createQuery("from Event"); q.setCacheable(true); List l = q.list(); - log.info("list:"+l); -// log.info("Sleeping for 10 seconds"); -// Thread.sleep(10000); + log.info("list:" + l); + // log.info("Sleeping for 10 seconds"); + // Thread.sleep(10000); l = q.list(); - log.info("list2:"+l); + log.info("list2:" + l); log.info("updating an event"); session.beginTransaction(); - Event e = (Event)l.get(0); + Event e = (Event) l.get(0); e.setDate(new Date()); session.saveOrUpdate(e); session.getTransaction().commit(); l = q.list(); - log.info("list3:"+l); + log.info("list3:" + l); } @Test @@ -310,7 +312,7 @@ public class HibernateJUnitTest { session.saveOrUpdate("Person", p); session.getTransaction().commit(); assertEquals(1, session.getStatistics().getEntityCount()); - assertEquals(initSize+1, r.size()); + assertEquals(initSize + 1, r.size()); session.beginTransaction(); p.setAge(1); @@ -322,7 +324,7 @@ public class HibernateJUnitTest { @Test public void testNormalRegion() { Properties props = new Properties(); - props.setProperty("gemfire.default-region-attributes-id", "LOCAL"); + props.setProperty(DistributionConfig.GEMFIRE_PREFIX + "default-region-attributes-id", "LOCAL"); Session session = getSessionFactory(props).openSession(); session.beginTransaction(); Event theEvent = new Event(); @@ -332,17 +334,16 @@ public class HibernateJUnitTest { Long id = theEvent.getId(); session.getTransaction().commit(); session.beginTransaction(); - Event ev = (Event)session.load(Event.class, id); + Event ev = (Event) session.load(Event.class, id); ev.setTitle("newTitle"); session.save(ev); session.getTransaction().commit(); } - + private void printExistingDB() throws SQLException { try { Class.forName("org.hsqldb.jdbc.JDBCDriver"); - } - catch (Exception e) { + } catch (Exception e) { System.err.println("ERROR: failed to load HSQLDB JDBC driver."); e.printStackTrace(); return; @@ -379,10 +380,10 @@ public class HibernateJUnitTest { "com.gemstone.gemfire.modules.hibernate.GemFireRegionFactory"); cfg.setProperty("hibernate.show_sql", "true"); cfg.setProperty("hibernate.cache.use_query_cache", "true"); - cfg.setProperty("gemfire.statistic-sampling-enabled", "true"); - cfg.setProperty("gemfire.log-file", gemfireLog); - cfg.setProperty("gemfire.writable-working-dir", tmpDir.getPath()); - cfg.setProperty("gemfire.mcast-port", "0"); + cfg.setProperty(DistributionConfig.GEMFIRE_PREFIX + STATISTIC_SAMPLING_ENABLED, "true"); + cfg.setProperty(DistributionConfig.GEMFIRE_PREFIX + LOG_FILE, gemfireLog); + cfg.setProperty(DistributionConfig.GEMFIRE_PREFIX + "writable-working-dir", tmpDir.getPath()); + cfg.setProperty(DistributionConfig.GEMFIRE_PREFIX + MCAST_PORT, "0"); //cfg.setProperty("gemfire.cache-topology", "client-server"); SessionFactory sf = cfg.buildSessionFactory(); @@ -397,10 +398,10 @@ public class HibernateJUnitTest { log.info("testEnum:commiting tx"); session.getTransaction().commit(); session.close(); - + session = sf.openSession(); Owner o1 = (Owner) session.load(Owner.class, id); - log.info("loaded:"+o); + log.info("loaded:" + o); assertEquals(o.getAddress(), o1.getAddress()); assertEquals(o.getCity(), o1.getCity()); assertEquals(o.getStatus(), o1.getStatus()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/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 e3b6480..386e22f 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,26 +16,27 @@ */ package com.gemstone.gemfire.modules; -import java.io.IOException; -import java.util.Iterator; -import java.util.Properties; -import java.util.logging.Level; - +import com.gemstone.gemfire.cache.Cache; +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; - import org.hibernate.Session; import org.junit.Ignore; import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.gemstone.gemfire.cache.Cache; -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.internal.cache.GemFireCacheImpl; +import java.io.IOException; +import java.util.Iterator; +import java.util.Properties; +import java.util.logging.Level; + +import static com.gemstone.gemfire.distributed.SystemConfigurationProperties.MCAST_PORT; @Ignore("Can this test be deleted?") @Category(IntegrationTest.class) @@ -48,8 +49,8 @@ public class SecondVMTest extends TestCase { } public void _testStartEmptyVM() throws IOException { Properties gemfireProperties = new Properties(); - gemfireProperties.setProperty("mcast-port", "5555"); - gemfireProperties.setProperty("log-level", "fine"); + gemfireProperties.setProperty(MCAST_PORT, "5555"); + gemfireProperties.setProperty(DistributionConfig.LOG_LEVEL_NAME, "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/70612010/extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/filter/GemfireSessionManager.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/filter/GemfireSessionManager.java b/extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/filter/GemfireSessionManager.java index a3d3c10..272f3c8 100644 --- a/extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/filter/GemfireSessionManager.java +++ b/extensions/geode-modules-session-internal/src/main/java/com/gemstone/gemfire/modules/session/internal/filter/GemfireSessionManager.java @@ -21,6 +21,7 @@ import com.gemstone.gemfire.cache.CacheClosedException; import com.gemstone.gemfire.cache.CacheFactory; import com.gemstone.gemfire.cache.EntryNotFoundException; import com.gemstone.gemfire.cache.control.ResourceManager; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.internal.cache.GemFireCacheImpl; import com.gemstone.gemfire.modules.session.bootstrap.AbstractCache; import com.gemstone.gemfire.modules.session.bootstrap.ClientServerCache; @@ -61,12 +62,12 @@ public class GemfireSessionManager implements SessionManager { /** * Prefix of init param string used to set gemfire properties */ - private static final String GEMFIRE_PROPERTY = "gemfire.property."; + private static final String GEMFIRE_PROPERTY = DistributionConfig.GEMFIRE_PREFIX + "property."; /** * Prefix of init param string used to set gemfire distributedCache setting */ - private static final String GEMFIRE_CACHE = "gemfire.cache."; + private static final String GEMFIRE_CACHE = DistributionConfig.GEMFIRE_PREFIX + "cache."; private static final String INIT_PARAM_CACHE_TYPE = "cache-type"; private static final String CACHE_TYPE_CLIENT_SERVER = "client-server"; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/filter/SessionCachingFilter.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/filter/SessionCachingFilter.java b/extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/filter/SessionCachingFilter.java index 7490fdd..7abc253 100644 --- a/extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/filter/SessionCachingFilter.java +++ b/extensions/geode-modules-session/src/main/java/com/gemstone/gemfire/modules/session/filter/SessionCachingFilter.java @@ -17,6 +17,7 @@ package com.gemstone.gemfire.modules.session.filter; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.modules.session.internal.filter.GemfireHttpSession; import com.gemstone.gemfire.modules.session.internal.filter.GemfireSessionManager; import com.gemstone.gemfire.modules.session.internal.filter.SessionManager; @@ -24,18 +25,8 @@ import com.gemstone.gemfire.modules.session.internal.filter.util.ThreadLocalSess import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.HttpSession; +import javax.servlet.*; +import javax.servlet.http.*; import java.io.IOException; import java.io.PrintStream; import java.io.PrintWriter; @@ -73,10 +64,10 @@ public class SessionCachingFilter implements Filter { */ private static AtomicInteger started = new AtomicInteger( - Integer.getInteger("gemfire.override.session.manager.count", 1)); + Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "override.session.manager.count", 1)); private static int percentInactiveTimeTriggerRebuild = - Integer.getInteger("gemfire.session.inactive.trigger.rebuild", 80); + Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "session.inactive.trigger.rebuild", 80); /** * This latch ensures that at least one thread/instance has fired up the http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java b/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java index df7fa1c..309ee4e 100644 --- a/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java +++ b/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java @@ -16,41 +16,36 @@ */ package com.gemstone.gemfire.modules.session.internal.filter; -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.ArrayList; -import java.util.EnumSet; -import java.util.Enumeration; -import java.util.List; -import java.util.StringTokenizer; -import java.util.concurrent.TimeUnit; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.modules.session.junit.PerTestClassLoaderRunner; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.modules.session.filter.SessionCachingFilter; +import com.gemstone.gemfire.modules.session.junit.PerTestClassLoaderRunner; import com.gemstone.gemfire.test.junit.categories.FlakyTest; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import org.apache.jasper.servlet.JspServlet; +import org.eclipse.jetty.http.HttpTester; +import org.eclipse.jetty.servlet.FilterHolder; +import org.eclipse.jetty.servlet.ServletHolder; import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; -import org.eclipse.jetty.servlet.FilterHolder; -import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.http.HttpTester; + +import javax.servlet.DispatcherType; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletException; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.*; +import java.util.concurrent.TimeUnit; import static org.junit.Assert.*; @@ -85,8 +80,8 @@ public class SessionReplicationIntegrationJUnitTest { tester.setContextPath("/test"); filterHolder = tester.addFilter(SessionCachingFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST)); - filterHolder.setInitParameter("gemfire.property.mcast-port", "0"); - filterHolder.setInitParameter("gemfire.property.log-file", gemfireLogFile.getAbsolutePath()); + filterHolder.setInitParameter(DistributionConfig.GEMFIRE_PREFIX + "property.mcast-port", "0"); + filterHolder.setInitParameter(DistributionConfig.GEMFIRE_PREFIX + "property.log-file", gemfireLogFile.getAbsolutePath()); filterHolder.setInitParameter("cache-type", "peer-to-peer"); servletHolder = tester.addServlet(BasicServlet.class, "/hello"); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70612010/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationJUnitTest.java ---------------------------------------------------------------------- diff --git a/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationJUnitTest.java b/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationJUnitTest.java index ba4cbd9..280169d 100644 --- a/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationJUnitTest.java +++ b/extensions/geode-modules-session/src/test/java/com/gemstone/gemfire/modules/session/internal/filter/SessionReplicationJUnitTest.java @@ -17,6 +17,7 @@ package com.gemstone.gemfire.modules.session.internal.filter; +import com.gemstone.gemfire.distributed.internal.DistributionConfig; import com.gemstone.gemfire.modules.session.filter.SessionCachingFilter; import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.mockrunner.mock.web.MockFilterConfig; @@ -37,7 +38,7 @@ public class SessionReplicationJUnitTest extends CommonTests { WebMockObjectFactory factory = getWebMockObjectFactory(); MockFilterConfig config = factory.getMockFilterConfig(); - config.setInitParameter("gemfire.property.mcast-port", "0"); + config.setInitParameter(DistributionConfig.GEMFIRE_PREFIX + "property.mcast-port", "0"); config.setInitParameter("cache-type", "peer-to-peer"); factory.getMockServletContext().setContextPath(CONTEXT_PATH);
