[BROOKLYN-162] Renaming package brooklyn.location
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e2c57058 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e2c57058 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e2c57058 Branch: refs/heads/master Commit: e2c57058a3c0783c38d5095e8f42b69b3692d658 Parents: e5289b8 Author: Valentin Aitken <[email protected]> Authored: Thu Aug 13 07:48:56 2015 +0300 Committer: Hadrian Zbarcea <[email protected]> Committed: Thu Aug 13 22:41:47 2015 -0400 ---------------------------------------------------------------------- .../brooklyn/location/AddressableLocation.java | 43 - .../BasicMachineLocationCustomizer.java | 41 - .../java/brooklyn/location/HardwareDetails.java | 40 - .../main/java/brooklyn/location/Location.java | 146 - .../brooklyn/location/LocationDefinition.java | 42 - .../location/LocationNotAvailableException.java | 35 - .../brooklyn/location/LocationRegistry.java | 128 - .../brooklyn/location/LocationResolver.java | 57 - .../java/brooklyn/location/LocationSpec.java | 229 -- .../java/brooklyn/location/LocationType.java | 32 - .../java/brooklyn/location/MachineDetails.java | 34 - .../java/brooklyn/location/MachineLocation.java | 46 - .../location/MachineLocationCustomizer.java | 42 - .../location/MachineManagementMixins.java | 92 - .../location/MachineProvisioningLocation.java | 72 - .../location/NoMachinesAvailableException.java | 35 - .../main/java/brooklyn/location/OsDetails.java | 46 - .../main/java/brooklyn/location/PortRange.java | 48 - .../java/brooklyn/location/PortSupplier.java | 50 - .../brooklyn/location/ProvisioningLocation.java | 44 - .../org/apache/brooklyn/api/entity/Entity.java | 2 +- .../api/entity/drivers/EntityDriver.java | 2 +- .../api/entity/drivers/EntityDriverManager.java | 2 +- .../api/entity/proxying/EntitySpec.java | 2 +- .../api/entity/proxying/EntityTypeRegistry.java | 2 +- .../api/entity/rebind/BrooklynObjectType.java | 2 +- .../entity/rebind/RebindExceptionHandler.java | 2 +- .../api/management/AccessController.java | 2 +- .../api/management/LocationManager.java | 4 +- .../api/management/ManagementContext.java | 2 +- .../brooklyn/location/AddressableLocation.java | 43 + .../BasicMachineLocationCustomizer.java | 41 + .../brooklyn/location/HardwareDetails.java | 40 + .../org/apache/brooklyn/location/Location.java | 146 + .../brooklyn/location/LocationDefinition.java | 42 + .../location/LocationNotAvailableException.java | 35 + .../brooklyn/location/LocationRegistry.java | 128 + .../brooklyn/location/LocationResolver.java | 57 + .../apache/brooklyn/location/LocationSpec.java | 229 ++ .../apache/brooklyn/location/LocationType.java | 32 + .../brooklyn/location/MachineDetails.java | 34 + .../brooklyn/location/MachineLocation.java | 46 + .../location/MachineLocationCustomizer.java | 42 + .../location/MachineManagementMixins.java | 92 + .../location/MachineProvisioningLocation.java | 72 + .../location/NoMachinesAvailableException.java | 35 + .../org/apache/brooklyn/location/OsDetails.java | 46 + .../org/apache/brooklyn/location/PortRange.java | 48 + .../apache/brooklyn/location/PortSupplier.java | 50 + .../brooklyn/location/ProvisioningLocation.java | 44 + .../mementos/BrooklynMementoPersister.java | 2 +- .../main/java/brooklyn/basic/BrooklynTypes.java | 2 +- .../brooklyn/catalog/CatalogPredicates.java | 4 +- .../catalog/internal/BasicBrooklynCatalog.java | 6 +- .../catalog/internal/CatalogClasspathDo.java | 2 +- .../internal/CatalogLocationItemDto.java | 4 +- .../entity/basic/AbstractApplication.java | 2 +- .../brooklyn/entity/basic/AbstractEntity.java | 4 +- .../brooklyn/entity/basic/BasicStartable.java | 6 +- .../entity/basic/BasicStartableImpl.java | 5 +- .../entity/basic/BrooklynConfigKeys.java | 2 +- .../brooklyn/entity/basic/DataEntityImpl.java | 2 +- .../entity/basic/EffectorStartableImpl.java | 2 +- .../java/brooklyn/entity/basic/Entities.java | 8 +- .../entity/basic/EntityFactoryForLocation.java | 2 +- .../brooklyn/entity/basic/EntityFunctions.java | 2 +- .../brooklyn/entity/basic/EntityInternal.java | 2 +- .../brooklyn/entity/basic/EntityPredicates.java | 2 +- .../brooklyn/entity/basic/EntitySuppliers.java | 4 +- .../basic/EntityTransientCopyInternal.java | 4 +- .../java/brooklyn/entity/basic/Lifecycle.java | 3 +- .../drivers/BasicEntityDriverManager.java | 2 +- .../drivers/ReflectiveEntityDriverFactory.java | 8 +- .../drivers/RegistryEntityDriverFactory.java | 2 +- .../brooklyn/entity/effector/EffectorTasks.java | 6 +- .../brooklyn/entity/group/DynamicCluster.java | 2 +- .../entity/group/DynamicClusterImpl.java | 8 +- .../entity/group/DynamicFabricImpl.java | 2 +- .../entity/group/DynamicRegionsFabricImpl.java | 2 +- .../zoneaware/AbstractZoneFailureDetector.java | 2 +- .../BalancingNodePlacementStrategy.java | 2 +- .../zoneaware/CombiningZoneFailureDetector.java | 2 +- .../CriticalCauseZoneFailureDetector.java | 2 +- .../ProportionalZoneFailureDetector.java | 2 +- .../proxying/InternalLocationFactory.java | 9 +- .../entity/rebind/BasicEntityRebindSupport.java | 2 +- .../rebind/BasicLocationRebindSupport.java | 4 +- .../rebind/ImmediateDeltaChangeListener.java | 4 +- .../rebind/PeriodicDeltaChangeListener.java | 2 +- .../entity/rebind/RebindContextImpl.java | 2 +- .../rebind/RebindContextLookupContext.java | 2 +- .../rebind/RebindExceptionHandlerImpl.java | 2 +- .../brooklyn/entity/rebind/RebindIteration.java | 6 +- .../java/brooklyn/entity/rebind/TreeUtils.java | 2 +- .../entity/rebind/dto/MementosGenerators.java | 4 +- .../persister/BrooklynPersistenceUtils.java | 6 +- .../rebind/persister/XmlMementoSerializer.java | 2 +- .../java/brooklyn/entity/trait/Startable.java | 2 +- .../brooklyn/entity/trait/StartableMethods.java | 2 +- .../basic/PortAttributeSensorAndConfigKey.java | 10 +- .../java/brooklyn/event/feed/ssh/SshFeed.java | 6 +- .../brooklyn/event/feed/ssh/SshPollValue.java | 2 +- .../windows/WindowsPerformanceCounterFeed.java | 2 +- .../internal/BrooklynInitialization.java | 2 +- .../location/access/BrooklynAccessUtils.java | 143 - .../location/access/PortForwardManager.java | 327 -- .../access/PortForwardManagerAuthority.java | 47 - .../access/PortForwardManagerClient.java | 406 --- .../location/access/PortForwardManagerImpl.java | 506 ---- .../PortForwardManagerLocationResolver.java | 89 - .../brooklyn/location/access/PortMapping.java | 101 - .../location/basic/AbstractLocation.java | 708 ----- .../basic/AbstractLocationResolver.java | 189 -- .../AggregatingMachineProvisioningLocation.java | 139 - .../location/basic/BasicHardwareDetails.java | 56 - .../location/basic/BasicLocationDefinition.java | 85 - .../location/basic/BasicLocationRegistry.java | 481 --- .../location/basic/BasicMachineDetails.java | 181 -- .../location/basic/BasicMachineMetadata.java | 84 - .../brooklyn/location/basic/BasicOsDetails.java | 122 - .../location/basic/ByonLocationResolver.java | 250 -- .../location/basic/CatalogLocationResolver.java | 80 - .../basic/DefinedLocationByIdResolver.java | 75 - .../basic/DeprecatedKeysMappingBuilder.java | 67 - .../FixedListMachineProvisioningLocation.java | 474 --- .../location/basic/HasSubnetHostname.java | 32 - .../location/basic/HostLocationResolver.java | 90 - .../basic/LocalhostLocationResolver.java | 73 - .../LocalhostMachineProvisioningLocation.java | 346 --- ...calhostPropertiesFromBrooklynProperties.java | 57 - .../location/basic/LocationConfigKeys.java | 79 - .../location/basic/LocationConfigUtils.java | 559 ---- .../location/basic/LocationDynamicType.java | 39 - .../location/basic/LocationInternal.java | 94 - .../location/basic/LocationPredicates.java | 108 - ...ocationPropertiesFromBrooklynProperties.java | 224 -- .../location/basic/LocationTypeSnapshot.java | 41 - .../java/brooklyn/location/basic/Locations.java | 159 - .../java/brooklyn/location/basic/Machines.java | 188 -- .../brooklyn/location/basic/MultiLocation.java | 167 - .../location/basic/MultiLocationResolver.java | 146 - .../location/basic/NamedLocationResolver.java | 97 - .../brooklyn/location/basic/PortRanges.java | 257 -- .../basic/RegistryLocationResolver.java | 41 - .../basic/SingleMachineLocationResolver.java | 77 - .../SingleMachineProvisioningLocation.java | 92 - .../location/basic/SshMachineLocation.java | 1031 ------- .../location/basic/SupportsPortForwarding.java | 39 - .../location/basic/WinRmMachineLocation.java | 360 --- .../AbstractAvailabilityZoneExtension.java | 83 - ...bstractCloudMachineProvisioningLocation.java | 98 - .../cloud/AvailabilityZoneExtension.java | 54 - .../location/cloud/CloudLocationConfig.java | 116 - .../cloud/names/AbstractCloudMachineNamer.java | 151 - .../cloud/names/BasicCloudMachineNamer.java | 92 - .../location/cloud/names/CloudMachineNamer.java | 62 - .../cloud/names/CustomMachineNamer.java | 73 - .../location/dynamic/DynamicLocation.java | 51 - .../location/dynamic/LocationOwner.java | 86 - .../location/geo/GeoBytesHostGeoLookup.java | 105 - .../brooklyn/location/geo/HasHostGeoInfo.java | 25 - .../java/brooklyn/location/geo/HostGeoInfo.java | 206 -- .../brooklyn/location/geo/HostGeoLookup.java | 27 - .../location/geo/LocalhostExternalIpLoader.java | 179 -- .../location/geo/MaxMind2HostGeoLookup.java | 115 - .../location/geo/UtraceHostGeoLookup.java | 210 -- .../brooklyn/location/paas/PaasLocation.java | 30 - .../ha/HighAvailabilityManagerImpl.java | 2 +- .../internal/AbstractManagementContext.java | 4 +- .../internal/BrooklynGarbageCollector.java | 2 +- .../management/internal/LocalAccessManager.java | 2 +- .../internal/LocalLocationManager.java | 10 +- .../internal/LocalManagementContext.java | 2 +- .../management/internal/LocalUsageManager.java | 8 +- .../internal/LocationManagerInternal.java | 2 +- .../internal/ManagementContextInternal.java | 2 +- .../internal/NonDeploymentLocationManager.java | 4 +- .../NonDeploymentManagementContext.java | 4 +- .../internal/NonDeploymentUsageManager.java | 2 +- .../management/internal/UsageListener.java | 2 +- .../management/internal/UsageManager.java | 2 +- .../brooklyn/util/BrooklynNetworkUtils.java | 2 +- .../main/java/brooklyn/util/ResourceUtils.java | 2 +- .../java/brooklyn/util/file/ArchiveTasks.java | 2 +- .../java/brooklyn/util/file/ArchiveUtils.java | 2 +- .../util/task/ssh/SshFetchTaskFactory.java | 2 +- .../util/task/ssh/SshFetchTaskWrapper.java | 2 +- .../util/task/ssh/SshPutTaskFactory.java | 2 +- .../brooklyn/util/task/ssh/SshPutTaskStub.java | 2 +- .../java/brooklyn/util/task/ssh/SshTasks.java | 8 +- .../internal/AbstractSshExecTaskFactory.java | 2 +- .../ssh/internal/PlainSshExecTaskFactory.java | 3 +- .../util/task/system/ProcessTaskFactory.java | 2 +- .../util/task/system/ProcessTaskStub.java | 2 +- .../internal/AbstractProcessTaskFactory.java | 2 +- .../system/internal/ExecWithLoggingHelpers.java | 2 +- .../internal/SystemProcessTaskFactory.java | 2 +- .../brooklyn/util/text/TemplateProcessor.java | 2 +- .../location/access/BrooklynAccessUtils.java | 143 + .../location/access/PortForwardManager.java | 327 ++ .../access/PortForwardManagerAuthority.java | 47 + .../access/PortForwardManagerClient.java | 406 +++ .../location/access/PortForwardManagerImpl.java | 506 ++++ .../PortForwardManagerLocationResolver.java | 90 + .../brooklyn/location/access/PortMapping.java | 101 + .../location/basic/AbstractLocation.java | 708 +++++ .../basic/AbstractLocationResolver.java | 189 ++ .../AggregatingMachineProvisioningLocation.java | 139 + .../location/basic/BasicHardwareDetails.java | 56 + .../location/basic/BasicLocationDefinition.java | 85 + .../location/basic/BasicLocationRegistry.java | 480 +++ .../location/basic/BasicMachineDetails.java | 181 ++ .../location/basic/BasicMachineMetadata.java | 83 + .../brooklyn/location/basic/BasicOsDetails.java | 122 + .../location/basic/ByonLocationResolver.java | 251 ++ .../location/basic/CatalogLocationResolver.java | 80 + .../basic/DefinedLocationByIdResolver.java | 74 + .../basic/DeprecatedKeysMappingBuilder.java | 67 + .../FixedListMachineProvisioningLocation.java | 474 +++ .../location/basic/HasSubnetHostname.java | 32 + .../location/basic/HostLocationResolver.java | 90 + .../basic/LocalhostLocationResolver.java | 74 + .../LocalhostMachineProvisioningLocation.java | 347 +++ ...calhostPropertiesFromBrooklynProperties.java | 57 + .../location/basic/LocationConfigKeys.java | 79 + .../location/basic/LocationConfigUtils.java | 559 ++++ .../location/basic/LocationDynamicType.java | 39 + .../location/basic/LocationInternal.java | 94 + .../location/basic/LocationPredicates.java | 108 + ...ocationPropertiesFromBrooklynProperties.java | 224 ++ .../location/basic/LocationTypeSnapshot.java | 41 + .../brooklyn/location/basic/Locations.java | 159 + .../brooklyn/location/basic/Machines.java | 188 ++ .../brooklyn/location/basic/MultiLocation.java | 167 + .../location/basic/MultiLocationResolver.java | 146 + .../location/basic/NamedLocationResolver.java | 97 + .../brooklyn/location/basic/PortRanges.java | 257 ++ .../basic/RegistryLocationResolver.java | 42 + .../basic/SingleMachineLocationResolver.java | 77 + .../SingleMachineProvisioningLocation.java | 92 + .../location/basic/SshMachineLocation.java | 1031 +++++++ .../location/basic/SupportsPortForwarding.java | 39 + .../location/basic/WinRmMachineLocation.java | 360 +++ .../AbstractAvailabilityZoneExtension.java | 83 + ...bstractCloudMachineProvisioningLocation.java | 97 + .../cloud/AvailabilityZoneExtension.java | 54 + .../location/cloud/CloudLocationConfig.java | 116 + .../cloud/names/AbstractCloudMachineNamer.java | 151 + .../cloud/names/BasicCloudMachineNamer.java | 92 + .../location/cloud/names/CloudMachineNamer.java | 62 + .../cloud/names/CustomMachineNamer.java | 73 + .../location/dynamic/DynamicLocation.java | 51 + .../location/dynamic/LocationOwner.java | 86 + .../location/geo/GeoBytesHostGeoLookup.java | 105 + .../brooklyn/location/geo/HasHostGeoInfo.java | 25 + .../brooklyn/location/geo/HostGeoInfo.java | 206 ++ .../brooklyn/location/geo/HostGeoLookup.java | 27 + .../location/geo/LocalhostExternalIpLoader.java | 178 ++ .../location/geo/MaxMind2HostGeoLookup.java | 115 + .../location/geo/UtraceHostGeoLookup.java | 210 ++ .../brooklyn/location/paas/PaasLocation.java | 30 + .../services/brooklyn.location.LocationResolver | 9 - ...rg.apache.brooklyn.location.LocationResolver | 9 + .../brooklyn/location/basic/os-details.sh | 93 - .../geo/external-ip-address-resolvers.txt | 25 - .../brooklyn/location/basic/os-details.sh | 93 + .../geo/external-ip-address-resolvers.txt | 25 + ...stomAggregatingEnricherDeprecatedTest.groovy | 5 +- .../enricher/CustomAggregatingEnricherTest.java | 4 +- .../TransformingEnricherDeprecatedTest.groovy | 3 +- .../enricher/TransformingEnricherTest.java | 2 +- .../brooklyn/entity/EffectorMetadataTest.java | 2 +- .../java/brooklyn/entity/SetFromFlagTest.java | 4 +- .../basic/AbstractApplicationLegacyTest.java | 4 +- .../entity/basic/AbstractEntityLegacyTest.java | 3 +- .../entity/basic/BasicStartableTest.java | 8 +- .../brooklyn/entity/basic/DataEntityTest.java | 4 +- .../brooklyn/entity/basic/EntitiesTest.java | 4 +- .../basic/EntityConfigMapUsageLegacyTest.java | 2 +- .../entity/basic/EntityConfigMapUsageTest.java | 2 +- .../entity/basic/EntityFunctionsTest.java | 2 +- .../entity/basic/EntityLocationsTest.java | 2 +- .../entity/basic/EntityPredicatesTest.java | 2 +- .../brooklyn/entity/basic/EntitySpecTest.java | 2 +- .../entity/basic/EntitySubscriptionTest.java | 2 +- .../entity/basic/EntitySuppliersTest.java | 6 +- ...apListAndOtherStructuredConfigKeyTest.groovy | 2 +- .../entity/basic/ServiceStateLogicTest.java | 2 +- .../drivers/BasicEntityDriverManagerTest.java | 4 +- .../drivers/EntityDriverRegistryTest.java | 2 +- .../ReflectiveEntityDriverFactoryTest.java | 6 +- .../RegistryEntityDriverFactoryTest.java | 6 +- .../downloads/BasicDownloadsRegistryTest.java | 4 +- .../DownloadProducerFromLocalRepoTest.java | 4 +- .../DownloadProducerFromPropertiesTest.java | 4 +- .../downloads/DownloadSubstitutersTest.java | 4 +- .../drivers/downloads/MyEntityDriver.java | 2 +- .../entity/effector/EffectorBasicTest.java | 2 +- .../entity/group/DynamicClusterTest.java | 4 +- ...DynamicClusterWithAvailabilityZonesTest.java | 12 +- .../entity/group/DynamicFabricTest.java | 6 +- .../entity/group/DynamicMultiGroupTest.java | 3 +- .../entity/group/DynamicRegionsFabricTest.java | 4 +- .../java/brooklyn/entity/group/GroupTest.java | 4 +- .../group/MembershipTrackingPolicyTest.java | 4 +- .../entity/group/QuarantineGroupTest.java | 4 +- .../BalancingNodePlacementStrategyTest.java | 6 +- .../ProportionalZoneFailureDetectorTest.java | 4 +- .../entity/hello/LocalEntitiesTest.java | 2 +- .../entity/rebind/RebindCatalogItemTest.java | 2 +- .../entity/rebind/RebindEnricherTest.java | 4 +- .../entity/rebind/RebindEntityTest.java | 6 +- .../brooklyn/entity/rebind/RebindFeedTest.java | 6 +- .../rebind/RebindLocalhostLocationTest.java | 6 +- .../entity/rebind/RebindLocationTest.java | 7 +- .../entity/rebind/RebindPolicyTest.java | 4 +- .../rebind/RebindSshMachineLocationTest.java | 6 +- .../brooklyn/entity/rebind/RebindTestUtils.java | 2 +- .../rebind/RecordingRebindExceptionHandler.java | 2 +- .../BrooklynMementoPersisterTestFixture.java | 6 +- .../persister/XmlMementoSerializerTest.java | 8 +- .../entity/trait/FailingEntityImpl.java | 2 +- .../entity/trait/StartableMethodsTest.java | 2 +- .../event/feed/function/FunctionFeedTest.java | 4 +- .../feed/http/HttpFeedIntegrationTest.java | 6 +- .../brooklyn/event/feed/http/HttpFeedTest.java | 2 +- .../feed/shell/ShellFeedIntegrationTest.java | 2 +- .../event/feed/ssh/SshFeedIntegrationTest.java | 4 +- .../WindowsPerformanceCounterFeedLiveTest.java | 6 +- .../WindowsPerformanceCounterFeedTest.java | 4 +- .../PortForwardManagerLocationResolverTest.java | 83 - .../access/PortForwardManagerRebindTest.java | 195 -- .../location/access/PortForwardManagerTest.java | 194 -- .../location/basic/AbstractLocationTest.java | 184 -- ...regatingMachineProvisioningLocationTest.java | 116 - .../basic/ByonLocationResolverTest.java | 423 --- ...stMachineProvisioningLocationRebindTest.java | 129 - ...ixedListMachineProvisioningLocationTest.java | 576 ---- .../basic/HostLocationResolverTest.java | 126 - .../basic/LegacyAbstractLocationTest.java | 151 - .../basic/LocalhostLocationResolverTest.java | 265 -- ...ocalhostMachineProvisioningLocationTest.java | 213 -- .../LocalhostProvisioningAndAccessTest.java | 58 - .../location/basic/LocationConfigTest.java | 202 -- .../location/basic/LocationConfigUtilsTest.java | 156 - .../location/basic/LocationExtensionsTest.java | 186 -- .../location/basic/LocationManagementTest.java | 81 - .../location/basic/LocationPredicatesTest.java | 99 - ...ionPropertiesFromBrooklynPropertiesTest.java | 121 - .../location/basic/LocationRegistryTest.java | 159 - .../location/basic/MachineDetailsTest.java | 81 - .../location/basic/MultiLocationRebindTest.java | 120 - .../basic/MultiLocationResolverTest.java | 199 -- .../location/basic/MultiLocationTest.java | 119 - .../location/basic/PaasLocationTest.java | 35 - .../brooklyn/location/basic/PortRangesTest.java | 131 - .../RecordingMachineLocationCustomizer.java | 71 - .../location/basic/SimulatedLocation.java | 136 - .../SingleMachineLocationResolverTest.java | 131 - .../SingleMachineProvisioningLocationTest.java | 64 - .../SshMachineLocationIntegrationTest.java | 141 - .../SshMachineLocationPerformanceTest.java | 172 -- .../SshMachineLocationReuseIntegrationTest.java | 172 -- .../location/basic/SshMachineLocationTest.java | 340 --- .../basic/TestPortSupplierLocation.java | 90 - .../location/cloud/CloudMachineNamerTest.java | 161 - .../location/cloud/CustomMachineNamerTest.java | 79 - .../brooklyn/location/geo/HostGeoInfoTest.java | 52 - .../geo/HostGeoLookupIntegrationTest.java | 84 - ...ocalhostExternalIpLoaderIntegrationTest.java | 53 - .../AcmeEntitlementManagerTestFixture.java | 5 +- .../entitlement/EntityEntitlementTest.java | 2 +- .../ha/HighAvailabilityManagerInMemoryTest.java | 8 +- .../HighAvailabilityManagerSplitBrainTest.java | 2 +- .../brooklyn/management/ha/HotStandbyTest.java | 6 +- .../brooklyn/management/ha/WarmStandbyTest.java | 2 +- .../management/internal/AccessManagerTest.java | 6 +- .../internal/LocalManagementContextTest.java | 2 +- .../policy/basic/PolicySubscriptionTest.java | 2 +- .../longevity/EntityCleanupLongevityTest.java | 4 +- .../EntityCleanupLongevityTestFixture.java | 4 +- .../qa/longevity/EntityCleanupTest.java | 4 +- .../qa/performance/AbstractPerformanceTest.java | 2 +- .../EntityPersistencePerformanceTest.java | 4 +- .../test/java/brooklyn/test/HttpService.java | 4 +- .../test/location/TestPaasLocation.java | 6 +- .../brooklyn/util/file/ArchiveUtilsTest.java | 2 +- .../util/http/HttpToolIntegrationTest.java | 2 +- .../util/ssh/BashCommandsIntegrationTest.java | 4 +- .../brooklyn/util/task/ssh/SshTasksTest.java | 6 +- .../PortForwardManagerLocationResolverTest.java | 83 + .../access/PortForwardManagerRebindTest.java | 195 ++ .../location/access/PortForwardManagerTest.java | 193 ++ .../location/basic/AbstractLocationTest.java | 184 ++ ...regatingMachineProvisioningLocationTest.java | 116 + .../basic/ByonLocationResolverTest.java | 423 +++ ...stMachineProvisioningLocationRebindTest.java | 129 + ...ixedListMachineProvisioningLocationTest.java | 575 ++++ .../basic/HostLocationResolverTest.java | 126 + .../basic/LegacyAbstractLocationTest.java | 151 + .../basic/LocalhostLocationResolverTest.java | 265 ++ ...ocalhostMachineProvisioningLocationTest.java | 213 ++ .../LocalhostProvisioningAndAccessTest.java | 58 + .../location/basic/LocationConfigTest.java | 203 ++ .../location/basic/LocationConfigUtilsTest.java | 155 + .../location/basic/LocationExtensionsTest.java | 186 ++ .../location/basic/LocationManagementTest.java | 81 + .../location/basic/LocationPredicatesTest.java | 99 + ...ionPropertiesFromBrooklynPropertiesTest.java | 121 + .../location/basic/LocationRegistryTest.java | 159 + .../location/basic/MachineDetailsTest.java | 81 + .../location/basic/MultiLocationRebindTest.java | 120 + .../basic/MultiLocationResolverTest.java | 199 ++ .../location/basic/MultiLocationTest.java | 119 + .../location/basic/PaasLocationTest.java | 35 + .../brooklyn/location/basic/PortRangesTest.java | 130 + .../RecordingMachineLocationCustomizer.java | 71 + .../location/basic/SimulatedLocation.java | 136 + .../SingleMachineLocationResolverTest.java | 131 + .../SingleMachineProvisioningLocationTest.java | 64 + .../SshMachineLocationIntegrationTest.java | 141 + .../SshMachineLocationPerformanceTest.java | 172 ++ .../SshMachineLocationReuseIntegrationTest.java | 172 ++ .../location/basic/SshMachineLocationTest.java | 340 +++ .../basic/TestPortSupplierLocation.java | 90 + .../location/cloud/CloudMachineNamerTest.java | 161 + .../location/cloud/CustomMachineNamerTest.java | 79 + .../brooklyn/location/geo/HostGeoInfoTest.java | 52 + .../geo/HostGeoLookupIntegrationTest.java | 84 + ...ocalhostExternalIpLoaderIntegrationTest.java | 53 + .../test/entity/BlockingEntityImpl.java | 2 +- .../brooklyn/test/entity/TestApplication.java | 4 +- .../test/entity/TestApplicationImpl.java | 6 +- .../brooklyn/test/entity/TestEntityImpl.java | 2 +- .../brooklyn/location/basic/sample_id_rsa | 27 - .../brooklyn/location/basic/sample_id_rsa.pub | 1 - .../brooklyn/location/basic/sample_id_rsa | 27 + .../brooklyn/location/basic/sample_id_rsa.pub | 1 + .../big_examples/global-web-fabric/index.md | 4 +- docs/guide/ops/locations/index.md | 4 +- .../brooklyn.location.AddressableLocation.html | 6 +- .../brooklyn.location.MachineLocation.html | 6 +- ...tMixins$RichMachineProvisioningLocation.html | 6 +- ...yn.location.MachineProvisioningLocation.html | 6 +- ...rooklyn.location.basic.AbstractLocation.html | 6 +- ....AggregatingMachineProvisioningLocation.html | 6 +- ...ic.FixedListMachineProvisioningLocation.html | 6 +- ...neProvisioningLocation$LocalhostMachine.html | 6 +- ...ic.LocalhostMachineProvisioningLocation.html | 6 +- ...rooklyn.location.basic.LocationInternal.html | 6 +- .../brooklyn.location.basic.MultiLocation.html | 6 +- ...ooklyn.location.basic.SimulatedLocation.html | 6 +- ...basic.SingleMachineProvisioningLocation.html | 6 +- ...oklyn.location.basic.SshMachineLocation.html | 6 +- ...bstractCloudMachineProvisioningLocation.html | 6 +- ...AbstractJcloudsSubnetSshMachineLocation.html | 6 +- ...ooklyn.location.jclouds.JcloudsLocation.html | 6 +- ...ation.jclouds.JcloudsSshMachineLocation.html | 6 +- .../brooklyn/demo/GlobalWebFabricExample.java | 2 +- .../brooklyn/demo/CumulusRDFApplication.java | 4 +- .../brooklyn/demo/SingleWebServerExample.java | 2 +- .../demo/WebClusterDatabaseExample.java | 2 +- .../demo/WebClusterDatabaseExampleApp.java | 2 +- ...lusterDatabaseExampleAppIntegrationTest.java | 3 +- .../JcloudsBlobStoreBasedObjectStore.java | 8 +- ...AbstractJcloudsSubnetSshMachineLocation.java | 38 - .../jclouds/BasicJcloudsLocationCustomizer.java | 99 - .../location/jclouds/BrooklynImageChooser.java | 367 --- .../location/jclouds/BrooklynMachinePool.java | 220 -- .../jclouds/ComputeServiceRegistry.java | 28 - .../jclouds/ComputeServiceRegistryImpl.java | 182 -- .../jclouds/JcloudsByonLocationResolver.java | 183 -- .../location/jclouds/JcloudsLocation.java | 2863 ------------------ .../location/jclouds/JcloudsLocationConfig.java | 280 -- .../jclouds/JcloudsLocationCustomizer.java | 105 - .../jclouds/JcloudsLocationResolver.java | 227 -- .../jclouds/JcloudsMachineLocation.java | 45 - .../location/jclouds/JcloudsMachineNamer.java | 44 - .../location/jclouds/JcloudsPredicates.java | 53 - ...JcloudsPropertiesFromBrooklynProperties.java | 159 - .../jclouds/JcloudsSshMachineLocation.java | 340 --- .../brooklyn/location/jclouds/JcloudsUtil.java | 448 --- .../jclouds/JcloudsWinRmMachineLocation.java | 154 - .../jclouds/SudoTtyFixingCustomizer.java | 58 - .../JcloudsLocationSecurityGroupCustomizer.java | 561 ---- .../JcloudsPortForwarderExtension.java | 45 - .../networking/SecurityGroupDefinition.java | 103 - .../jclouds/networking/SecurityGroupTool.java | 167 - .../location/jclouds/pool/MachinePool.java | 395 --- .../jclouds/pool/MachinePoolPredicates.java | 149 - .../location/jclouds/pool/MachineSet.java | 98 - .../jclouds/pool/ReusableMachineTemplate.java | 183 -- .../AbstractPortableTemplateBuilder.java | 527 ---- .../templates/PortableTemplateBuilder.java | 145 - .../zone/AwsAvailabilityZoneExtension.java | 74 - .../policy/os/AdvertiseWinrmLoginPolicy.java | 4 +- .../brooklyn/policy/os/CreateUserPolicy.java | 4 +- ...AbstractJcloudsSubnetSshMachineLocation.java | 38 + .../jclouds/BasicJcloudsLocationCustomizer.java | 99 + .../location/jclouds/BrooklynImageChooser.java | 367 +++ .../location/jclouds/BrooklynMachinePool.java | 219 ++ .../jclouds/ComputeServiceRegistry.java | 28 + .../jclouds/ComputeServiceRegistryImpl.java | 183 ++ .../jclouds/JcloudsByonLocationResolver.java | 184 ++ .../location/jclouds/JcloudsLocation.java | 2861 +++++++++++++++++ .../location/jclouds/JcloudsLocationConfig.java | 280 ++ .../jclouds/JcloudsLocationCustomizer.java | 105 + .../jclouds/JcloudsLocationResolver.java | 227 ++ .../jclouds/JcloudsMachineLocation.java | 45 + .../location/jclouds/JcloudsMachineNamer.java | 44 + .../location/jclouds/JcloudsPredicates.java | 53 + ...JcloudsPropertiesFromBrooklynProperties.java | 159 + .../jclouds/JcloudsSshMachineLocation.java | 338 +++ .../brooklyn/location/jclouds/JcloudsUtil.java | 448 +++ .../jclouds/JcloudsWinRmMachineLocation.java | 154 + .../jclouds/SudoTtyFixingCustomizer.java | 58 + .../JcloudsLocationSecurityGroupCustomizer.java | 563 ++++ .../JcloudsPortForwarderExtension.java | 45 + .../networking/SecurityGroupDefinition.java | 103 + .../jclouds/networking/SecurityGroupTool.java | 167 + .../location/jclouds/pool/MachinePool.java | 395 +++ .../jclouds/pool/MachinePoolPredicates.java | 149 + .../location/jclouds/pool/MachineSet.java | 98 + .../jclouds/pool/ReusableMachineTemplate.java | 182 ++ .../AbstractPortableTemplateBuilder.java | 527 ++++ .../templates/PortableTemplateBuilder.java | 145 + .../zone/AwsAvailabilityZoneExtension.java | 74 + .../services/brooklyn.location.LocationResolver | 2 - ...rg.apache.brooklyn.location.LocationResolver | 2 + .../persister/jclouds/BlobStoreCleaner.java | 6 +- .../persister/jclouds/BlobStoreExpiryTest.java | 8 +- .../rebind/persister/jclouds/BlobStoreTest.java | 8 +- .../jclouds/JcloudsExpect100ContinueTest.java | 4 +- .../jclouds/AbstractJcloudsLiveTest.java | 158 - .../jclouds/AbstractJcloudsStubbedLiveTest.java | 133 - .../jclouds/BailOutJcloudsLocation.java | 188 -- .../jclouds/BrooklynMachinePoolLiveTest.java | 103 - .../jclouds/DelegatingComputeService.java | 229 -- .../jclouds/JcloudsAddressesLiveTest.java | 228 -- .../JcloudsByonLocationResolverAwsLiveTest.java | 178 -- ...dsByonLocationResolverSoftlayerLiveTest.java | 105 - .../JcloudsByonLocationResolverTest.java | 81 - .../JcloudsHardwareProfilesStubbedLiveTest.java | 78 - .../jclouds/JcloudsLocationMetadataTest.java | 72 - .../JcloudsLocationRebindMachineLiveTest.java | 139 - .../jclouds/JcloudsLocationResolverTest.java | 357 --- ...ationTemplateOptionsCustomisersLiveTest.java | 119 - .../location/jclouds/JcloudsLocationTest.java | 510 ---- .../location/jclouds/JcloudsLoginLiveTest.java | 408 --- .../jclouds/JcloudsMachineNamerTest.java | 52 - ...udsPropertiesFromBrooklynPropertiesTest.java | 99 - .../location/jclouds/JcloudsSshingLiveTest.java | 61 - .../location/jclouds/LiveTestEntity.java | 90 - .../jclouds/RebindJcloudsLocationLiveTest.java | 150 - .../jclouds/RebindJcloudsLocationTest.java | 66 - ...loudsLocationUserLoginAndConfigLiveTest.java | 249 -- ...hineProvisioningLocationJcloudsLiveTest.java | 124 - .../jclouds/StandaloneJcloudsLiveTest.java | 254 -- ...oudsLocationSecurityGroupCustomizerTest.java | 311 -- .../JcloudsPortForwardingStubbedLiveTest.java | 197 -- .../networking/SecurityGroupLiveTest.java | 32 - .../pool/JcloudsMachinePoolLiveTest.java | 120 - .../provider/AbstractJcloudsLocationTest.java | 170 -- .../provider/AwsEc2LocationLiveTest.java | 66 - .../AwsEc2LocationWindowsLiveTest.groovy | 95 - .../provider/CarrenzaLocationLiveTest.groovy | 133 - .../provider/GoGridLocationLiveTest.groovy | 54 - .../provider/RackspaceLocationLiveTest.java | 83 - .../zone/AwsAvailabilityZoneExtensionTest.java | 121 - .../os/AdvertiseWinrmLoginPolicyTest.java | 4 +- .../policy/os/CreateUserPolicyLiveTest.java | 11 +- .../policy/os/CreateUserPolicyTest.java | 5 +- .../jclouds/AbstractJcloudsLiveTest.java | 158 + .../jclouds/AbstractJcloudsStubbedLiveTest.java | 125 + .../jclouds/BailOutJcloudsLocation.java | 188 ++ .../jclouds/BrooklynMachinePoolLiveTest.java | 103 + .../jclouds/DelegatingComputeService.java | 229 ++ .../jclouds/JcloudsAddressesLiveTest.java | 228 ++ .../JcloudsByonLocationResolverAwsLiveTest.java | 178 ++ ...dsByonLocationResolverSoftlayerLiveTest.java | 105 + .../JcloudsByonLocationResolverTest.java | 81 + .../JcloudsHardwareProfilesStubbedLiveTest.java | 78 + .../jclouds/JcloudsLocationMetadataTest.java | 72 + .../JcloudsLocationRebindMachineLiveTest.java | 138 + .../jclouds/JcloudsLocationResolverTest.java | 357 +++ ...ationTemplateOptionsCustomisersLiveTest.java | 107 + .../location/jclouds/JcloudsLocationTest.java | 510 ++++ .../location/jclouds/JcloudsLoginLiveTest.java | 407 +++ .../jclouds/JcloudsMachineNamerTest.java | 52 + ...udsPropertiesFromBrooklynPropertiesTest.java | 99 + .../location/jclouds/JcloudsSshingLiveTest.java | 61 + .../location/jclouds/LiveTestEntity.java | 90 + .../jclouds/RebindJcloudsLocationLiveTest.java | 150 + .../jclouds/RebindJcloudsLocationTest.java | 66 + ...loudsLocationUserLoginAndConfigLiveTest.java | 249 ++ ...hineProvisioningLocationJcloudsLiveTest.java | 124 + .../jclouds/StandaloneJcloudsLiveTest.java | 254 ++ ...oudsLocationSecurityGroupCustomizerTest.java | 311 ++ .../JcloudsPortForwardingStubbedLiveTest.java | 196 ++ .../networking/SecurityGroupLiveTest.java | 32 + .../pool/JcloudsMachinePoolLiveTest.java | 120 + .../provider/AbstractJcloudsLocationTest.java | 170 ++ .../provider/AwsEc2LocationLiveTest.java | 66 + .../AwsEc2LocationWindowsLiveTest.groovy | 95 + .../provider/CarrenzaLocationLiveTest.groovy | 133 + .../provider/GoGridLocationLiveTest.groovy | 52 + .../provider/RackspaceLocationLiveTest.java | 83 + .../zone/AwsAvailabilityZoneExtensionTest.java | 121 + ...location-test-various-login-credentials.yaml | 67 - ...location-test-various-login-credentials.yaml | 67 + parent/pom.xml | 2 +- .../followthesun/DefaultFollowTheSunModel.java | 4 +- .../policy/followthesun/FollowTheSunModel.java | 2 +- .../followthesun/FollowTheSunParameters.java | 2 +- .../policy/followthesun/FollowTheSunPolicy.java | 4 +- .../followthesun/FollowTheSunStrategy.java | 2 +- .../policy/ha/SshMachineFailureDetector.java | 4 +- .../loadbalancing/BalanceablePoolModel.java | 2 +- .../policy/loadbalancing/BalancingStrategy.java | 2 +- .../DefaultBalanceablePoolModel.java | 2 +- .../loadbalancing/LocationConstraint.java | 2 +- .../enricher/HttpLatencyDetectorTest.java | 3 +- .../entity/brooklyn/BrooklynMetricsTest.java | 3 +- .../autoscaling/AutoScalerPolicyRebindTest.java | 4 +- .../AbstractFollowTheSunPolicyTest.java | 6 +- .../followthesun/FollowTheSunModelTest.java | 5 +- .../FollowTheSunPolicySoakTest.java | 4 +- .../followthesun/FollowTheSunPolicyTest.java | 4 +- .../brooklyn/policy/ha/HaPolicyRebindTest.java | 6 +- .../brooklyn/policy/ha/ServiceReplacerTest.java | 6 +- .../AbstractLoadBalancingPolicyTest.java | 3 +- .../BalanceableWorkerPoolTest.java | 2 +- .../ItemsInContainersGroupTest.java | 2 +- .../loadbalancing/MockContainerEntityImpl.java | 2 +- .../basic/AbstractSoftwareProcessDriver.java | 2 +- .../basic/AbstractSoftwareProcessSshDriver.java | 2 +- .../AbstractSoftwareProcessWinRmDriver.java | 2 +- .../basic/EmptySoftwareProcessSshDriver.java | 2 +- .../SameServerDriverLifecycleEffectorTasks.java | 8 +- .../brooklyn/entity/basic/SameServerEntity.java | 2 +- .../entity/basic/SameServerEntityImpl.java | 2 +- .../brooklyn/entity/basic/SoftwareProcess.java | 2 +- ...wareProcessDriverLifecycleEffectorTasks.java | 4 +- .../entity/basic/SoftwareProcessImpl.java | 14 +- .../basic/VanillaSoftwareProcessSshDriver.java | 2 +- .../basic/VanillaWindowsProcessWinRmDriver.java | 2 +- .../entity/basic/lifecycle/ScriptHelper.java | 2 +- .../entity/brooklynnode/BrooklynNodeImpl.java | 4 +- .../brooklynnode/BrooklynNodeSshDriver.java | 2 +- .../entity/chef/ChefLifecycleEffectorTasks.java | 4 +- .../brooklyn/entity/chef/ChefServerTasks.java | 2 +- .../brooklyn/entity/chef/ChefSoloDriver.java | 2 +- .../entity/chef/KnifeConvergeTaskFactory.java | 2 +- .../java/JavaSoftwareProcessSshDriver.java | 2 +- .../java/brooklyn/entity/java/JmxSupport.java | 6 +- .../main/java/brooklyn/entity/java/UsesJmx.java | 4 +- .../entity/java/VanillaJavaAppSshDriver.java | 2 +- .../entity/machine/MachineEntityImpl.java | 5 +- .../java/brooklyn/entity/pool/ServerPool.java | 9 +- .../brooklyn/entity/pool/ServerPoolImpl.java | 14 +- .../entity/pool/ServerPoolLocation.java | 10 +- .../entity/pool/ServerPoolLocationResolver.java | 16 +- .../entity/service/InitdServiceInstaller.java | 4 +- .../entity/service/SystemServiceEnricher.java | 2 +- .../entity/software/MachineInitTasks.java | 2 +- .../software/MachineLifecycleEffectorTasks.java | 25 +- .../software/ProvidesProvisioningFlags.java | 2 +- .../entity/software/SshEffectorTasks.java | 6 +- .../services/brooklyn.location.LocationResolver | 1 - ...rg.apache.brooklyn.location.LocationResolver | 1 + .../brooklyn/entity/AbstractEc2LiveTest.java | 6 +- .../entity/AbstractGoogleComputeLiveTest.java | 2 +- .../entity/AbstractSoftlayerLiveTest.java | 2 +- ...ctSoftwareProcessRestartIntegrationTest.java | 2 +- .../basic/DoNothingSoftwareProcessDriver.java | 2 +- .../entity/basic/SameServerEntityTest.java | 6 +- .../basic/SoftwareProcessEntityLatchTest.java | 6 +- .../basic/SoftwareProcessEntityRebindTest.java | 10 +- .../entity/basic/SoftwareProcessEntityTest.java | 14 +- ...SoftwareProcessSshDriverIntegrationTest.java | 8 +- .../basic/SoftwareProcessSubclassTest.java | 2 +- ...ftwareProcessAndChildrenIntegrationTest.java | 2 +- .../entity/basic/lifecycle/MyEntityImpl.java | 2 +- .../basic/lifecycle/NaiveScriptRunnerTest.java | 4 +- .../basic/lifecycle/ScriptHelperTest.java | 6 +- .../basic/lifecycle/StartStopSshDriverTest.java | 2 +- .../BrooklynClusterIntegrationTest.java | 2 +- .../BrooklynNodeIntegrationTest.java | 10 +- .../entity/brooklynnode/BrooklynNodeTest.java | 4 +- .../entity/brooklynnode/MockBrooklynNode.java | 2 +- .../brooklynnode/SameBrooklynNodeImpl.java | 2 +- .../entity/chef/ChefLiveTestSupport.java | 7 +- .../AbstractChefToyMySqlEntityLiveTest.java | 4 +- .../brooklyn/entity/driver/MockSshDriver.java | 4 +- ...rWithAvailabilityZonesMultiLocationTest.java | 12 +- .../brooklyn/entity/java/EntityPollingTest.java | 4 +- .../java/brooklyn/entity/java/JavaOptsTest.java | 6 +- ...SoftwareProcessSshDriverIntegrationTest.java | 6 +- .../entity/java/VanillaJavaAppRebindTest.java | 2 +- .../entity/java/VanillaJavaAppTest.java | 4 +- .../machine/MachineEntityEc2LiveTest.java | 2 +- .../entity/pool/AbstractServerPoolTest.java | 8 +- .../entity/pool/ServerPoolLiveTest.java | 2 +- .../pool/ServerPoolLocationResolverTest.java | 8 +- .../brooklyn/entity/pool/ServerPoolTest.java | 4 +- .../service/SystemServiceEnricherTest.java | 4 +- .../entity/software/AbstractDockerLiveTest.java | 2 +- .../MachineLifecycleEffectorTasksTest.java | 2 +- .../entity/software/SoftwareEffectorTest.java | 6 +- .../entity/software/SshEffectorTasksTest.java | 7 +- .../software/http/HttpRequestSensorTest.java | 2 +- .../mysql/AbstractToyMySqlEntityTest.java | 8 +- .../mysql/DynamicToyMySqlEntityBuilder.java | 10 +- .../mysql/DynamicToyMySqlEntityTest.java | 2 +- .../software/ssh/SshCommandIntegrationTest.java | 4 +- .../PortAttributeSensorAndConfigKeyTest.java | 6 +- .../brooklyn/event/feed/jmx/JmxFeedTest.java | 7 +- .../event/feed/jmx/RebindJmxFeedTest.java | 6 +- .../basic/MachineDetailsEc2LiveTest.java | 68 - .../MachineDetailsGoogleComputeLiveTest.java | 66 - .../basic/WinRmMachineLocationLiveTest.java | 93 - .../basic/WinRmMachineLocationTest.java | 44 - .../usage/ApplicationUsageTrackingTest.java | 2 +- .../usage/LocationUsageTrackingTest.java | 10 +- .../management/usage/UsageListenerTest.java | 2 +- .../basic/MachineDetailsEc2LiveTest.java | 68 + .../MachineDetailsGoogleComputeLiveTest.java | 65 + .../basic/WinRmMachineLocationLiveTest.java | 93 + .../basic/WinRmMachineLocationTest.java | 44 + .../entity/database/crate/CrateNode.java | 2 +- .../database/crate/CrateNodeSshDriver.java | 2 +- .../entity/database/mariadb/MariaDbNode.java | 2 +- .../database/mariadb/MariaDbNodeImpl.java | 4 +- .../database/mariadb/MariaDbSshDriver.java | 4 +- .../entity/database/mysql/MySqlClusterImpl.java | 2 +- .../entity/database/mysql/MySqlNode.java | 2 +- .../entity/database/mysql/MySqlNodeImpl.java | 4 +- .../entity/database/mysql/MySqlSshDriver.java | 6 +- .../database/postgresql/PostgreSqlNode.java | 2 +- .../PostgreSqlNodeChefImplFromScratch.java | 4 +- .../postgresql/PostgreSqlSshDriver.java | 4 +- .../database/rubyrep/RubyRepSshDriver.java | 2 +- .../crate/CrateNodeIntegrationTest.java | 2 +- .../mariadb/MariaDbIntegrationTest.java | 2 +- .../database/mariadb/MariaDbLiveEc2Test.java | 4 +- .../mariadb/MariaDbLiveRackspaceTest.java | 4 +- .../database/mysql/MySqlClusterLiveEc2Test.java | 2 +- .../mysql/MySqlClusterLiveSoftlayerTest.java | 2 +- .../database/mysql/MySqlClusterTestHelper.java | 2 +- .../database/mysql/MySqlIntegrationTest.java | 2 +- .../entity/database/mysql/MySqlLiveEc2Test.java | 2 +- .../entity/database/mysql/MySqlLiveGceTest.java | 2 +- .../database/mysql/MySqlLiveRackspaceTest.java | 4 +- .../database/mysql/MysqlDockerLiveTest.java | 4 +- .../postgresql/PostgreSqDockerLiveTest.java | 2 +- .../database/postgresql/PostgreSqlChefTest.java | 6 +- .../postgresql/PostgreSqlEc2LiveTest.java | 2 +- .../postgresql/PostgreSqlGceLiveTest.java | 2 +- .../postgresql/PostgreSqlIntegrationTest.java | 2 +- .../postgresql/PostgreSqlRackspaceLiveTest.java | 6 +- .../PostgreSqlRebindIntegrationTest.java | 2 +- .../database/rubyrep/RubyRepEc2LiveTest.java | 4 +- .../rubyrep/RubyRepIntegrationTest.java | 6 +- .../rubyrep/RubyRepRackspaceLiveTest.java | 6 +- .../messaging/activemq/ActiveMQSshDriver.java | 2 +- .../kafka/AbstractfKafkaSshDriver.java | 2 +- .../entity/messaging/kafka/KafkaBroker.java | 2 +- .../messaging/kafka/KafkaBrokerSshDriver.java | 2 +- .../messaging/kafka/KafkaClusterImpl.java | 2 +- .../kafka/KafkaZooKeeperSshDriver.java | 2 +- .../entity/messaging/qpid/QpidSshDriver.java | 2 +- .../messaging/rabbit/RabbitDestination.java | 2 +- .../messaging/rabbit/RabbitSshDriver.java | 2 +- .../entity/messaging/storm/StormSshDriver.java | 4 +- .../entity/zookeeper/ZooKeeperEnsembleImpl.java | 3 +- .../entity/zookeeper/ZooKeeperSshDriver.java | 2 +- .../messaging/activemq/ActiveMQEc2LiveTest.java | 2 +- .../activemq/ActiveMQGoogleComputeLiveTest.java | 2 +- .../activemq/ActiveMQIntegrationTest.java | 2 +- .../messaging/kafka/KafkaIntegrationTest.java | 6 +- .../entity/messaging/kafka/KafkaLiveTest.java | 2 +- .../entity/messaging/qpid/QpidEc2LiveTest.java | 2 +- .../messaging/qpid/QpidIntegrationTest.java | 2 +- .../messaging/rabbit/RabbitEc2LiveTest.java | 2 +- .../messaging/rabbit/RabbitIntegrationTest.java | 4 +- .../storm/StormAbstractCloudLiveTest.java | 2 +- .../messaging/storm/StormEc2LiveTest.java | 2 +- .../zookeeper/ZooKeeperEc2LiveTest.java | 2 +- .../zookeeper/ZooKeeperEnsembleLiveTest.java | 2 +- .../entity/monitoring/monit/MonitNodeImpl.java | 4 +- .../entity/monitoring/monit/MonitSshDriver.java | 4 +- .../monitoring/monit/MonitIntegrationTest.java | 4 +- .../entity/network/bind/BindDnsServer.java | 2 +- .../entity/network/bind/BindDnsServerImpl.java | 4 +- .../network/bind/BindDnsServerSshDriver.java | 2 +- .../network/bind/BindDnsServerByonLiveTest.java | 2 +- .../network/bind/BindDnsServerEc2LiveTest.java | 2 +- .../network/bind/BindDnsServerLiveTest.java | 2 +- .../bind/BindDnsServerSoftlayerLiveTest.java | 2 +- .../bind/DoNothingSoftwareProcessDriver.java | 2 +- .../network/bind/TestBindDnsServerImpl.java | 2 +- .../cassandra/CassandraDatacenterImpl.java | 4 +- .../entity/nosql/cassandra/CassandraFabric.java | 2 +- .../nosql/cassandra/CassandraFabricImpl.java | 2 +- .../entity/nosql/cassandra/CassandraNode.java | 2 +- .../nosql/cassandra/CassandraNodeImpl.java | 8 +- .../nosql/cassandra/CassandraNodeSshDriver.java | 8 +- .../nosql/couchbase/CouchbaseClusterImpl.java | 2 +- .../nosql/couchbase/CouchbaseNodeImpl.java | 6 +- .../nosql/couchbase/CouchbaseNodeSshDriver.java | 6 +- .../couchbase/CouchbaseSyncGatewayImpl.java | 2 +- .../CouchbaseSyncGatewaySshDriver.java | 4 +- .../nosql/couchdb/CouchDBNodeSshDriver.java | 4 +- .../nosql/elasticsearch/ElasticSearchNode.java | 2 +- .../elasticsearch/ElasticSearchNodeImpl.java | 2 +- .../ElasticSearchNodeSshDriver.java | 2 +- .../nosql/mongodb/AbstractMongoDBSshDriver.java | 4 +- .../nosql/mongodb/MongoDBClientSshDriver.java | 2 +- .../nosql/mongodb/MongoDBClientSupport.java | 3 +- .../nosql/mongodb/MongoDBReplicaSetImpl.java | 2 +- .../entity/nosql/mongodb/MongoDBServerImpl.java | 2 +- .../entity/nosql/mongodb/MongoDBSshDriver.java | 2 +- .../entity/nosql/mongodb/ReplicaSetConfig.java | 2 +- .../sharding/CoLocatedMongoDBRouterImpl.java | 2 +- .../MongoDBConfigServerClusterImpl.java | 4 +- .../sharding/MongoDBConfigServerSshDriver.java | 2 +- .../sharding/MongoDBRouterClusterImpl.java | 2 +- .../sharding/MongoDBRouterSshDriver.java | 2 +- .../sharding/MongoDBShardClusterImpl.java | 3 +- .../sharding/MongoDBShardedDeploymentImpl.java | 2 +- .../entity/nosql/redis/RedisClusterImpl.java | 2 +- .../entity/nosql/redis/RedisStoreImpl.java | 6 +- .../entity/nosql/redis/RedisStoreSshDriver.java | 4 +- .../entity/nosql/riak/RiakNodeImpl.java | 6 +- .../entity/nosql/riak/RiakNodeSshDriver.java | 4 +- .../brooklyn/entity/nosql/solr/SolrServer.java | 2 +- .../entity/nosql/solr/SolrServerImpl.java | 2 +- .../entity/nosql/solr/SolrServerSshDriver.java | 5 +- .../cassandra/AbstractCassandraNodeTest.java | 3 +- .../CassandraDatacenterIntegrationTest.java | 4 +- .../cassandra/CassandraDatacenterLiveTest.java | 4 +- ...assandraDatacenterRebindIntegrationTest.java | 4 +- .../cassandra/CassandraDatacenterTest.java | 6 +- .../nosql/cassandra/CassandraFabricTest.java | 8 +- .../cassandra/CassandraNodeEc2LiveTest.java | 3 +- .../nosql/couchbase/CouchbaseOfflineTest.java | 5 +- .../CouchbaseSyncGatewayEc2LiveTest.java | 5 +- .../nosql/couchdb/AbstractCouchDBNodeTest.java | 5 +- .../nosql/couchdb/CouchDBClusterLiveTest.java | 4 +- .../nosql/couchdb/CouchDBNodeEc2LiveTest.java | 3 +- .../ElasticSearchClusterIntegrationTest.java | 4 +- .../ElasticSearchNodeIntegrationTest.java | 5 +- .../nosql/mongodb/MongoDBEc2LiveTest.java | 3 +- .../nosql/mongodb/MongoDBIntegrationTest.java | 3 +- .../mongodb/MongoDBRebindIntegrationTest.java | 3 +- .../mongodb/MongoDBReplicaSetEc2LiveTest.java | 4 +- .../MongoDBReplicaSetIntegrationTest.java | 4 +- .../nosql/mongodb/MongoDBSoftLayerLiveTest.java | 3 +- .../entity/nosql/mongodb/MongoDBTestHelper.java | 4 +- .../MongoDBConfigServerIntegrationTest.java | 3 +- .../MongoDBShardedDeploymentEc2LiveTest.java | 5 +- ...MongoDBShardedDeploymentIntegrationTest.java | 8 +- .../redis/RedisClusterIntegrationTest.java | 7 +- .../entity/nosql/redis/RedisEc2LiveTest.java | 3 +- .../nosql/redis/RedisIntegrationTest.java | 5 +- .../nosql/riak/RiakClusterEc2LiveTest.java | 4 +- .../entity/nosql/riak/RiakNodeEc2LiveTest.java | 3 +- .../riak/RiakNodeGoogleComputeLiveTest.java | 4 +- .../nosql/riak/RiakNodeIntegrationTest.java | 3 +- .../nosql/riak/RiakNodeSoftlayerLiveTest.java | 3 +- .../nosql/solr/AbstractSolrServerTest.java | 3 +- .../nosql/solr/SolrServerEc2LiveTest.java | 3 +- .../entity/osgi/karaf/KarafSshDriver.java | 2 +- .../osgi/karaf/KarafContainerEc2LiveTest.java | 2 +- .../entity/osgi/karaf/KarafContainerTest.java | 4 +- .../entity/dns/AbstractGeoDnsService.java | 2 +- .../entity/dns/AbstractGeoDnsServiceImpl.java | 2 +- .../geoscaling/GeoscalingDnsServiceImpl.java | 2 +- .../geoscaling/GeoscalingScriptGenerator.java | 2 +- .../entity/proxy/AbstractControllerImpl.java | 4 +- .../AbstractNonProvisionedControllerImpl.java | 2 +- .../entity/proxy/nginx/NginxSshDriver.java | 7 +- .../ControlledDynamicWebAppClusterImpl.java | 2 +- .../entity/webapp/ElasticJavaWebAppService.java | 4 +- .../entity/webapp/JavaWebAppSshDriver.java | 2 +- .../entity/webapp/WebAppServiceMethods.java | 2 +- .../entity/webapp/jboss/JBoss6SshDriver.java | 2 +- .../entity/webapp/jboss/JBoss7ServerImpl.java | 2 +- .../entity/webapp/jboss/JBoss7SshDriver.java | 2 +- .../entity/webapp/jetty/Jetty6SshDriver.java | 2 +- .../webapp/nodejs/NodeJsWebAppService.java | 4 +- .../webapp/nodejs/NodeJsWebAppServiceImpl.java | 2 +- .../webapp/nodejs/NodeJsWebAppSshDriver.java | 2 +- .../entity/webapp/tomcat/Tomcat7SshDriver.java | 2 +- .../entity/webapp/tomcat/TomcatServer.java | 2 +- .../entity/webapp/tomcat/TomcatSshDriver.java | 2 +- .../entity/dns/AbstractGeoDnsServiceTest.java | 22 +- .../geoscaling/GeoscalingIntegrationTest.java | 12 +- .../GeoscalingScriptGeneratorTest.java | 3 +- .../entity/proxy/AbstractControllerTest.java | 14 +- .../brooklyn/entity/proxy/StubAppServer.java | 8 +- .../brooklyn/entity/proxy/UrlMappingTest.java | 4 +- .../nginx/NginxClusterIntegrationTest.java | 6 +- .../entity/proxy/nginx/NginxEc2LiveTest.java | 3 +- .../nginx/NginxHttpsSslIntegrationTest.java | 5 +- .../proxy/nginx/NginxIntegrationTest.java | 3 +- .../proxy/nginx/NginxLightIntegrationTest.java | 4 +- .../proxy/nginx/NginxRebindIntegrationTest.java | 4 +- .../nginx/NginxRebindWithHaIntegrationTest.java | 7 +- .../nginx/NginxUrlMappingIntegrationTest.java | 4 +- .../proxy/nginx/NginxWebClusterEc2LiveTest.java | 6 +- .../AbstractWebAppFixtureIntegrationTest.java | 4 +- ...lledDynamicWebAppClusterIntegrationTest.java | 4 +- .../ControlledDynamicWebAppClusterTest.java | 4 +- .../entity/webapp/DynamicWebAppClusterTest.java | 4 +- .../entity/webapp/DynamicWebAppFabricTest.java | 5 +- .../webapp/ElasticCustomLocationTest.java | 3 +- ...ElasticJavaWebAppServiceIntegrationTest.java | 3 +- .../webapp/TomcatAutoScalerPolicyTest.java | 4 +- .../webapp/WebAppConcurrentDeployTest.java | 6 +- .../webapp/WebAppLiveIntegrationTest.groovy | 8 +- ...namicWebAppClusterRebindIntegrationTest.java | 3 +- ...namicWebAppClusterRebindIntegrationTest.java | 5 +- .../jboss/JBoss6ServerAwsEc2LiveTest.java | 5 +- ...Boss6ServerNonInheritingIntegrationTest.java | 5 +- .../jboss/JBoss7ServerAwsEc2LiveTest.java | 5 +- .../jboss/JBoss7ServerDockerLiveTest.java | 5 +- ...Boss7ServerNonInheritingIntegrationTest.java | 4 +- .../JBoss7ServerRebindingIntegrationTest.java | 3 +- ...ultiVersionWebAppFixtureIntegrationTest.java | 4 +- .../Jboss7ServerGoogleComputeLiveTest.java | 5 +- .../JettyWebAppFixtureIntegrationTest.java | 4 +- .../webapp/nodejs/NodeJsWebAppEc2LiveTest.java | 3 +- .../NodeJsWebAppFixtureIntegrationTest.java | 4 +- .../NodeJsWebAppSimpleIntegrationTest.java | 8 +- .../nodejs/NodeJsWebAppSoftlayerLiveTest.java | 3 +- .../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 3 +- .../tomcat/Tomcat8ServerSoftlayerLiveTest.java | 3 +- ...mcat8ServerWebAppFixtureIntegrationTest.java | 3 +- ...ableRetrieveUsageMetricsIntegrationTest.java | 3 +- .../webapp/tomcat/TomcatServerEc2LiveTest.java | 5 +- .../tomcat/TomcatServerSoftlayerLiveTest.java | 5 +- ...omcatServerWebAppFixtureIntegrationTest.java | 3 +- .../test/entity/TestJavaWebAppEntity.java | 2 +- .../app/ClusterWebServerDatabaseSample.java | 2 +- .../sample/app/SingleWebServerSample.java | 2 +- .../BrooklynComponentTemplateResolver.java | 2 +- .../creation/BrooklynYamlLocationResolver.java | 4 +- .../camp/brooklyn/ByonLocationsYamlTest.java | 16 +- .../brooklyn/EmptySoftwareProcessYamlTest.java | 4 +- .../camp/brooklyn/EntitiesYamlTest.java | 2 +- .../camp/brooklyn/LocationsYamlTest.java | 12 +- .../brooklyn/TestEntityWithInitConfigImpl.java | 2 +- .../CatalogOsgiVersionMoreEntityTest.java | 2 +- .../catalog/CatalogYamlLocationTest.java | 8 +- .../org/apache/brooklyn/cli/CloudExplorer.java | 12 +- .../org/apache/brooklyn/cli/ItemLister.java | 4 +- .../brooklyn/cli/lister/ItemDescriptors.java | 2 +- .../java/org/apache/brooklyn/cli/CliTest.java | 11 +- .../brooklyn/launcher/BrooklynLauncher.java | 10 +- .../brooklyn/launcher/BrooklynWebServer.java | 6 +- .../launcher/config/BrooklynGlobalConfig.java | 2 +- .../brooklynnode/BrooklynNodeRestTest.java | 2 +- .../BrooklynLauncherRebindTestFixture.java | 2 +- .../brooklyn/launcher/BrooklynLauncherTest.java | 4 +- .../qa/load/SimulatedJBoss7ServerImpl.java | 4 +- .../qa/load/SimulatedMySqlNodeImpl.java | 2 +- .../qa/load/SimulatedNginxControllerImpl.java | 2 +- .../brooklyn/qa/load/SimulatedTheeTierApp.java | 2 +- .../SoftlayerObtainPrivateLiveTest.java | 4 +- .../org/apache/brooklyn/qa/load/LoadTest.java | 3 +- .../brooklyn/rest/domain/LocationSpec.java | 2 +- .../ApplicationResourceIntegrationTest.java | 2 +- .../rest/client/BrooklynApiRestClientTest.java | 3 +- .../apache/brooklyn/rest/BrooklynWebConfig.java | 2 +- .../rest/resources/ApplicationResource.java | 2 +- .../rest/resources/CatalogResource.java | 4 +- .../brooklyn/rest/resources/EntityResource.java | 2 +- .../rest/resources/LocationResource.java | 6 +- .../rest/transform/ApplicationTransformer.java | 2 +- .../rest/transform/CatalogTransformer.java | 4 +- .../rest/transform/LocationTransformer.java | 10 +- .../rest/util/BrooklynRestResourceUtils.java | 4 +- .../brooklyn/rest/util/EntityLocationUtils.java | 4 +- .../rest/util/json/BidiSerialization.java | 2 +- .../rest/resources/ApplicationResourceTest.java | 8 +- .../rest/resources/LocationResourceTest.java | 6 +- .../rest/resources/ScriptResourceTest.java | 2 +- .../rest/resources/UsageResourceTest.java | 10 +- .../rest/testing/BrooklynRestApiTest.java | 4 +- .../testing/mocks/RestMockSimpleEntity.java | 2 +- .../rest/util/EntityLocationUtilsTest.java | 8 +- .../brooklyn/osgi/tests/SimpleLocation.java | 2 +- .../brooklyn/osgi/tests/more/MoreLocation.java | 2 +- .../brooklyn/osgi/tests/more/MoreLocation.java | 2 +- 995 files changed, 33714 insertions(+), 33908 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/api/src/main/java/brooklyn/location/AddressableLocation.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/location/AddressableLocation.java b/api/src/main/java/brooklyn/location/AddressableLocation.java deleted file mode 100644 index 172c478..0000000 --- a/api/src/main/java/brooklyn/location/AddressableLocation.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 brooklyn.location; - -import java.net.InetAddress; - -/** A location that has an IP address. - * <p> - * This IP address may be a machine (usually the MachineLocation sub-interface), - * or often an entry point for a service. - */ -public interface AddressableLocation extends Location { - - /** - * Return the single most appropriate address for this location. - * (An implementation or sub-interface definition may supply more information - * on the precise semantics of the address.) - * - * Should not return null, but in some "special cases" (e.g. CloudFoundryLocation it - * may return null if the location is not configured correctly). Users should expect - * a non-null result and treat null as a programming error or misconfiguration. - * Implementors of this interface should strive to not return null (and then we'll - * remove this caveat from the javadoc!). - */ - InetAddress getAddress(); - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/api/src/main/java/brooklyn/location/BasicMachineLocationCustomizer.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/location/BasicMachineLocationCustomizer.java b/api/src/main/java/brooklyn/location/BasicMachineLocationCustomizer.java deleted file mode 100644 index a05dd44..0000000 --- a/api/src/main/java/brooklyn/location/BasicMachineLocationCustomizer.java +++ /dev/null @@ -1,41 +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 brooklyn.location; - -import com.google.common.annotations.Beta; - -/** - * A default no-op implementation, which can be extended to override the appropriate methods. - * - * Sub-classing will give the user some protection against future API changes - note that - * {@link MachineLocationCustomizer} is marked {@link Beta}. - */ -@Beta -public class BasicMachineLocationCustomizer implements MachineLocationCustomizer { - - @Override - public void customize(MachineLocation machine) { - // no-op - } - - @Override - public void preRelease(MachineLocation machine) { - // no-op - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/api/src/main/java/brooklyn/location/HardwareDetails.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/location/HardwareDetails.java b/api/src/main/java/brooklyn/location/HardwareDetails.java deleted file mode 100644 index e0a90a9..0000000 --- a/api/src/main/java/brooklyn/location/HardwareDetails.java +++ /dev/null @@ -1,40 +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 brooklyn.location; - -import javax.annotation.Nullable; - -/** - * @since 0.7.0 - */ -public interface HardwareDetails { - - /** - * The number of CPUs on the machine - */ - @Nullable - Integer getCpuCount(); - - /** - * Amount of RAM in megabytes - */ - @Nullable - Integer getRam(); - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/api/src/main/java/brooklyn/location/Location.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/location/Location.java b/api/src/main/java/brooklyn/location/Location.java deleted file mode 100644 index 791ca7a..0000000 --- a/api/src/main/java/brooklyn/location/Location.java +++ /dev/null @@ -1,146 +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 brooklyn.location; - -import java.io.Serializable; -import java.util.Collection; -import java.util.Map; - -import org.apache.brooklyn.api.basic.BrooklynObject; - -import brooklyn.config.ConfigKey; -import brooklyn.config.ConfigKey.HasConfigKey; - -/** - * A location that an entity can be in. Examples of locations include a single machine - * or a pool of machines, or a region within a given cloud. - * - * See {@link brooklyn.entity.trait.Startable#start(Collection)}. - * - * Locations may not be {@link Serializable} in subsequent releases! - */ -public interface Location extends Serializable, BrooklynObject { - - /** - * A unique id for this location. - */ - @Override - String getId(); - - /** - * Get the name assigned to this location. - * - * @return the name assigned to the location. - * @since 0.6 (previously getName()) - */ - @Override - String getDisplayName(); - - /** - * Get the 'parent' of this location. Locations are organized into a tree hierarchy, and this method will return a reference - * to the parent of this location, or {@code null} if this location is the tree root. - * - * @return a reference to the parent of this location, or {@code null} if this location is the tree root. - * @since 0.6 (previously getParentLocation()) - */ - Location getParent(); - - /** - * Get the 'children' of this location. Locations are organized into a tree hierarchy, and this method will return a - * collection containing the children of this location. This collection is an unmodifiable view of the data. - * - * @return a collection containing the children of this location. - * @since 0.6 (previously getChildLocations()) - */ - Collection<Location> getChildren(); - - /** - * Set the 'parent' of this location. If this location was previously a child of a different location, it is removed from - * the other location first. It is valid to pass in {@code null} to indicate that the location should be disconnected - * from its parent. - * - * Adds this location as a child of the new parent (see {@code getChildLocations()}). - * - * @param newParent the new parent location object, or {@code null} to clear the parent reference. - * @since 0.6 (previously setParentLocation(Location)) - */ - void setParent(Location newParent); - - /** - * @return meta-data about the location (usually a long line, or a small number of lines). - * - * @since 0.6 - */ - String toVerboseString(); - - /** - * Answers true if this location equals or is an ancestor of the given location. - */ - boolean containsLocation(Location potentialDescendent); - - /** - * Returns configuration set at this location or inherited or default. - * - * Convenience method for {@code config().get(key)} - */ - <T> T getConfig(ConfigKey<T> key); - - /** - * Convenience method for {@code config().get(key)} - * - * @see {@link #getConfig(ConfigKey)} - */ - <T> T getConfig(HasConfigKey<T> key); - - /** - * True iff the indication config key is set, either inherited (second argument true) or locally-only (second argument false). - * - * @deprecated since 0.7.0; use {@link #config()}, such as {@code ((LocationInternal)location).config().getRaw(key).isPresent()} - */ - @Deprecated - boolean hasConfig(ConfigKey<?> key, boolean includeInherited); - - /** - * Returns all config set, either inherited (argument true) or locally-only (argument false). - * - * @deprecated since 0.7.0; use {@link #config()}, such as {@code policy.config().getBag()} - */ - @Deprecated - public Map<String,Object> getAllConfig(boolean includeInherited); - - /** - * Whether this location has support for the given extension type. - * See additional comments in {@link #getExtension(Class)}. - * - * @throws NullPointerException if extensionType is null - */ - boolean hasExtension(Class<?> extensionType); - - /** - * Returns an extension of the given type. Note that the type must be an exact match for - * how the extension was registered (e.g. {@code getExtension(Object.class)} will not match - * anything, even though registered extension extend {@link Object}. - * <p> - * This will not look at extensions of {@link #getParent()}. - * - * @throws IllegalArgumentException if this location does not support the given extension type - * @throws NullPointerException if extensionType is null - */ - <T> T getExtension(Class<T> extensionType); -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/api/src/main/java/brooklyn/location/LocationDefinition.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/location/LocationDefinition.java b/api/src/main/java/brooklyn/location/LocationDefinition.java deleted file mode 100644 index 3a20a24..0000000 --- a/api/src/main/java/brooklyn/location/LocationDefinition.java +++ /dev/null @@ -1,42 +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 brooklyn.location; - -import java.util.Map; - -import org.apache.brooklyn.api.management.ManagementContext; - -/** - * Defines a location, where the {@link #getSpec()} is like a serialized representation - * of the location so that Brooklyn can create a corresponding location. - * - * Examples include a complete description (e.g. giving a list of machines in a pool), or - * a name that matches a named location defined in the brooklyn poperties. - * - * Users are not expected to implement this, or to use the interface directly. See - * {@link LocationRegistry#resolve(String)} and {@link ManagementContext#getLocationRegistry()}. - */ -public interface LocationDefinition { - - public String getId(); - public String getName(); - public String getSpec(); - public Map<String,Object> getConfig(); - -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/api/src/main/java/brooklyn/location/LocationNotAvailableException.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/location/LocationNotAvailableException.java b/api/src/main/java/brooklyn/location/LocationNotAvailableException.java deleted file mode 100644 index 561d625..0000000 --- a/api/src/main/java/brooklyn/location/LocationNotAvailableException.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 brooklyn.location; - - -/** - * Indicates that a {@link ProvisioningLocation} is not able to provision a requested location - */ -public class LocationNotAvailableException extends Exception { - private static final long serialVersionUID = 1079817235289265761L; - - public LocationNotAvailableException(String s) { - super(s); - } - - public LocationNotAvailableException(String s, Throwable throwable) { - super(s, throwable); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/api/src/main/java/brooklyn/location/LocationRegistry.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/location/LocationRegistry.java b/api/src/main/java/brooklyn/location/LocationRegistry.java deleted file mode 100644 index cc2c251..0000000 --- a/api/src/main/java/brooklyn/location/LocationRegistry.java +++ /dev/null @@ -1,128 +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 brooklyn.location; - -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; - -import javax.annotation.Nullable; - -import brooklyn.util.guava.Maybe; - -import com.google.common.annotations.Beta; - -/** - * The registry of the sorts of locations that brooklyn knows about. Given a - * {@LocationDefinition} or a {@link String} representation of a spec, this can - * be used to create a {@link Location} instance. - */ -@SuppressWarnings("rawtypes") -public interface LocationRegistry { - - /** map of ID (possibly randomly generated) to the definition (spec, name, id, and props; - * where spec is the spec as defined, for instance possibly another named:xxx location) */ - public Map<String,LocationDefinition> getDefinedLocations(); - - /** returns a LocationDefinition given its ID (usually a random string), or null if none */ - public LocationDefinition getDefinedLocationById(String id); - - /** returns a LocationDefinition given its name (e.g. for named locations, supply the bit after the "named:" prefix), - * or null if none */ - public LocationDefinition getDefinedLocationByName(String name); - - /** adds or updates the given defined location */ - public void updateDefinedLocation(LocationDefinition l); - - /** removes the defined location from the registry (applications running there are unaffected) */ - public void removeDefinedLocation(String id); - - /** Returns a fully populated (config etc) location from the given definition, with optional add'l flags. - * the location will be managed by default, unless the manage parameter is false, - * or the manage parameter is null and the CREATE_UNMANAGED flag is set. - * <p> - * The manage parameter is {@link Boolean} so that null can be used to say rely on anything in the flags. - * - * @since 0.7.0, but beta and likely to change as the semantics of this class are tuned */ - @Beta - public Maybe<Location> resolve(LocationDefinition ld, Boolean manage, Map locationFlags); - - /** As {@link #resolve(LocationDefinition, Boolean, Map), with the location managed, and no additional flags, - * unwrapping the result (throwing if not resolvable) */ - public Location resolve(LocationDefinition l); - - /** Returns a location created from the given spec, which might correspond to a definition, or created on-the-fly. - * Optional flags can be passed through to underlying the location. - * @since 0.7.0, but beta and likely to change as the semantics of this class are tuned */ - @Beta - public Maybe<Location> resolve(String spec, Boolean manage, Map locationFlags); - - /** efficiently returns for inspection only a fully populated (config etc) location from the given definition; - * the value might be unmanaged so it is not meant for any use other than inspection, - * but callers should prefer this when they don't wish to create a new location which will be managed in perpetuity! - * - * @deprecated since 0.7.0, use {@link #resolve(LocationDefinition, Boolean, Map)} */ - @Deprecated - public Location resolveForPeeking(LocationDefinition l); - - /** returns fully populated (config etc) location from the given definition, with overrides; - * @deprecated since 0.7.0, use {@link #resolve(LocationDefinition, Boolean, Map)} */ - @Deprecated - public Location resolve(LocationDefinition l, Map<?,?> locationFlags); - - /** See {@link #resolve(String, Boolean, Map)}; asks for the location to be managed, and supplies no additional flags, - * and unwraps the result (throwing if the spec cannot be resolve) */ - public Location resolve(String spec); - - /** Returns true/false depending whether spec seems like a valid location, - * that is it has a chance of being resolved (depending on the spec) but NOT guaranteed, - * as it is not passed to the spec; - * see {@link #resolve(String, Boolean, Map)} which has stronger guarantees - * @deprecated since 0.7.0, not really needed, and semantics are weak; use {@link #resolve(String, Boolean, Map)} */ - @Deprecated - public boolean canMaybeResolve(String spec); - - /** As {@link #resolve(String, Boolean, Map)}, but unwrapped - * @throws NoSuchElementException if the spec cannot be resolved */ - public Location resolve(String spec, @Nullable Map locationFlags); - - /** as {@link #resolve(String)} but returning null (never throwing) - * @deprecated since 0.7.0 use {@link #resolve(String, Boolean, Map)} */ - @Deprecated - public Location resolveIfPossible(String spec); - - /** - * As {@link #resolve(String)} but takes collections (of strings or locations) - * <p> - * Expects a collection of elements being individual location spec strings or locations, - * and returns a list of resolved (newly created and managed) locations. - * <p> - * From 0.7.0 this no longer flattens lists (nested lists are disallowed) - * or parses comma-separated elements (they are resolved as-is) - */ - public List<Location> resolve(Iterable<?> spec); - - /** Takes a string, interpreted as a comma-separated (or JSON style, when you need internal double quotes or commas) list; - * or a list, passed to {@link #resolve(Iterable)}; or null/empty (empty list), - * and returns a list of resolved (created and managed) locations */ - public List<Location> resolveList(Object specList); - - public Map getProperties(); - -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e2c57058/api/src/main/java/brooklyn/location/LocationResolver.java ---------------------------------------------------------------------- diff --git a/api/src/main/java/brooklyn/location/LocationResolver.java b/api/src/main/java/brooklyn/location/LocationResolver.java deleted file mode 100644 index bcd32b6..0000000 --- a/api/src/main/java/brooklyn/location/LocationResolver.java +++ /dev/null @@ -1,57 +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 brooklyn.location; - -import java.util.Map; - -import org.apache.brooklyn.api.management.ManagementContext; - -import com.google.common.annotations.Beta; - -/** - * Provides a way of creating location instances of a particular type. - */ -public interface LocationResolver { - - void init(ManagementContext managementContext); - - /** the prefix that this resolver will attend to */ - String getPrefix(); - - /** whether the spec is something which should be passed to this resolver */ - boolean accepts(String spec, brooklyn.location.LocationRegistry registry); - - /** - * Similar to {@link #newLocationFromString(Map, String)} - * but passing in a reference to the registry itself (from which the base properties are discovered) - * and including flags (e.g. user, key, cloud credential) which are known to be for this location. - * <p> - * introduced to support locations which refer to other locations, e.g. NamedLocationResolver - **/ - @SuppressWarnings("rawtypes") - Location newLocationFromString(Map locationFlags, String spec, LocationRegistry registry); - - /** @since 0.7.0 exploring this as a mechanism to disable locations */ - @Beta - public interface EnableableLocationResolver extends LocationResolver { - /** whether the location is enabled */ - boolean isEnabled(); - } - -}
