GEODE-288: move admin package to internal
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/895fd144 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/895fd144 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/895fd144 Branch: refs/heads/feature/GEODE-288 Commit: 895fd144e6a322e09267c68d41116736345882aa Parents: 8bf3957 Author: Kirk Lund <kl...@apache.org> Authored: Wed Oct 26 15:10:49 2016 -0700 Committer: Kirk Lund <kl...@apache.org> Committed: Wed Oct 26 15:16:54 2016 -0700 ---------------------------------------------------------------------- geode-core/build.gradle | 1 - .../java/org/apache/geode/DataSerializer.java | 2 +- .../org/apache/geode/admin/AdminConfig.java | 148 -- .../geode/admin/AdminDistributedSystem.java | 434 ---- .../admin/AdminDistributedSystemFactory.java | 148 -- .../org/apache/geode/admin/AdminException.java | 81 - .../apache/geode/admin/AdminXmlException.java | 44 - .../main/java/org/apache/geode/admin/Alert.java | 53 - .../java/org/apache/geode/admin/AlertLevel.java | 168 -- .../org/apache/geode/admin/AlertListener.java | 30 - .../org/apache/geode/admin/BackupStatus.java | 46 - .../geode/admin/CacheDoesNotExistException.java | 80 - .../apache/geode/admin/CacheHealthConfig.java | 151 -- .../org/apache/geode/admin/CacheServer.java | 43 - .../apache/geode/admin/CacheServerConfig.java | 50 - .../java/org/apache/geode/admin/CacheVm.java | 35 - .../org/apache/geode/admin/CacheVmConfig.java | 51 - .../geode/admin/ConfigurationParameter.java | 72 - .../geode/admin/DistributedSystemConfig.java | 626 ----- .../admin/DistributedSystemHealthConfig.java | 74 - .../apache/geode/admin/DistributionLocator.java | 45 - .../geode/admin/DistributionLocatorConfig.java | 81 - .../org/apache/geode/admin/GemFireHealth.java | 209 -- .../apache/geode/admin/GemFireHealthConfig.java | 54 - .../apache/geode/admin/GemFireMemberStatus.java | 670 ----- .../org/apache/geode/admin/ManagedEntity.java | 100 - .../apache/geode/admin/ManagedEntityConfig.java | 88 - .../apache/geode/admin/MemberHealthConfig.java | 142 - .../admin/OperationCancelledException.java | 47 - .../geode/admin/RegionNotFoundException.java | 39 - .../geode/admin/RegionSubRegionSnapshot.java | 183 -- .../geode/admin/RuntimeAdminException.java | 48 - .../java/org/apache/geode/admin/Statistic.java | 64 - .../apache/geode/admin/StatisticResource.java | 82 - .../org/apache/geode/admin/SystemMember.java | 145 -- .../geode/admin/SystemMemberBridgeServer.java | 307 --- .../apache/geode/admin/SystemMemberCache.java | 183 -- .../geode/admin/SystemMemberCacheEvent.java | 33 - .../geode/admin/SystemMemberCacheListener.java | 76 - .../geode/admin/SystemMemberCacheServer.java | 308 --- .../apache/geode/admin/SystemMemberRegion.java | 314 --- .../geode/admin/SystemMemberRegionEvent.java | 31 - .../apache/geode/admin/SystemMemberType.java | 150 -- .../geode/admin/SystemMembershipEvent.java | 42 - .../geode/admin/SystemMembershipListener.java | 59 - .../UnmodifiableConfigurationException.java | 81 - .../admin/internal/AbstractHealthEvaluator.java | 170 -- .../internal/AdminDistributedSystemImpl.java | 2400 ----------------- .../admin/internal/BackupDataStoreHelper.java | 74 - .../admin/internal/BackupDataStoreResult.java | 48 - .../geode/admin/internal/BackupStatusImpl.java | 59 - .../admin/internal/CacheHealthConfigImpl.java | 91 - .../admin/internal/CacheHealthEvaluator.java | 306 --- .../admin/internal/CacheServerConfigImpl.java | 133 - .../geode/admin/internal/CacheServerImpl.java | 190 -- .../internal/ConfigurationParameterImpl.java | 282 -- .../ConfigurationParameterListener.java | 30 - .../DisabledManagedEntityController.java | 94 - .../internal/DistributedSystemConfigImpl.java | 1109 -------- .../DistributedSystemHealthConfigImpl.java | 53 - .../DistributedSystemHealthEvaluator.java | 167 -- .../DistributedSystemHealthMonitor.java | 461 ---- .../internal/DistributionLocatorConfigImpl.java | 187 -- .../admin/internal/DistributionLocatorImpl.java | 329 --- .../EnabledManagedEntityController.java | 385 --- .../admin/internal/FinishBackupRequest.java | 173 -- .../admin/internal/FinishBackupResponse.java | 76 - .../admin/internal/FlushToDiskRequest.java | 94 - .../admin/internal/FlushToDiskResponse.java | 43 - .../admin/internal/GemFireHealthConfigImpl.java | 80 - .../admin/internal/GemFireHealthEvaluator.java | 182 -- .../geode/admin/internal/GemFireHealthImpl.java | 511 ---- .../geode/admin/internal/InetAddressUtil.java | 201 -- .../admin/internal/InternalManagedEntity.java | 96 - .../geode/admin/internal/LogCollator.java | 121 - .../admin/internal/ManagedEntityConfigImpl.java | 256 -- .../admin/internal/ManagedEntityConfigXml.java | 169 -- .../ManagedEntityConfigXmlGenerator.java | 364 --- .../internal/ManagedEntityConfigXmlParser.java | 587 ----- .../admin/internal/ManagedEntityController.java | 66 - .../ManagedEntityControllerFactory.java | 63 - .../admin/internal/ManagedSystemMemberImpl.java | 258 -- .../admin/internal/MemberHealthConfigImpl.java | 95 - .../admin/internal/MemberHealthEvaluator.java | 247 -- .../admin/internal/PrepareBackupRequest.java | 133 - .../admin/internal/PrepareBackupResponse.java | 80 - .../geode/admin/internal/StatisticImpl.java | 92 - .../admin/internal/StatisticResourceImpl.java | 177 -- .../internal/SystemMemberBridgeServerImpl.java | 234 -- .../internal/SystemMemberCacheEventImpl.java | 54 - .../SystemMemberCacheEventProcessor.java | 146 -- .../admin/internal/SystemMemberCacheImpl.java | 303 --- .../geode/admin/internal/SystemMemberImpl.java | 487 ---- .../internal/SystemMemberRegionEventImpl.java | 56 - .../admin/internal/SystemMemberRegionImpl.java | 371 --- .../internal/SystemMembershipEventImpl.java | 67 - .../apache/geode/admin/internal/package.html | 53 - .../java/org/apache/geode/admin/jmx/Agent.java | 145 -- .../org/apache/geode/admin/jmx/AgentConfig.java | 844 ------ .../apache/geode/admin/jmx/AgentFactory.java | 48 - .../internal/AdminDistributedSystemJmxImpl.java | 2279 ---------------- .../admin/jmx/internal/AgentConfigImpl.java | 1915 -------------- .../geode/admin/jmx/internal/AgentImpl.java | 1624 ------------ .../geode/admin/jmx/internal/AgentLauncher.java | 918 ------- .../admin/jmx/internal/CacheServerJmxImpl.java | 590 ----- .../admin/jmx/internal/ConfigAttributeInfo.java | 66 - .../internal/ConfigurationParameterJmxImpl.java | 163 -- .../DistributedSystemHealthConfigJmxImpl.java | 99 - .../internal/DistributionLocatorJmxImpl.java | 183 -- .../admin/jmx/internal/DynamicManagedBean.java | 143 -- .../internal/GemFireHealthConfigJmxImpl.java | 211 -- .../jmx/internal/GemFireHealthJmxImpl.java | 171 -- .../admin/jmx/internal/GenerateMBeanHTML.java | 502 ---- .../geode/admin/jmx/internal/MBeanUtil.java | 767 ------ .../admin/jmx/internal/MX4JModelMBean.java | 1232 --------- .../jmx/internal/MX4JServerSocketFactory.java | 136 - .../geode/admin/jmx/internal/MailManager.java | 327 --- .../admin/jmx/internal/ManagedResource.java | 74 - .../admin/jmx/internal/ManagedResourceType.java | 204 -- .../jmx/internal/MemberInfoWithStatsMBean.java | 1347 ---------- .../admin/jmx/internal/RMIRegistryService.java | 221 -- .../jmx/internal/RMIRegistryServiceMBean.java | 80 - .../jmx/internal/RefreshNotificationType.java | 126 - .../jmx/internal/StatAlertNotification.java | 150 -- .../jmx/internal/StatAlertsAggregator.java | 111 - .../jmx/internal/StatisticAttributeInfo.java | 71 - .../jmx/internal/StatisticResourceJmxImpl.java | 344 --- .../SystemMemberBridgeServerJmxImpl.java | 123 - .../jmx/internal/SystemMemberCacheJmxImpl.java | 445 ---- .../admin/jmx/internal/SystemMemberJmx.java | 459 ---- .../admin/jmx/internal/SystemMemberJmxImpl.java | 541 ---- .../jmx/internal/SystemMemberRegionJmxImpl.java | 128 - .../geode/admin/jmx/internal/package.html | 166 -- .../org/apache/geode/admin/jmx/package.html | 28 - .../java/org/apache/geode/admin/package.html | 78 - .../main/java/org/apache/geode/cache/Cache.java | 15 +- .../ConflictingPersistentDataException.java | 1 - .../geode/cache/persistence/PersistentID.java | 2 +- .../RevokedPersistentDataException.java | 2 +- .../geode/distributed/DistributedSystem.java | 90 +- .../internal/DistributionManager.java | 2 +- .../distributed/internal/HealthMonitor.java | 2 +- .../distributed/internal/HealthMonitorImpl.java | 6 +- .../internal/InternalDistributedSystem.java | 6 +- .../org/apache/geode/internal/DSFIDFactory.java | 19 +- .../apache/geode/internal/MigrationServer.java | 2 +- .../org/apache/geode/internal/SystemAdmin.java | 6 +- .../internal/admin/ClientMembershipMessage.java | 2 +- .../apache/geode/internal/admin/GemFireVM.java | 27 +- .../geode/internal/admin/HealthListener.java | 5 +- .../geode/internal/admin/StatAlertsManager.java | 2 +- .../geode/internal/admin/api/AdminConfig.java | 148 ++ .../admin/api/AdminDistributedSystem.java | 435 ++++ .../api/AdminDistributedSystemFactory.java | 147 ++ .../internal/admin/api/AdminException.java | 81 + .../internal/admin/api/AdminXmlException.java | 44 + .../apache/geode/internal/admin/api/Alert.java | 53 + .../geode/internal/admin/api/AlertLevel.java | 169 ++ .../geode/internal/admin/api/AlertListener.java | 30 + .../geode/internal/admin/api/BackupStatus.java | 46 + .../admin/api/CacheDoesNotExistException.java | 80 + .../internal/admin/api/CacheHealthConfig.java | 151 ++ .../geode/internal/admin/api/CacheServer.java | 43 + .../internal/admin/api/CacheServerConfig.java | 50 + .../geode/internal/admin/api/CacheVm.java | 35 + .../geode/internal/admin/api/CacheVmConfig.java | 51 + .../admin/api/ConfigurationParameter.java | 72 + .../admin/api/DistributedSystemConfig.java | 627 +++++ .../api/DistributedSystemHealthConfig.java | 74 + .../internal/admin/api/DistributionLocator.java | 45 + .../admin/api/DistributionLocatorConfig.java | 80 + .../geode/internal/admin/api/GemFireHealth.java | 209 ++ .../internal/admin/api/GemFireHealthConfig.java | 54 + .../internal/admin/api/GemFireMemberStatus.java | 670 +++++ .../geode/internal/admin/api/ManagedEntity.java | 100 + .../internal/admin/api/ManagedEntityConfig.java | 88 + .../internal/admin/api/MemberHealthConfig.java | 142 + .../admin/api/OperationCancelledException.java | 47 + .../admin/api/RegionNotFoundException.java | 39 + .../admin/api/RegionSubRegionSnapshot.java | 183 ++ .../admin/api/RuntimeAdminException.java | 48 + .../geode/internal/admin/api/Statistic.java | 64 + .../internal/admin/api/StatisticResource.java | 83 + .../geode/internal/admin/api/SystemMember.java | 146 ++ .../admin/api/SystemMemberBridgeServer.java | 307 +++ .../internal/admin/api/SystemMemberCache.java | 183 ++ .../admin/api/SystemMemberCacheEvent.java | 33 + .../admin/api/SystemMemberCacheListener.java | 76 + .../admin/api/SystemMemberCacheServer.java | 308 +++ .../internal/admin/api/SystemMemberRegion.java | 314 +++ .../admin/api/SystemMemberRegionEvent.java | 31 + .../internal/admin/api/SystemMemberType.java | 150 ++ .../admin/api/SystemMembershipEvent.java | 42 + .../admin/api/SystemMembershipListener.java | 59 + .../api/UnmodifiableConfigurationException.java | 81 + .../admin/api/impl/AbstractHealthEvaluator.java | 170 ++ .../api/impl/AdminDistributedSystemImpl.java | 2423 ++++++++++++++++++ .../admin/api/impl/BackupDataStoreHelper.java | 74 + .../admin/api/impl/BackupDataStoreResult.java | 48 + .../admin/api/impl/BackupStatusImpl.java | 59 + .../admin/api/impl/CacheHealthConfigImpl.java | 91 + .../admin/api/impl/CacheHealthEvaluator.java | 306 +++ .../admin/api/impl/CacheServerConfigImpl.java | 133 + .../admin/api/impl/CacheServerImpl.java | 197 ++ .../api/impl/ConfigurationParameterImpl.java | 283 ++ .../impl/ConfigurationParameterListener.java | 32 + .../impl/DisabledManagedEntityController.java | 94 + .../api/impl/DistributedSystemConfigImpl.java | 1114 ++++++++ .../impl/DistributedSystemHealthConfigImpl.java | 53 + .../impl/DistributedSystemHealthEvaluator.java | 167 ++ .../impl/DistributedSystemHealthMonitor.java | 461 ++++ .../api/impl/DistributionLocatorConfigImpl.java | 187 ++ .../admin/api/impl/DistributionLocatorImpl.java | 329 +++ .../impl/EnabledManagedEntityController.java | 385 +++ .../admin/api/impl/FinishBackupRequest.java | 173 ++ .../admin/api/impl/FinishBackupResponse.java | 76 + .../admin/api/impl/FlushToDiskRequest.java | 94 + .../admin/api/impl/FlushToDiskResponse.java | 43 + .../admin/api/impl/GemFireHealthConfigImpl.java | 80 + .../admin/api/impl/GemFireHealthEvaluator.java | 182 ++ .../admin/api/impl/GemFireHealthImpl.java | 514 ++++ .../admin/api/impl/InetAddressUtil.java | 201 ++ .../admin/api/impl/InternalManagedEntity.java | 96 + .../internal/admin/api/impl/LogCollator.java | 121 + .../admin/api/impl/ManagedEntityConfigImpl.java | 254 ++ .../admin/api/impl/ManagedEntityConfigXml.java | 171 ++ .../impl/ManagedEntityConfigXmlGenerator.java | 374 +++ .../api/impl/ManagedEntityConfigXmlParser.java | 591 +++++ .../admin/api/impl/ManagedEntityController.java | 66 + .../impl/ManagedEntityControllerFactory.java | 61 + .../admin/api/impl/ManagedSystemMemberImpl.java | 258 ++ .../admin/api/impl/MemberHealthConfigImpl.java | 95 + .../admin/api/impl/MemberHealthEvaluator.java | 248 ++ .../admin/api/impl/PrepareBackupRequest.java | 133 + .../admin/api/impl/PrepareBackupResponse.java | 80 + .../internal/admin/api/impl/StatisticImpl.java | 94 + .../admin/api/impl/StatisticResourceImpl.java | 180 ++ .../api/impl/SystemMemberBridgeServerImpl.java | 234 ++ .../api/impl/SystemMemberCacheEventImpl.java | 55 + .../impl/SystemMemberCacheEventProcessor.java | 146 ++ .../admin/api/impl/SystemMemberCacheImpl.java | 314 +++ .../admin/api/impl/SystemMemberImpl.java | 501 ++++ .../api/impl/SystemMemberRegionEventImpl.java | 57 + .../admin/api/impl/SystemMemberRegionImpl.java | 372 +++ .../api/impl/SystemMembershipEventImpl.java | 68 + .../geode/internal/admin/api/impl/package.html | 53 + .../geode/internal/admin/api/jmx/Agent.java | 145 ++ .../internal/admin/api/jmx/AgentConfig.java | 844 ++++++ .../internal/admin/api/jmx/AgentFactory.java | 47 + .../jmx/impl/AdminDistributedSystemJmxImpl.java | 2294 +++++++++++++++++ .../admin/api/jmx/impl/AgentConfigImpl.java | 1926 ++++++++++++++ .../internal/admin/api/jmx/impl/AgentImpl.java | 1624 ++++++++++++ .../admin/api/jmx/impl/AgentLauncher.java | 918 +++++++ .../admin/api/jmx/impl/CacheServerJmxImpl.java | 593 +++++ .../admin/api/jmx/impl/ConfigAttributeInfo.java | 67 + .../jmx/impl/ConfigurationParameterJmxImpl.java | 165 ++ .../DistributedSystemHealthConfigJmxImpl.java | 99 + .../jmx/impl/DistributionLocatorJmxImpl.java | 165 ++ .../admin/api/jmx/impl/DynamicManagedBean.java | 143 ++ .../jmx/impl/GemFireHealthConfigJmxImpl.java | 211 ++ .../api/jmx/impl/GemFireHealthJmxImpl.java | 171 ++ .../admin/api/jmx/impl/GenerateMBeanHTML.java | 500 ++++ .../internal/admin/api/jmx/impl/MBeanUtil.java | 765 ++++++ .../admin/api/jmx/impl/MX4JModelMBean.java | 1232 +++++++++ .../api/jmx/impl/MX4JServerSocketFactory.java | 136 + .../admin/api/jmx/impl/MailManager.java | 327 +++ .../admin/api/jmx/impl/ManagedResource.java | 74 + .../admin/api/jmx/impl/ManagedResourceType.java | 216 ++ .../api/jmx/impl/MemberInfoWithStatsMBean.java | 1355 ++++++++++ .../admin/api/jmx/impl/RMIRegistryService.java | 221 ++ .../api/jmx/impl/RMIRegistryServiceMBean.java | 80 + .../api/jmx/impl/RefreshNotificationType.java | 126 + .../api/jmx/impl/StatAlertNotification.java | 150 ++ .../api/jmx/impl/StatAlertsAggregator.java | 111 + .../api/jmx/impl/StatisticAttributeInfo.java | 72 + .../api/jmx/impl/StatisticResourceJmxImpl.java | 347 +++ .../impl/SystemMemberBridgeServerJmxImpl.java | 125 + .../api/jmx/impl/SystemMemberCacheJmxImpl.java | 453 ++++ .../admin/api/jmx/impl/SystemMemberJmx.java | 466 ++++ .../admin/api/jmx/impl/SystemMemberJmxImpl.java | 543 ++++ .../api/jmx/impl/SystemMemberRegionJmxImpl.java | 133 + .../internal/admin/api/jmx/impl/package.html | 166 ++ .../geode/internal/admin/api/jmx/package.html | 28 + .../geode/internal/admin/api/package.html | 78 + .../admin/remote/AddHealthListenerRequest.java | 2 +- .../admin/remote/AddHealthListenerResponse.java | 8 +- .../internal/admin/remote/AdminRegion.java | 5 +- .../internal/admin/remote/AdminRequest.java | 2 +- .../internal/admin/remote/AdminWaiters.java | 4 +- .../admin/remote/AlertLevelChangeMessage.java | 2 +- .../admin/remote/AlertListenerMessage.java | 2 +- .../admin/remote/AlertsNotificationMessage.java | 4 +- .../remote/FetchHealthDiagnosisRequest.java | 2 +- .../remote/FetchHealthDiagnosisResponse.java | 6 +- .../admin/remote/HealthListenerMessage.java | 6 +- .../remote/RefreshMemberSnapshotRequest.java | 6 +- .../remote/RefreshMemberSnapshotResponse.java | 6 +- .../admin/remote/RegionAdminRequest.java | 4 +- .../remote/RegionSubRegionsSizeResponse.java | 2 +- .../internal/admin/remote/RemoteGemFireVM.java | 23 +- .../admin/remote/RemoteGfManagerAgent.java | 4 +- .../admin/statalerts/StatisticInfoImpl.java | 2 +- .../geode/internal/cache/GemFireCacheImpl.java | 2 +- .../geode/internal/cache/LocalRegion.java | 3 +- .../internal/cache/RemoteFetchEntryMessage.java | 2 +- .../cache/partitioned/FetchEntryMessage.java | 2 +- .../apache/geode/internal/cache/properties.html | 18 +- .../snapshot/CacheSnapshotServiceImpl.java | 2 +- .../geode/internal/net/SocketCreator.java | 2 +- .../internal/beans/DistributedSystemBridge.java | 4 +- .../cli/commands/DiskStoreCommands.java | 6 +- .../src/main/java/org/apache/geode/package.html | 2 +- .../internal/doc-files/mbeans-descriptors.dtd | 247 ++ .../geode/admin/api/jmx/mbeans-descriptors.xml | 1452 +++++++++++ .../internal/doc-files/mbeans-descriptors.dtd | 247 -- .../geode/admin/jmx/mbeans-descriptors.xml | 1452 ----------- .../org/apache/geode/admin/AdminTestHelper.java | 43 - .../apache/geode/admin/AlertLevelJUnitTest.java | 63 - .../BindDistributedSystemJUnitTest.java | 84 - .../internal/CacheHealthEvaluatorJUnitTest.java | 199 -- .../internal/DistributedSystemTestCase.java | 64 - .../admin/internal/HealthEvaluatorTestCase.java | 71 - .../MemberHealthEvaluatorJUnitTest.java | 96 - .../query/dunit/QueryUsingPoolDUnitTest.java | 48 +- .../cache/query/dunit/RemoteQueryDUnitTest.java | 176 +- .../ConsoleDistributionManagerDUnitTest.java | 3 +- .../internal/DistributionManagerDUnitTest.java | 12 +- .../geode/internal/AvailablePortJUnitTest.java | 2 +- .../internal/admin/api/AdminTestHelper.java | 44 + .../internal/admin/api/AlertLevelJUnitTest.java | 64 + .../impl/BindDistributedSystemJUnitTest.java | 86 + .../api/impl/CacheHealthEvaluatorJUnitTest.java | 200 ++ .../api/impl/DistributedSystemTestCase.java | 64 + .../admin/api/impl/HealthEvaluatorTestCase.java | 74 + .../impl/MemberHealthEvaluatorJUnitTest.java | 96 + .../geode/internal/cache/BackupDUnitTest.java | 8 +- .../cache/IncrementalBackupDUnitTest.java | 12 +- ...tentColocatedPartitionedRegionDUnitTest.java | 5 +- .../PersistentPartitionedRegionTestBase.java | 10 +- .../cache/partitioned/ShutdownAllDUnitTest.java | 8 +- .../PersistentRecoveryOrderDUnitTest.java | 8 +- .../beans/DistributedSystemBridgeJUnitTest.java | 6 +- .../internal/JUnit4DistributedTestCase.java | 3 +- .../sanctionedDataSerializables.txt | 64 +- .../codeAnalysis/sanctionedSerializables.txt | 63 +- ...downAllPersistentGatewaySenderDUnitTest.java | 8 +- gradle/rat.gradle | 2 +- 347 files changed, 38329 insertions(+), 38182 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/build.gradle ---------------------------------------------------------------------- diff --git a/geode-core/build.gradle b/geode-core/build.gradle index 067bafc..6669b27 100755 --- a/geode-core/build.gradle +++ b/geode-core/build.gradle @@ -170,7 +170,6 @@ jar { exclude 'org/apache/geode/management/internal/web/**' exclude 'org/apache/geode/internal/i18n/StringIdResourceBundle_ja.txt' - exclude 'org/apache/geode/admin/doc-files/ds4_0.dtd' } task webJar (type: Jar, dependsOn: classes) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/DataSerializer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java index 29b20a2..7801cac 100644 --- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java +++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java @@ -46,7 +46,7 @@ import java.util.concurrent.ConcurrentMap; import org.apache.logging.log4j.Logger; -import org.apache.geode.admin.RegionNotFoundException; +import org.apache.geode.internal.admin.api.RegionNotFoundException; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.Region; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java b/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java deleted file mode 100755 index 7a4bd6a..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -import org.apache.geode.internal.i18n.LocalizedStrings; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.IOException; -import java.io.PrintStream; -import java.util.ArrayList; -import java.util.Date; - - -/** - * AdminConfig loads/stores the member information list. The list contains all of the members being - * monitored. - * - * Config must be of the format: - * <p> - * <li>Name=What you want displayed as a name for the instance - * <li>Type=SERVER|CLIENT - * <li>Host=A valid hostname or IP Address where the instance is running - * <li>Port=The port you are using to open the monitor port for the instance - * - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public class AdminConfig { - // Name, Type, Host, Port - public static Entry[] loadConfig(File file) throws IOException { - - // Place all lines into stack - ArrayList entryList = new ArrayList(); - FileReader reader = null; - BufferedReader fileReader = null; - try { - reader = new FileReader(file); - fileReader = new BufferedReader(reader); - // Read the first line. - String line = fileReader.readLine(); - - while (line != null) { - line = line.trim(); - - // Replace tabs with spaces - line = line.replace('\t', ' '); - - // Skip all empty and comment lines - if (line.length() != 0 && line.startsWith("#") == false) { - try { - entryList.add(new Entry(line)); - } catch (Exception ex) { - // ignore - drop any lines that are not valid - } - } - line = fileReader.readLine(); - } - } finally { - if (fileReader != null) { - fileReader.close(); - } - if (reader != null) { - reader.close(); - } - } - - return (Entry[]) entryList.toArray(new Entry[0]); - } - - public static void storeConfig(File file, AdminConfig.Entry entries[]) throws IOException { - FileOutputStream fos = null; - PrintStream ps = null; - try { - fos = new FileOutputStream(file); - ps = new PrintStream(fos); - - // Header - ps.print("#"); - ps.println( - LocalizedStrings.AdminConfig_THIS_FILE_IS_GENERATED_BY_ADMINCONSOLE_EDIT_AS_YOU_WISH_BUT_IT_WILL_BE_OVERWRITTEN_IF_IT_IS_MODIFIED_IN_ADMINCONSOLE - .toLocalizedString()); - ps.println("#"); - ps.println(LocalizedStrings.AdminConfig_MODIFIED_0.toLocalizedString(new Date())); - ps.println("#"); - ps.println("# Name, Type, Host, Port"); - ps.println("#"); - int len = entries.length; - for (int i = 0; i < len; i++) { - ps.println(entries[i].toString()); - } - ps.flush(); - } finally { - if (ps != null) { - ps.close(); - } - if (fos != null) { - fos.close(); - } - } - } - - - public static class Entry { - public String name; - public String type; - public String host; - public int port; - - public Entry(String line) { - // Split - String split[] = line.split(","); - - // Convert line to parameters - name = split[0].trim(); - type = split[1].trim(); - host = split[2].trim(); - port = Integer.parseInt(split[3]); - } - - public Entry(String name, String type, String host, int port) { - this.name = name; - this.type = type; - this.host = host; - this.port = port; - } - - @Override // GemStoneAddition - public String toString() { - return name + "," + type + "," + host + "," + port; - } - } -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java deleted file mode 100755 index cd4dc7e..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java +++ /dev/null @@ -1,434 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -import org.apache.geode.LogWriter; -import org.apache.geode.cache.DataPolicy; -import org.apache.geode.cache.persistence.PersistentID; -import org.apache.geode.distributed.DistributedMember; - -import java.io.File; -import java.net.InetAddress; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - -/** - * Administrative interface for managing an entire GemFire distributed system. This interface should - * not be confused with {@link org.apache.geode.distributed.DistributedSystem DistributedSystem} - * that represents a connection to a GemFire distributed system. - * - * @see AdminDistributedSystemFactory - * - * @since GemFire 3.5 - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public interface AdminDistributedSystem { - - /** - * Retrieves the unique id for this system. - */ - public String getId(); - - /** - * Retrieves display friendly name for this system. If this administrative VM defined an optional - * name for its connection to the distributed system, that name will be returned. Otherwise the - * returned value will be {@link org.apache.geode.admin.AdminDistributedSystem#getId}. - */ - public String getName(); - - /** - * Retrieves the remote command and formatting this system should use to access and/or manipulate - * resources on remote machines. - */ - public String getRemoteCommand(); - - /** - * Sets the remote command and formatting this system should use to access and/or manipulate - * resources on remote machines. - */ - public void setRemoteCommand(String remoteCommand); - - /** - * Sets the lowest level of alert that should be delivered to the {@link AlertListener}s - * registered on this <code>AdminDistributedSystem</code>. The default level is - * {@link AlertLevel#WARNING}. - */ - public void setAlertLevel(AlertLevel level); - - /** - * Returns the lowest level of alerts that should be delivered to the {@link AlertListener}s - * registered on this <code>AdminDistributedSystem</code>. - * - * @see #setAlertLevel - */ - public AlertLevel getAlertLevel(); - - /** - * Sets the lowest level of alert that should be delivered to the {@link AlertListener}s - * registered on this <code>AdminDistributedSystem</code>. The default level is - * {@link AlertLevel#WARNING}. - */ - public void setAlertLevelAsString(String level); - - /** - * Returns the lowest level of alerts that should be delivered to the {@link AlertListener}s - * registered on this <code>AdminDistributedSystem</code>. - * - * @see #setAlertLevelAsString - */ - public String getAlertLevelAsString(); - - /** - * Registers an <code>AlertListener</code> that will receive all alerts that are at or above the - * {@linkplain #setAlertLevel alert level}. - */ - public void addAlertListener(AlertListener listener); - - /** - * Unregisters an <code>AlertListener</code> - */ - public void removeAlertListener(AlertListener listener); - - /** - * Retrieves the multicast address in use by this system. - */ - public String getMcastAddress(); - - /** - * Retrieves the multicast port in use by this system. - */ - public int getMcastPort(); - - /** - * Retrieves comma-delimited list locators to be used if multi-cast port is zero. Format of each - * locators must be host[port]. - */ - public String getLocators(); - - /** - * Returns true if this system has enabled the use of multicast for communications - */ - public boolean isMcastEnabled(); - - /** - * Returns true if any members of this system are currently running. - */ - public boolean isRunning(); - - /** - * Returns <code>true</code> if this is currently connected to the system. - */ - public boolean isConnected(); - - /** - * Starts all managed entities that are not currently running. - * - * @throws AdminException If a problem is encountered while starting the managed entities. - */ - public void start() throws AdminException; - - /** - * Stops all managed entities that are currently running. - * - * @throws AdminException If a problem is encountered while starting the managed entities. - */ - public void stop() throws AdminException; - - /** - * Merges and returns all system logs as a single formatted log. - */ - public String displayMergedLogs(); - - /** - * Retrieves the license information for this installation of GemFire. - * - * @deprecated Removed licensing in 8.0. - */ - public java.util.Properties getLicense(); - - /** - * Creates a new <code>DistributionLocator</code> that is ready to - * {@linkplain DistributionLocator#getConfig configure} and {@linkplain #start start}. - * - * <P> - * - * It is presumed that the newly-added locator is used to discover members of the distributed - * system. That is, the host/port of the new locator is appended to the {@link #getLocators - * locators} attribute of this <code>AdminDistributedSystem</code>. - */ - public DistributionLocator addDistributionLocator(); - - /** - * Returns array of <code>DistributionLocator</code>s administered by this - * <code>AdminDistributedSystem</code>. - */ - public DistributionLocator[] getDistributionLocators(); - - /** - * Retrieves SystemMember instances for every application that is running and currently connection - * to this system. Note that this list does not include dedicated {@linkplain #getCacheVms cache - * server vms}. - */ - public SystemMember[] getSystemMemberApplications() throws org.apache.geode.admin.AdminException; - - /** - * Display in readable format the latest Alert in this distributed system. - */ - public String getLatestAlert(); - - /** - * Returns an object for monitoring the health of GemFire. - */ - public GemFireHealth getGemFireHealth(); - - /** - * Connects to the distributed system. This method will return immediately after spawning a - * background thread that connects to the distributed system. As a result, a - * <code>AdminDistributedSystem</code> can be "connected" to before any members of the system have - * been started or have been seen. The {@link #waitToBeConnected} method will wait for the - * connection to be made. - * - * @see #isConnected - * @see #isRunning - * @see #waitToBeConnected - */ - public void connect(); - - /** - * Wait for up to a given number of milliseconds for the connection to the distributed system to - * be made. - * - * @param timeout The number of milliseconds to wait for the connection to to be made. - * - * @return Whether or not the connection was made. <code>false</code>, if the method times out - * - * @throws InterruptedException If the thread invoking this method is interrupted while waiting. - * @throws IllegalStateException If {@link #connect} has not yet been called. - */ - public boolean waitToBeConnected(long timeout) throws InterruptedException; - - /** - * Disconnects from the distributed system. - */ - public void disconnect(); - - /** Returns this system's configuration . */ - public DistributedSystemConfig getConfig(); - - /** - * Registers a listener that receives callbacks when a member joins or leaves the distributed - * system. - */ - public void addMembershipListener(SystemMembershipListener listener); - - /** - * Unregisters a membership listener - * - * @see #addMembershipListener - */ - public void removeMembershipListener(SystemMembershipListener listener); - - /** - * Registers a cache event listener. Does nothing if the listener is already registered. The - * listeners are called in the order they are registered. - * - * @param listener the listener to register. - * @since GemFire 5.0 - */ - public void addCacheListener(SystemMemberCacheListener listener); - - /** - * Unregisters a cache listener. Does nothing if the listener is not registered. - * - * @param listener the listener to unregister. - * @since GemFire 5.0 - */ - public void removeCacheListener(SystemMemberCacheListener listener); - - /** - * Creates a new cache server that is ready to {@linkplain CacheServerConfig configure} and - * {@linkplain #start start}. - * - * @since GemFire 4.0 - * @deprecated as of 5.7 use {@link #addCacheVm} instead. - */ - @Deprecated - public CacheServer addCacheServer() throws AdminException; - - /** - * Returns all of the dedicated cache server members of the distributed system. Because they are - * not managed entities, application VMs that host a server cache are not included in the array. - * - * @since GemFire 4.0 - * @deprecated as of 5.7 use {@link #getCacheVms} instead. - */ - @Deprecated - public CacheServer[] getCacheServers() throws AdminException; - - /** - * Returns all the cache server members of the distributed system which are hosting a client queue - * for the particular durable-client having the given durableClientId - * - * @param durableClientId - durable-id of the client - * @return array of CacheServer(s) having the queue for the durable client - * @throws AdminException - * - * @since GemFire 5.6 - */ - public CacheServer[] getCacheServers(String durableClientId) throws AdminException; - - /** - * Creates a new cache vm that is ready to {@linkplain CacheVmConfig configure} and - * {@linkplain #start start}. - * - * @since GemFire 5.7 - */ - public CacheVm addCacheVm() throws AdminException; - - /** - * Returns all of the dedicated cache server vm members of the distributed system. Because they - * are not managed entities, application VMs that host a server cache are not included in the - * array. - * - * @since GemFire 5.7 - */ - public CacheVm[] getCacheVms() throws AdminException; - - /** - * Returns the administrative SystemMember specified by the - * {@link org.apache.geode.distributed.DistributedMember}. - * - * @param distributedMember the distributed member to lookup - * @return administrative SystemMember for that distributed member - * @since GemFire 5.0 - */ - public SystemMember lookupSystemMember(DistributedMember distributedMember) throws AdminException; - - /** - * Indicate to the distributed system that persistent files have been lost. When a member recovers - * from a set of persistent files, it will wait for other members that were also persisting the - * same region to start up. If the persistent files for those other members were lost, this method - * can be used to tell the remaining members to stop waiting for the lost data. - * - * @param host The host of the member whose files were lost. - * @param directory The directory where those files resided. - * @since GemFire 6.5 - * @deprecated use {@link #revokePersistentMember(UUID)} instead - */ - public void revokePersistentMember(InetAddress host, String directory) throws AdminException; - - /** - * Indicate to the distributed system that persistent files have been lost. When a member recovers - * from a set of persistent files, it will wait for other members that were also persisting the - * same region to start up. If the persistent files for those other members were lost, this method - * can be used to tell the remaining members to stop waiting for the lost data. - * - * @param diskStoreID The unique id of the disk store which you are revoking. The unique id can be - * discovered from {@link #getMissingPersistentMembers()} - * - * @since GemFire 7.0 - */ - public void revokePersistentMember(UUID diskStoreID) throws AdminException; - - /** - * Retrieve the set of persistent files that the existing members are waiting for. See - * {@link AdminDistributedSystem#revokePersistentMember(InetAddress, String)} - * - * @return The persistent members that were known to the existing persistent members, when the - * existing members were last online. - * @throws AdminException - * @since GemFire 6.5 - * - */ - public Set<PersistentID> getMissingPersistentMembers() throws AdminException; - - /** - * Shuts down all the members of the distributed system with a cache that the admin member is - * connected to, excluding the stand-alone locators. Calling this method will ensure that regions - * with the {@link DataPolicy#PERSISTENT_PARTITION} to be shutdown in a way which allows for a - * faster recovery when the members are restarted. - * - * Killing individual members can lead to inconsistencies in the members persistent data, which - * gemfire repairs on startup. Calling shutDownAllMembers makes sure that the persistent files are - * consistent on shutdown, which makes recovery faster. - * - * This is equivalent to calling shutDownAllMembers(0); - * - * @return The set of members that were shutdown - * @since GemFire 6.5 - */ - public Set<DistributedMember> shutDownAllMembers() throws AdminException; - - /** - * Shuts down all the members of the distributed system with a cache that the admin member is - * connected to, excluding the stand-alone locators. Calling this method will ensure that regions - * with the {@link DataPolicy#PERSISTENT_PARTITION} to be shutdown in a way which allows for a - * faster recovery when the members are restarted. - * - * Killing individual members can lead to inconsistencies in the members persistent data, which - * gemfire repairs on startup. Calling shutDownAllMembers makes sure that the persistent files are - * consistent on shutdown, which makes recovery faster. - * - * @param timeout The amount of time to wait (in milliseconds) for the shutdown all to complete. - * @return The set of members that were shutdown, or null if the timeout is exceeded. - * - * @since GemFire 6.5 - */ - public Set<DistributedMember> shutDownAllMembers(long timeout) throws AdminException; - - /** - * Backup the persistent files for all of the members of the distributed system that the admin - * member is connected to. - * - * @param targetDir The directory where each member's backup should be placed. - * - * @return The status of the backup, which includes the set of members that were backed up and the - * set of members that were known to be offline at the time of backup. - * @since GemFire 6.5 - */ - public BackupStatus backupAllMembers(File targetDir) throws AdminException; - - /** - * Incrementally backup the persistent files for all of the members of the distributed system that - * the admin member is connected to. Only new operation log files since the previous backup will - * be copied during this backup. The generated restore script will reference and copy operation - * log files from the previous backup. - * - * @param targetDir The directory where each member's backup should be placed. - * @param baselineDir The directory of a previous backup. If this parameter is null or the - * directory does not exist (on a member by member basis) a full backup will be performed - * for the member. - * - * @return The status of the backup, which includes the set of members that were backed up and the - * set of members that were known to be offline at the time of backup. - * @since GemFire 6.5 - */ - public BackupStatus backupAllMembers(File targetDir, File baselineDir) throws AdminException; - - /** - * Compact the persistent files for all of the members of the distributed system that the admin - * member connected to. - * - * This is equivalent to calling {DiskStore#forceCompaction} on all members. - * - * @return The set of members that compacted their disk stores. - * @since GemFire 6.5 - */ - public Map<DistributedMember, Set<PersistentID>> compactAllDiskStores() throws AdminException; -} - http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java deleted file mode 100755 index 60a8722..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java +++ /dev/null @@ -1,148 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -import org.apache.geode.admin.internal.AdminDistributedSystemImpl; -import org.apache.geode.admin.internal.DistributedSystemConfigImpl; -import org.apache.geode.distributed.DistributedSystem; -import org.apache.geode.distributed.internal.DistributionConfig; -import org.apache.geode.distributed.internal.DistributionConfigImpl; -import org.apache.geode.distributed.internal.InternalDistributedSystem; -import org.apache.geode.i18n.LogWriterI18n; -import org.apache.geode.internal.i18n.LocalizedStrings; -import org.apache.geode.internal.logging.LocalLogWriter; - -import java.util.Properties; - -/** - * Factory for creating GemFire administration entities. - * - * @since GemFire 3.5 - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public class AdminDistributedSystemFactory { - - /** - * Sets the address this VM should bind to when connecting to the distributed system. This - * involves a system property, so using this option will limit all connections to distributed - * systems to this one network interface. - * <p> - * Using a null or empty bindAddress will clear the usage of this option and connections to - * distributed systems will return to using all available network interfaces. - * <p> - * This method always throws UnsupportedOperationException because it is now deprecated and is - * unsafe to use. Please use {@link DistributedSystemConfig#setBindAddress} instead. - * - * @param bindAddress machine name or IP address to bind to - * @throws UnsupportedOperationException because of deprecation - * @deprecated Use {@link DistributedSystemConfig#setBindAddress} instead. - */ - @Deprecated - public static void bindToAddress(String bindAddress) { - throw new UnsupportedOperationException( - LocalizedStrings.AdminDistributedSystemFactory_PLEASE_USE_DISTRIBUTEDSYSTEMCONFIGSETBINDADDRESS_INSTEAD - .toLocalizedString()); - } - - /** - * Defines a "default" distributed system configuration based on VM system properties and the - * content of <code>gemfire.properties</code>. The - * {@linkplain DistributedSystemConfig#DEFAULT_REMOTE_COMMAND} default remote command is used. - * - * @see DistributedSystem#connect - */ - public static DistributedSystemConfig defineDistributedSystem() { - DistributionConfig dc = new DistributionConfigImpl(new Properties()); - - String remoteCommand = DistributedSystemConfig.DEFAULT_REMOTE_COMMAND; - return new DistributedSystemConfigImpl(dc, remoteCommand); - } - - /** - * Call this method with a value of <code>true</code> to dedicate the VM to GemFire administration - * only. Default is <code>false</code>. - * <p> - * This method <em>must</em> be called before calling {@link AdminDistributedSystem#connect}. It - * <em>must</em> also be called before {@link DistributedSystem#connect} is when creating a - * colocated distributed system. - * <p> - * Once it has been enabled be careful to only use GemFire APIs from the - * <code>org.apache.geode.admin</code> package. In particular do not create a - * {@link org.apache.geode.cache.Cache} or a normal {@link DistributedSystem}. - * - * @param adminOnly <code>true</code> if this VM should be limited to administration APIs; - * <code>false</code> if this VM should allow all GemFire APIs. - * @throws IllegalStateException if a {@link DistributedSystem} or {@link AdminDistributedSystem} - * connection already exists. - * - * @since GemFire 5.7 - */ - public static void setEnableAdministrationOnly(boolean adminOnly) { - InternalDistributedSystem.setEnableAdministrationOnly(adminOnly); - } - - /** - * Defines a distributed system configuration for administering the distributed system to which - * this VM is currently connected. The <code>DistributedSystem</code> is used to configure the - * discovery mechanism (multicast or locators), bind address, SSL attributes, as well as the - * logger of the <code>DistributedSystemConfig</code>. Note that the distributed system will not - * be able to be administered until the {@link AdminDistributedSystem#connect connect} method is - * invoked. - * - * @param system A connection to the distributed system - * @param remoteCommand The shell command that is used to launch processes that run on remote - * machines. If <code>null</code>, then the - * {@linkplain DistributedSystemConfig#DEFAULT_REMOTE_COMMAND default} will be used. - * - * @since GemFire 4.0 - */ - public static DistributedSystemConfig defineDistributedSystem(DistributedSystem system, - String remoteCommand) throws AdminException { - - InternalDistributedSystem internal = (InternalDistributedSystem) system; - if (remoteCommand == null) { - remoteCommand = DistributedSystemConfig.DEFAULT_REMOTE_COMMAND; - } - - DistributedSystemConfigImpl impl = - new DistributedSystemConfigImpl(internal.getConfig(), remoteCommand); - return impl; - } - - /** - * Returns the distributed system for administrative monitoring and managing. You must then call - * {@link AdminDistributedSystem#connect} before interacting with the actual system. - * - * @param config configuration definition of the system to administer - * @return administrative interface for a distributed system - */ - public static AdminDistributedSystem getDistributedSystem(DistributedSystemConfig config) { - return new AdminDistributedSystemImpl((DistributedSystemConfigImpl) config); - } - - /** - * Returns a default GemFire LogWriterI18n for logging. This LogWriterI18n will log to standard - * out. - * - * @return a GemFire LogWriterI18n for logging - */ - public static LogWriterI18n getLogWriter() { - return new LocalLogWriter(DistributionConfig.DEFAULT_LOG_LEVEL); - } - -} - http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/AdminException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminException.java b/geode-core/src/main/java/org/apache/geode/admin/AdminException.java deleted file mode 100755 index 92b5e47..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/AdminException.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package org.apache.geode.admin; - -import org.apache.geode.GemFireCheckedException; - -/** - * An <code>AdminException</code> is thrown when administration or monitoring of GemFire fails. - * - * @since GemFire 3.5 - * - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public class AdminException extends GemFireCheckedException { - private static final long serialVersionUID = 879398950879472021L; - - /** - * Constructs a new exception with <code>null</code> as its detail message. The cause is not - * initialized, and may subsequently be initialized by a call to {@link Throwable#initCause}. - */ - public AdminException() { - super(); - } - - /** - * Constructs a new exception with the specified detail message. The cause is not initialized, and - * may subsequently be initialized by a call to {@link Throwable#initCause}. - * - * @param message the detail message. The detail message is saved for later retrieval by the - * {@link #getMessage()} method. - */ - public AdminException(String message) { - super(message); - } - - /** - * Constructs a new exception with the specified detail message and cause. - * <p> - * Note that the detail message associated with <code>cause</code> is <i>not</i> automatically - * incorporated in this exception's detail message. - * - * @param message the detail message (which is saved for later retrieval by the - * {@link #getMessage()} method). - * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). - * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or - * unknown.) - */ - public AdminException(String message, Throwable cause) { - super(message, cause); - } - - /** - * Constructs a new exception with the specified cause. The detail message will be - * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class and detail - * message of <tt>cause</tt>). This constructor is useful for exceptions that are little more than - * wrappers for other throwables (for example, {@link java.security.PrivilegedActionException}). - * - * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). - * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or - * unknown.) - */ - public AdminException(Throwable cause) { - super(cause); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java b/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java deleted file mode 100644 index ff1b48e..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -/** - * Thrown when a problem is encountered while working with admin-related XML data. - * - * @see DistributedSystemConfig#getEntityConfigXMLFile - * - * @since GemFire 4.0 - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public class AdminXmlException extends RuntimeAdminException { - private static final long serialVersionUID = -6848726449157550169L; - - /** - * Creates a new <code>AdminXmlException</code> with the given descriptive message. - */ - public AdminXmlException(String s) { - super(s); - } - - /** - * Creates a new <code>AdminXmlException</code> with the given descriptive message and cause. - */ - public AdminXmlException(String s, Throwable cause) { - super(s, cause); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/Alert.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/Alert.java b/geode-core/src/main/java/org/apache/geode/admin/Alert.java deleted file mode 100755 index 44c373e..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/Alert.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -/** - * An administration alert that is issued by a member of a GemFire distributed system. It is similar - * to a {@linkplain org.apache.geode.i18n.LogWriterI18n log message}. - * - * @see AlertListener - * @since GemFire 3.5 - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public interface Alert { - - /** The level at which this alert is issued */ - public AlertLevel getLevel(); - - /** - * The member of the distributed system that issued the alert, or null if the issuer is no longer - * a member of the distributed system. - */ - public SystemMember getSystemMember(); - - /** - * The name of the {@linkplain org.apache.geode.distributed.DistributedSystem#getName distributed - * system}) through which the alert was issued. - */ - public String getConnectionName(); - - /** The id of the source of the alert (such as a thread in a VM) */ - public String getSourceId(); - - /** The alert's message */ - public String getMessage(); - - /** The time at which the alert was issued */ - public java.util.Date getDate(); - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java b/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java deleted file mode 100755 index 2fdcef8..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -import org.apache.geode.internal.admin.Alert; -import org.apache.geode.internal.i18n.LocalizedStrings; - -/** - * Type-safe enumeration for {@link org.apache.geode.admin.Alert Alert} level. - * - * @since GemFire 3.5 - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public class AlertLevel implements java.io.Serializable { - private static final long serialVersionUID = -4752438966587392126L; - - public static final AlertLevel WARNING = new AlertLevel(Alert.WARNING, "WARNING"); - public static final AlertLevel ERROR = new AlertLevel(Alert.ERROR, "ERROR"); - public static final AlertLevel SEVERE = new AlertLevel(Alert.SEVERE, "SEVERE"); - - public static final AlertLevel OFF = new AlertLevel(Alert.OFF, "OFF"); - - /** The severity level of this AlertLevel. Greater is more severe. */ - private final transient int severity; - - /** The name of this AlertLevel. */ - private final transient String name; - - // The 4 declarations below are necessary for serialization - /** int used as ordinal to represent this AlertLevel */ - public final int ordinal = nextOrdinal++; - - private static int nextOrdinal = 0; - - private static final AlertLevel[] VALUES = {WARNING, ERROR, SEVERE, OFF}; - - private Object readResolve() throws java.io.ObjectStreamException { - return VALUES[ordinal]; // Canonicalize - } - - /** Creates a new instance of AlertLevel. */ - private AlertLevel(int severity, String name) { - this.severity = severity; - this.name = name; - } - - /** Return the AlertLevel represented by specified ordinal */ - public static AlertLevel fromOrdinal(int ordinal) { - return VALUES[ordinal]; - } - - /** - * Returns the <code>AlertLevel</code> for the given severity - * - * @throws IllegalArgumentException If there is no alert level with the given - * <code>severity</code> - */ - public static AlertLevel forSeverity(int severity) { - switch (severity) { - case Alert.WARNING: - return AlertLevel.WARNING; - case Alert.ERROR: - return AlertLevel.ERROR; - case Alert.SEVERE: - return AlertLevel.SEVERE; - case Alert.OFF: - return AlertLevel.OFF; - default: - throw new IllegalArgumentException(LocalizedStrings.AlertLevel_UNKNOWN_ALERT_SEVERITY_0 - .toLocalizedString(Integer.valueOf(severity))); - } - } - - /** - * Returns the <code>AlertLevel</code> with the given name - * - * @throws IllegalArgumentException If there is no alert level named <code>name</code> - */ - public static AlertLevel forName(String name) { - for (int i = 0; i < VALUES.length; i++) { - AlertLevel level = VALUES[i]; - if (level.getName().equalsIgnoreCase(name)) { - return level; - } - } - - throw new IllegalArgumentException( - LocalizedStrings.AlertLevel_THERE_IS_NO_ALERT_LEVEL_0.toLocalizedString(name)); - } - - public int getSeverity() { - return this.severity; - } - - public String getName() { - return this.name; - } - - public static AlertLevel[] values() { - return VALUES; - } - - /** - * Returns a string representation for this alert level. - * - * @return the name of this alert level - */ - @Override - public String toString() { - return this.name /* + "=" + this.severity */; - } - - /** - * Indicates whether some other object is "equal to" this one. - * - * @param other the reference object with which to compare. - * @return true if this object is the same as the obj argument; false otherwise. - */ - @Override - public boolean equals(Object other) { - if (other == this) - return true; - if (other == null) - return false; - if (!(other instanceof AlertLevel)) - return false; - final AlertLevel that = (AlertLevel) other; - - if (this.severity != that.severity) - return false; - if (this.name != null && !this.name.equals(that.name)) - return false; - - return true; - } - - /** - * Returns a hash code for the object. This method is supported for the benefit of hashtables such - * as those provided by java.util.Hashtable. - * - * @return the integer 0 if description is null; otherwise a unique integer. - */ - @Override - public int hashCode() { - int result = 17; - final int mult = 37; - - result = mult * result + this.severity; - result = mult * result + (this.name == null ? 0 : this.name.hashCode()); - - return result; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java b/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java deleted file mode 100755 index 247f4d0..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -/** - * A listener whose callback methods are invoked when an {@link Alert} is received. - * - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public interface AlertListener extends java.util.EventListener { - - /** - * Invoked when an <code>Alert</code> is received. - */ - public void alert(Alert alert); -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java b/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java deleted file mode 100644 index c696b07..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -import java.util.Map; -import java.util.Set; - -import org.apache.geode.cache.persistence.PersistentID; -import org.apache.geode.distributed.DistributedMember; - -/** - * The status of a backup operation, returned by - * {@link AdminDistributedSystem#backupAllMembers(java.io.File,java.io.File)}. - * - * @since GemFire 6.5 - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public interface BackupStatus { - - /** - * Returns a map of disk stores that were successfully backed up. The key is an online distributed - * member. The value is the set of disk stores on that distributed member. - */ - Map<DistributedMember, Set<PersistentID>> getBackedUpDiskStores(); - - /** - * Returns the set of disk stores that were known to be offline at the time of the backup. These - * members were not backed up. If this set is not empty the backup may not contain a complete - * snapshot of any partitioned regions in the distributed system. - */ - Set<PersistentID> getOfflineDiskStores(); -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java b/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java deleted file mode 100644 index 338061e..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ - -package org.apache.geode.admin; - -/** - * An <code>CacheDoesNotExistException</code> is thrown when an attempt is made to get a cache and - * one does not exist. - * - * @since GemFire 3.5 - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public class CacheDoesNotExistException extends AdminException { - private static final long serialVersionUID = -1639933911265729978L; - - /** - * Constructs a new exception with <code>null</code> as its detail message. The cause is not - * initialized, and may subsequently be initialized by a call to {@link Throwable#initCause}. - */ - public CacheDoesNotExistException() { - super(); - } - - /** - * Constructs a new exception with the specified detail message. The cause is not initialized, and - * may subsequently be initialized by a call to {@link Throwable#initCause}. - * - * @param message the detail message. The detail message is saved for later retrieval by the - * {@link #getMessage()} method. - */ - public CacheDoesNotExistException(String message) { - super(message); - } - - /** - * Constructs a new exception with the specified detail message and cause. - * <p> - * Note that the detail message associated with <code>cause</code> is <i>not</i> automatically - * incorporated in this exception's detail message. - * - * @param message the detail message (which is saved for later retrieval by the - * {@link #getMessage()} method). - * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). - * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or - * unknown.) - */ - public CacheDoesNotExistException(String message, Throwable cause) { - super(message, cause); - } - - /** - * Constructs a new exception with the specified cause and a detail message of - * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class and detail - * message of <tt>cause</tt>). This constructor is useful for exceptions that are little more than - * wrappers for other throwables (for example, {@link java.security.PrivilegedActionException}). - * - * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). - * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or - * unknown.) - */ - public CacheDoesNotExistException(Throwable cause) { - super(cause); - } - -} - http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java deleted file mode 100644 index 9f99309..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -/** - * Provides configuration information relating to the health of a member of a GemFire distributed - * system that hosts a GemFire {@link org.apache.geode.cache.Cache Cache}. - * - * <P> - * - * If any of the following criteria is true, then a cache member is considered to be in - * {@link GemFireHealth#OKAY_HEALTH OKAY_HEALTH}. - * - * <UL> - * - * <LI><code>netSearch</code> operations take {@linkplain #getMaxNetSearchTime too long} to - * complete.</LI> - * - * <LI>Cache <code>load</code> operations take {@linkplain #getMaxLoadTime too long} to - * complete.</LI> - * - * <LI>The overall cache {@link #getMinHitRatio hitRatio} is too small</LI> - * - * <LI>The number of entries in the Cache {@link #getMaxEventQueueSize event delivery queue} is too - * large.</LI> - * - * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#FULL_ACCESS - * FULL_ACCESS} on role loss.</LI> - * - * </UL> - * - * If any of the following criteria is true, then a cache member is considered to be in - * {@link GemFireHealth#POOR_HEALTH POOR_HEALTH}. - * - * <UL> - * - * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#NO_ACCESS - * NO_ACCESS} on role loss.</LI> - * - * <LI>If one of the regions is configured with - * {@link org.apache.geode.cache.LossAction#LIMITED_ACCESS LIMITED_ACCESS} on role loss.</LI> - * - * </UL> - * - * <UL> - * - * </UL> - * - * - * @since GemFire 3.5 - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public interface CacheHealthConfig { - - /** - * The default maximum number of milliseconds a <code>netSearch</code> operation can take before - * the cache member is considered to be unhealthy. - */ - public static final long DEFAULT_MAX_NET_SEARCH_TIME = 60 * 1000; - - /** - * The default maximum mumber of milliseconds a cache <code>load</code> operation can take before - * the cache member is considered to be unhealthy. - */ - public static final long DEFAULT_MAX_LOAD_TIME = 60 * 1000; - - /** The default minimum hit ratio of a healthy cache member. */ - public static final double DEFAULT_MIN_HIT_RATIO = 0.0; - - /** - * The default maximum number of entries in the event delivery queue of a healthy cache member. - */ - public static final long DEFAULT_MAX_EVENT_QUEUE_SIZE = 1000; - - /////////////////////// Instance Methods /////////////////////// - - /** - * Returns the maximum number of milliseconds a <code>netSearch</code> operation can take before - * the cache member is considered to be unhealthy. - * - * @see #DEFAULT_MAX_NET_SEARCH_TIME - */ - public long getMaxNetSearchTime(); - - /** - * Sets the maximum number of milliseconds a <code>netSearch</code> operation can take before the - * cache member is considered to be unhealthy. - * - * @see #getMaxNetSearchTime - */ - public void setMaxNetSearchTime(long maxNetSearchTime); - - /** - * Returns the maximum mumber of milliseconds a cache <code>load</code> operation can take before - * the cache member is considered to be unhealthy. - * - * @see #DEFAULT_MAX_LOAD_TIME - */ - public long getMaxLoadTime(); - - /** - * Sets the maximum mumber of milliseconds a cache <code>load</code> operation can take before the - * cache member is considered to be unhealthy. - * - * @see #getMaxLoadTime - */ - public void setMaxLoadTime(long maxLoadTime); - - /** - * Returns the minimum hit ratio of a healthy cache member. - * - * @see #DEFAULT_MIN_HIT_RATIO - */ - public double getMinHitRatio(); - - /** - * Sets the minimum hit ratio of a healthy cache member. - * - * @see #getMinHitRatio - */ - public void setMinHitRatio(double minHitRatio); - - /** - * Returns the maximum number of entries in the event delivery queue of a healthy cache member. - * - * @see #DEFAULT_MAX_EVENT_QUEUE_SIZE - */ - public long getMaxEventQueueSize(); - - /** - * Sets the maximum number of entries in the event delivery queue of a healthy cache member. - * - * @see #getMaxEventQueueSize - */ - public void setMaxEventQueueSize(long maxEventQueueSize); - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java b/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java deleted file mode 100644 index a229281..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -/** - * A dedicated cache server VM that is managed by the administration API. - * - * @since GemFire 4.0 - * @deprecated as of 5.7 use {@link CacheVm} instead. - */ -@Deprecated -public interface CacheServer extends SystemMember, ManagedEntity { - /** - * Returns the configuration of this cache vm - * - * @deprecated as of 5.7 use {@link CacheVm#getVmConfig} instead. - */ - @Deprecated - public CacheServerConfig getConfig(); - - /** - * Find whether this server is primary for given client (durableClientId) - * - * @param durableClientId - durable-id of the client - * @return true if the server is primary for given client - * - * @since GemFire 5.6 - */ - public boolean isPrimaryForDurableClient(String durableClientId); - -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java b/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java deleted file mode 100644 index 389d6bc..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -/** - * Configuration for a GemFire cache server that is managed by the administration API. The cache - * server may or may not be running. - * - * @see AdminDistributedSystem#addCacheServer() - * - * @since GemFire 4.0 - * @deprecated as of 5.7 use {@link CacheVmConfig} instead. - */ -@Deprecated -public interface CacheServerConfig extends CacheVmConfig { - /** - * Returns the <code>cache.xml</code> declarative caching initialization file used to configure - * this cache server VM. By default, a cache server VM is started without an XML file. - */ - public String getCacheXMLFile(); - - /** - * Sets the <code>cache.xml</code> declarative caching initialization file used to configure this - * cache server VM. - */ - public void setCacheXMLFile(String cacheXml); - - /** - * Returns the location(s) of user classes (such as cache loaders) required by the cache server - * VM. - */ - public String getClassPath(); - - /** - * Sets the location(s) of user classes (such as cache loaders) required by the cache server VM. - */ - public void setClassPath(String classpath); -} http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/895fd144/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java b/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java deleted file mode 100755 index 30d8701..0000000 --- a/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - */ -package org.apache.geode.admin; - -/** - * A dedicated cache server VM that is managed by the administration API. - * <p> - * Note that this may not represent an instance of - * {@link org.apache.geode.cache.server.CacheServer}. It is possible for a cache VM to be started - * but for it not to listen for client connections in which case it is not a - * {@link org.apache.geode.cache.server.CacheServer} but is an instance of this interface. - * - * @since GemFire 5.7 - * @deprecated as of 7.0 use the <code><a href= - * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> - * package instead - */ -public interface CacheVm extends SystemMember, ManagedEntity { - /** - * Returns the configuration of this cache vm - */ - public CacheVmConfig getVmConfig(); -}
