brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [7/7] incubator-brooklyn git commit: This closes #826
Date Fri, 14 Aug 2015 04:42:24 GMT
This closes #826


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

Branch: refs/heads/master
Commit: 2a0d9e4aeee5f6c5bdd8667d5ef66df394cd69db
Parents: 706ab17 904f950
Author: Hadrian Zbarcea <hadrian@apache.org>
Authored: Fri Aug 14 00:38:36 2015 -0400
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Fri Aug 14 00:38:36 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 -
 .../brooklyn/api/catalog/CatalogItem.java       |    2 +-
 .../org/apache/brooklyn/api/entity/Entity.java  |   10 +-
 .../org/apache/brooklyn/api/entity/Feed.java    |    4 +-
 .../api/entity/drivers/EntityDriver.java        |    3 +-
 .../api/entity/drivers/EntityDriverManager.java |    2 +-
 .../api/entity/proxying/EntitySpec.java         |   10 +-
 .../api/entity/proxying/EntityTypeRegistry.java |    3 +-
 .../api/entity/rebind/BrooklynObjectType.java   |    7 +-
 .../rebind/PersistenceExceptionHandler.java     |    2 +-
 .../api/entity/rebind/RebindContext.java        |    2 +-
 .../entity/rebind/RebindExceptionHandler.java   |    7 +-
 .../api/entity/rebind/RebindManager.java        |    4 +-
 .../api/entity/rebind/RebindSupport.java        |    4 +-
 .../brooklyn/api/entity/rebind/Rebindable.java  |    2 +-
 .../api/location/AddressableLocation.java       |   43 +
 .../BasicMachineLocationCustomizer.java         |   41 +
 .../brooklyn/api/location/HardwareDetails.java  |   40 +
 .../apache/brooklyn/api/location/Location.java  |  146 +
 .../api/location/LocationDefinition.java        |   42 +
 .../location/LocationNotAvailableException.java |   35 +
 .../brooklyn/api/location/LocationRegistry.java |  128 +
 .../brooklyn/api/location/LocationResolver.java |   57 +
 .../brooklyn/api/location/LocationSpec.java     |  229 ++
 .../brooklyn/api/location/LocationType.java     |   32 +
 .../brooklyn/api/location/MachineDetails.java   |   34 +
 .../brooklyn/api/location/MachineLocation.java  |   46 +
 .../api/location/MachineLocationCustomizer.java |   42 +
 .../api/location/MachineManagementMixins.java   |   92 +
 .../location/MachineProvisioningLocation.java   |   72 +
 .../location/NoMachinesAvailableException.java  |   35 +
 .../apache/brooklyn/api/location/OsDetails.java |   46 +
 .../apache/brooklyn/api/location/PortRange.java |   48 +
 .../brooklyn/api/location/PortSupplier.java     |   50 +
 .../api/location/ProvisioningLocation.java      |   44 +
 .../api/management/AccessController.java        |    3 +-
 .../brooklyn/api/management/EntityManager.java  |    8 +-
 .../api/management/LocationManager.java         |    4 +-
 .../api/management/ManagementContext.java       |    2 +-
 .../ha/ManagementPlaneSyncRecord.java           |    4 +-
 .../ha/ManagementPlaneSyncRecordPersister.java  |    4 +-
 .../brooklyn/api/mementos/BrooklynMemento.java  |   64 +
 .../api/mementos/BrooklynMementoManifest.java   |   58 +
 .../api/mementos/BrooklynMementoPersister.java  |  138 +
 .../api/mementos/BrooklynMementoRawData.java    |  185 ++
 .../api/mementos/CatalogItemMemento.java        |   49 +
 .../brooklyn/api/mementos/EnricherMemento.java  |   33 +
 .../brooklyn/api/mementos/EntityMemento.java    |   81 +
 .../brooklyn/api/mementos/FeedMemento.java      |   33 +
 .../brooklyn/api/mementos/LocationMemento.java  |   38 +
 .../apache/brooklyn/api/mementos/Memento.java   |   83 +
 .../brooklyn/api/mementos/PolicyMemento.java    |   35 +
 .../apache/brooklyn/api/mementos/TreeNode.java  |   48 +
 .../apache/brooklyn/api/policy/Enricher.java    |   71 +
 .../brooklyn/api/policy/EnricherSpec.java       |  214 ++
 .../brooklyn/api/policy/EnricherType.java       |   36 +
 .../brooklyn/api/policy/EntityAdjunct.java      |   55 +
 .../org/apache/brooklyn/api/policy/Policy.java  |   83 +
 .../apache/brooklyn/api/policy/PolicySpec.java  |  152 +
 .../apache/brooklyn/api/policy/PolicyType.java  |   36 +
 .../brooklyn/mementos/BrooklynMemento.java      |   64 -
 .../mementos/BrooklynMementoManifest.java       |   58 -
 .../mementos/BrooklynMementoPersister.java      |  138 -
 .../mementos/BrooklynMementoRawData.java        |  185 --
 .../brooklyn/mementos/CatalogItemMemento.java   |   49 -
 .../brooklyn/mementos/EnricherMemento.java      |   33 -
 .../apache/brooklyn/mementos/EntityMemento.java |   81 -
 .../apache/brooklyn/mementos/FeedMemento.java   |   33 -
 .../brooklyn/mementos/LocationMemento.java      |   38 -
 .../org/apache/brooklyn/mementos/Memento.java   |   83 -
 .../apache/brooklyn/mementos/PolicyMemento.java |   35 -
 .../org/apache/brooklyn/mementos/TreeNode.java  |   48 -
 .../org/apache/brooklyn/policy/Enricher.java    |   71 -
 .../apache/brooklyn/policy/EnricherSpec.java    |  214 --
 .../apache/brooklyn/policy/EnricherType.java    |   36 -
 .../apache/brooklyn/policy/EntityAdjunct.java   |   55 -
 .../java/org/apache/brooklyn/policy/Policy.java |   83 -
 .../org/apache/brooklyn/policy/PolicySpec.java  |  152 -
 .../org/apache/brooklyn/policy/PolicyType.java  |   36 -
 .../main/java/brooklyn/basic/BrooklynTypes.java |    6 +-
 .../brooklyn/catalog/CatalogPredicates.java     |    8 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |   12 +-
 .../catalog/internal/CatalogClasspathDo.java    |    4 +-
 .../catalog/internal/CatalogItemDo.java         |    2 +-
 .../internal/CatalogItemDtoAbstract.java        |    2 +-
 .../internal/CatalogLocationItemDto.java        |    4 +-
 .../catalog/internal/CatalogPolicyItemDto.java  |    4 +-
 .../main/java/brooklyn/enricher/Enrichers.java  |    4 +-
 .../enricher/basic/AbstractEnricher.java        |    6 +-
 .../enricher/basic/EnricherDynamicType.java     |    4 +-
 .../enricher/basic/EnricherTypeSnapshot.java    |    2 +-
 .../entity/basic/AbstractApplication.java       |    2 +-
 .../brooklyn/entity/basic/AbstractEntity.java   |   18 +-
 .../brooklyn/entity/basic/BasicStartable.java   |    7 +-
 .../entity/basic/BasicStartableImpl.java        |    5 +-
 .../entity/basic/BrooklynConfigKeys.java        |    4 +-
 .../brooklyn/entity/basic/DataEntityImpl.java   |    2 +-
 .../entity/basic/EffectorStartableImpl.java     |    4 +-
 .../java/brooklyn/entity/basic/Entities.java    |   14 +-
 .../brooklyn/entity/basic/EntityAdjuncts.java   |    4 +-
 .../entity/basic/EntityFactoryForLocation.java  |    3 +-
 .../brooklyn/entity/basic/EntityFunctions.java  |    2 +-
 .../brooklyn/entity/basic/EntityInternal.java   |    4 +-
 .../brooklyn/entity/basic/EntityPredicates.java |    2 +-
 .../brooklyn/entity/basic/EntitySuppliers.java  |    4 +-
 .../basic/EntityTransientCopyInternal.java      |   10 +-
 .../java/brooklyn/entity/basic/Lifecycle.java   |    4 +-
 .../brooklyn/entity/basic/PolicyDescriptor.java |    2 +-
 .../entity/basic/ServiceStateLogic.java         |    6 +-
 .../drivers/BasicEntityDriverManager.java       |    3 +-
 .../drivers/ReflectiveEntityDriverFactory.java  |    8 +-
 .../drivers/RegistryEntityDriverFactory.java    |    3 +-
 .../brooklyn/entity/effector/EffectorTasks.java |    6 +-
 .../brooklyn/entity/group/DynamicCluster.java   |    2 +-
 .../entity/group/DynamicClusterImpl.java        |   12 +-
 .../entity/group/DynamicFabricImpl.java         |    2 +-
 .../entity/group/DynamicRegionsFabricImpl.java  |    2 +-
 .../zoneaware/AbstractZoneFailureDetector.java  |    2 +-
 .../BalancingNodePlacementStrategy.java         |    2 +-
 .../zoneaware/CombiningZoneFailureDetector.java |    2 +-
 .../CriticalCauseZoneFailureDetector.java       |    3 +-
 .../ProportionalZoneFailureDetector.java        |    3 +-
 .../entity/proxying/InternalEntityFactory.java  |    8 +-
 .../proxying/InternalLocationFactory.java       |   11 +-
 .../entity/proxying/InternalPolicyFactory.java  |    8 +-
 .../AbstractBrooklynObjectRebindSupport.java    |    4 +-
 .../rebind/ActivePartialRebindIteration.java    |    8 +-
 .../rebind/BasicCatalogItemRebindSupport.java   |    2 +-
 .../rebind/BasicEnricherRebindSupport.java      |    2 +-
 .../entity/rebind/BasicEntityRebindSupport.java |    4 +-
 .../entity/rebind/BasicFeedRebindSupport.java   |    2 +-
 .../rebind/BasicLocationRebindSupport.java      |    8 +-
 .../entity/rebind/BasicPolicyRebindSupport.java |    2 +-
 .../rebind/ImmediateDeltaChangeListener.java    |   23 +-
 .../rebind/InitialFullRebindIteration.java      |    2 +-
 .../rebind/PeriodicDeltaChangeListener.java     |    8 +-
 .../rebind/PersistenceExceptionHandlerImpl.java |    2 +-
 .../entity/rebind/PersisterDeltaImpl.java       |   18 +-
 .../entity/rebind/RebindContextImpl.java        |    8 +-
 .../rebind/RebindContextLookupContext.java      |    8 +-
 .../rebind/RebindExceptionHandlerImpl.java      |    6 +-
 .../brooklyn/entity/rebind/RebindIteration.java |   38 +-
 .../entity/rebind/RebindManagerImpl.java        |    6 +-
 .../java/brooklyn/entity/rebind/TreeUtils.java  |    2 +-
 .../entity/rebind/dto/AbstractMemento.java      |    2 +-
 .../rebind/dto/AbstractTreeNodeMemento.java     |    4 +-
 .../rebind/dto/BasicCatalogItemMemento.java     |    2 +-
 .../entity/rebind/dto/BasicEnricherMemento.java |    2 +-
 .../entity/rebind/dto/BasicEntityMemento.java   |    6 +-
 .../entity/rebind/dto/BasicFeedMemento.java     |    2 +-
 .../entity/rebind/dto/BasicLocationMemento.java |    4 +-
 .../entity/rebind/dto/BasicPolicyMemento.java   |    2 +-
 .../entity/rebind/dto/BrooklynMementoImpl.java  |   16 +-
 .../rebind/dto/BrooklynMementoManifestImpl.java |    4 +-
 .../rebind/dto/EntityMementoManifestImpl.java   |    2 +-
 .../entity/rebind/dto/MementoValidators.java    |    6 +-
 .../entity/rebind/dto/MementosGenerators.java   |   28 +-
 .../rebind/dto/MutableBrooklynMemento.java      |   14 +-
 .../BrooklynMementoPersisterToObjectStore.java  |   12 +-
 .../persister/BrooklynPersistenceUtils.java     |   16 +-
 .../rebind/persister/MementoSerializer.java     |    4 +-
 .../persister/RetryingMementoSerializer.java    |    2 +-
 .../rebind/persister/XmlMementoSerializer.java  |    8 +-
 .../transformer/BrooklynMementoTransformer.java |    2 +-
 .../rebind/transformer/CompoundTransformer.java |    2 +-
 .../DeleteOrphanedLocationsTransformer.java     |    6 +-
 .../java/brooklyn/entity/trait/Startable.java   |    2 +-
 .../brooklyn/entity/trait/StartableMethods.java |    2 +-
 .../basic/PortAttributeSensorAndConfigKey.java  |   12 +-
 .../java/brooklyn/event/feed/AbstractFeed.java  |    2 +-
 .../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     |    6 +-
 .../internal/BrooklynGarbageCollector.java      |    2 +-
 .../internal/EntityChangeListener.java          |    4 +-
 .../internal/EntityManagementSupport.java       |    4 +-
 .../management/internal/LocalAccessManager.java |    3 +-
 .../management/internal/LocalEntityManager.java |    8 +-
 .../internal/LocalLocationManager.java          |   12 +-
 .../internal/LocalManagementContext.java        |    2 +-
 .../management/internal/LocalUsageManager.java  |   10 +-
 .../internal/LocationManagerInternal.java       |    3 +-
 .../internal/ManagementContextInternal.java     |    2 +-
 .../internal/NonDeploymentEntityManager.java    |    8 +-
 .../internal/NonDeploymentLocationManager.java  |    5 +-
 .../NonDeploymentManagementContext.java         |    8 +-
 .../internal/NonDeploymentUsageManager.java     |    2 +-
 .../management/internal/UsageListener.java      |    2 +-
 .../management/internal/UsageManager.java       |    2 +-
 .../policy/basic/AbstractEntityAdjunct.java     |    2 +-
 .../brooklyn/policy/basic/AbstractPolicy.java   |    6 +-
 .../java/brooklyn/policy/basic/AdjunctType.java |    2 +-
 .../java/brooklyn/policy/basic/Policies.java    |    2 +-
 .../policy/basic/PolicyDynamicType.java         |    4 +-
 .../policy/basic/PolicyTypeSnapshot.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   |   10 +-
 .../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    |  145 +
 .../location/access/PortForwardManager.java     |  329 ++
 .../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        |  710 +++++
 .../basic/AbstractLocationResolver.java         |  189 ++
 .../AggregatingMachineProvisioningLocation.java |  140 +
 .../location/basic/BasicHardwareDetails.java    |   56 +
 .../location/basic/BasicLocationDefinition.java |   86 +
 .../location/basic/BasicLocationRegistry.java   |  480 +++
 .../location/basic/BasicMachineDetails.java     |  181 ++
 .../location/basic/BasicMachineMetadata.java    |   84 +
 .../brooklyn/location/basic/BasicOsDetails.java |  123 +
 .../location/basic/ByonLocationResolver.java    |  251 ++
 .../location/basic/CatalogLocationResolver.java |   80 +
 .../basic/DefinedLocationByIdResolver.java      |   74 +
 .../basic/DeprecatedKeysMappingBuilder.java     |   67 +
 .../FixedListMachineProvisioningLocation.java   |  476 +++
 .../location/basic/HasSubnetHostname.java       |   32 +
 .../location/basic/HostLocationResolver.java    |   91 +
 .../basic/LocalhostLocationResolver.java        |   75 +
 .../LocalhostMachineProvisioningLocation.java   |  347 +++
 ...calhostPropertiesFromBrooklynProperties.java |   57 +
 .../location/basic/LocationConfigKeys.java      |   79 +
 .../location/basic/LocationConfigUtils.java     |  559 ++++
 .../location/basic/LocationDynamicType.java     |   40 +
 .../location/basic/LocationInternal.java        |   94 +
 .../location/basic/LocationPredicates.java      |  109 +
 ...ocationPropertiesFromBrooklynProperties.java |  224 ++
 .../location/basic/LocationTypeSnapshot.java    |   41 +
 .../brooklyn/location/basic/Locations.java      |  159 +
 .../brooklyn/location/basic/Machines.java       |  190 ++
 .../brooklyn/location/basic/MultiLocation.java  |  167 +
 .../location/basic/MultiLocationResolver.java   |  146 +
 .../location/basic/NamedLocationResolver.java   |   97 +
 .../brooklyn/location/basic/PortRanges.java     |  258 ++
 .../basic/RegistryLocationResolver.java         |   42 +
 .../basic/SingleMachineLocationResolver.java    |   78 +
 .../SingleMachineProvisioningLocation.java      |   92 +
 .../location/basic/SshMachineLocation.java      | 1033 +++++++
 .../location/basic/SupportsPortForwarding.java  |   39 +
 .../location/basic/WinRmMachineLocation.java    |  362 +++
 .../AbstractAvailabilityZoneExtension.java      |   82 +
 ...bstractCloudMachineProvisioningLocation.java |   98 +
 .../cloud/AvailabilityZoneExtension.java        |   55 +
 .../location/cloud/CloudLocationConfig.java     |  118 +
 .../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 -
 ...pache.brooklyn.api.location.LocationResolver |   27 +
 .../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 |    6 +-
 .../java/brooklyn/enricher/EnrichersTest.java   |    2 +-
 .../enricher/SensorPropagatingEnricherTest.java |    2 +-
 .../TransformingEnricherDeprecatedTest.groovy   |    3 +-
 .../enricher/TransformingEnricherTest.java      |    2 +-
 .../enricher/basic/BasicEnricherTest.java       |    4 +-
 .../YamlRollingTimeWindowMeanEnricherTest.java  |    2 +-
 .../YamlTimeWeightedDeltaEnricherTest.java      |    2 +-
 .../brooklyn/entity/EffectorMetadataTest.java   |    2 +-
 .../java/brooklyn/entity/SetFromFlagTest.java   |    6 +-
 .../basic/AbstractApplicationLegacyTest.java    |    5 +-
 .../entity/basic/AbstractEntityLegacyTest.java  |    3 +-
 .../entity/basic/BasicStartableTest.java        |    9 +-
 .../brooklyn/entity/basic/DataEntityTest.java   |    6 +-
 .../brooklyn/entity/basic/EntitiesTest.java     |    6 +-
 .../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   |   12 +-
 .../entity/basic/EntitySubscriptionTest.java    |    2 +-
 .../entity/basic/EntitySuppliersTest.java       |    7 +-
 ...apListAndOtherStructuredConfigKeyTest.groovy |    2 +-
 .../entity/basic/PolicyRegistrationTest.java    |    6 +-
 .../entity/basic/ServiceStateLogicTest.java     |    4 +-
 .../drivers/BasicEntityDriverManagerTest.java   |    4 +-
 .../drivers/EntityDriverRegistryTest.java       |    2 +-
 .../ReflectiveEntityDriverFactoryTest.java      |    8 +-
 .../RegistryEntityDriverFactoryTest.java        |    8 +-
 .../downloads/BasicDownloadsRegistryTest.java   |    6 +-
 .../DownloadProducerFromLocalRepoTest.java      |    6 +-
 .../DownloadProducerFromPropertiesTest.java     |    6 +-
 .../downloads/DownloadSubstitutersTest.java     |    5 +-
 .../drivers/downloads/MyEntityDriver.java       |    3 +-
 .../entity/effector/EffectorBasicTest.java      |    2 +-
 .../entity/group/DynamicClusterTest.java        |    6 +-
 ...DynamicClusterWithAvailabilityZonesTest.java |   14 +-
 .../entity/group/DynamicFabricTest.java         |    8 +-
 .../entity/group/DynamicMultiGroupTest.java     |    3 +-
 .../entity/group/DynamicRegionsFabricTest.java  |    6 +-
 .../entity/group/GroupPickUpEntitiesTest.java   |    2 +-
 .../java/brooklyn/entity/group/GroupTest.java   |    6 +-
 .../group/MembershipTrackingPolicyTest.java     |    8 +-
 .../entity/group/QuarantineGroupTest.java       |    5 +-
 .../BalancingNodePlacementStrategyTest.java     |    8 +-
 .../ProportionalZoneFailureDetectorTest.java    |    6 +-
 .../entity/hello/LocalEntitiesTest.java         |    2 +-
 .../entity/rebind/RebindCatalogItemTest.java    |    2 +-
 .../entity/rebind/RebindEnricherTest.java       |   10 +-
 .../entity/rebind/RebindEntityTest.java         |   12 +-
 .../entity/rebind/RebindFailuresTest.java       |    8 +-
 .../brooklyn/entity/rebind/RebindFeedTest.java  |    8 +-
 .../rebind/RebindLocalhostLocationTest.java     |    9 +-
 .../entity/rebind/RebindLocationTest.java       |   11 +-
 .../entity/rebind/RebindManagerSorterTest.java  |    4 +-
 .../entity/rebind/RebindPolicyTest.java         |   14 +-
 .../rebind/RebindSshMachineLocationTest.java    |    7 +-
 .../entity/rebind/RebindTestFixture.java        |    2 +-
 .../brooklyn/entity/rebind/RebindTestUtils.java |    6 +-
 .../rebind/RecordingRebindExceptionHandler.java |    3 +-
 .../BrooklynMementoPersisterTestFixture.java    |   18 +-
 .../persister/XmlMementoSerializerTest.java     |   14 +-
 .../transformer/CompoundTransformerTest.java    |    2 +-
 .../entity/trait/FailingEntityImpl.java         |    2 +-
 .../entity/trait/StartableMethodsTest.java      |    2 +-
 .../event/feed/function/FunctionFeedTest.java   |    6 +-
 .../feed/http/HttpFeedIntegrationTest.java      |    8 +-
 .../brooklyn/event/feed/http/HttpFeedTest.java  |    2 +-
 .../feed/shell/ShellFeedIntegrationTest.java    |    2 +-
 .../event/feed/ssh/SshFeedIntegrationTest.java  |    4 +-
 .../WindowsPerformanceCounterFeedLiveTest.java  |    6 +-
 .../WindowsPerformanceCounterFeedTest.java      |    6 +-
 .../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 |   10 +-
 .../HighAvailabilityManagerSplitBrainTest.java  |    2 +-
 .../brooklyn/management/ha/HotStandbyTest.java  |    8 +-
 .../brooklyn/management/ha/WarmStandbyTest.java |    2 +-
 .../management/internal/AccessManagerTest.java  |    8 +-
 .../internal/LocalManagementContextTest.java    |    2 +-
 .../osgi/OsgiVersionMoreEntityTest.java         |    2 +-
 .../brooklyn/policy/basic/BasicPolicyTest.java  |    2 +-
 .../brooklyn/policy/basic/EnricherTypeTest.java |    2 +-
 .../policy/basic/PolicySubscriptionTest.java    |    2 +-
 .../brooklyn/policy/basic/PolicyTypeTest.java   |    2 +-
 .../longevity/EntityCleanupLongevityTest.java   |    4 +-
 .../EntityCleanupLongevityTestFixture.java      |    6 +-
 .../qa/longevity/EntityCleanupTest.java         |    4 +-
 .../qa/performance/AbstractPerformanceTest.java |    2 +-
 .../EntityPersistencePerformanceTest.java       |   10 +-
 .../test/java/brooklyn/test/HttpService.java    |    5 +-
 .../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    |    8 +-
 .../PortForwardManagerLocationResolverTest.java |   83 +
 .../access/PortForwardManagerRebindTest.java    |  197 ++
 .../location/access/PortForwardManagerTest.java |  195 ++
 .../location/basic/AbstractLocationTest.java    |  184 ++
 ...regatingMachineProvisioningLocationTest.java |  118 +
 .../basic/ByonLocationResolverTest.java         |  423 +++
 ...stMachineProvisioningLocationRebindTest.java |  129 +
 ...ixedListMachineProvisioningLocationTest.java |  575 ++++
 .../basic/HostLocationResolverTest.java         |  126 +
 .../basic/LegacyAbstractLocationTest.java       |  151 +
 .../basic/LocalhostLocationResolverTest.java    |  265 ++
 ...ocalhostMachineProvisioningLocationTest.java |  215 ++
 .../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       |  121 +
 .../location/basic/PaasLocationTest.java        |   35 +
 .../brooklyn/location/basic/PortRangesTest.java |  130 +
 .../RecordingMachineLocationCustomizer.java     |   71 +
 .../location/basic/SimulatedLocation.java       |  137 +
 .../SingleMachineLocationResolverTest.java      |  131 +
 .../SingleMachineProvisioningLocationTest.java  |   64 +
 .../SshMachineLocationIntegrationTest.java      |  141 +
 .../SshMachineLocationPerformanceTest.java      |  172 ++
 .../SshMachineLocationReuseIntegrationTest.java |  174 ++
 .../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        |    8 +-
 .../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    |    8 +-
 .../demo/HighAvailabilityCassandraCluster.java  |    4 +-
 .../brooklyn/demo/RiakClusterExample.java       |    4 +-
 .../brooklyn/demo/WideAreaCassandraCluster.java |    4 +-
 .../brooklyn/demo/SingleWebServerExample.java   |    2 +-
 .../demo/WebClusterDatabaseExample.java         |    2 +-
 .../demo/WebClusterDatabaseExampleApp.java      |    2 +-
 ...lusterDatabaseExampleAppIntegrationTest.java |    5 +-
 .../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    |    6 +-
 .../brooklyn/policy/os/CreateUserPolicy.java    |    6 +-
 ...AbstractJcloudsSubnetSshMachineLocation.java |   38 +
 .../jclouds/BasicJcloudsLocationCustomizer.java |   99 +
 .../location/jclouds/BrooklynImageChooser.java  |  367 +++
 .../location/jclouds/BrooklynMachinePool.java   |  221 ++
 .../jclouds/ComputeServiceRegistry.java         |   28 +
 .../jclouds/ComputeServiceRegistryImpl.java     |  183 ++
 .../jclouds/JcloudsByonLocationResolver.java    |  184 ++
 .../location/jclouds/JcloudsLocation.java       | 2863 ++++++++++++++++++
 .../location/jclouds/JcloudsLocationConfig.java |  280 ++
 .../jclouds/JcloudsLocationCustomizer.java      |  105 +
 .../jclouds/JcloudsLocationResolver.java        |  227 ++
 .../jclouds/JcloudsMachineLocation.java         |   44 +
 .../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      |   73 +
 .../services/brooklyn.location.LocationResolver |    2 -
 ...pache.brooklyn.api.location.LocationResolver |   20 +
 .../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       |    7 +-
 .../policy/os/CreateUserPolicyLiveTest.java     |   15 +-
 .../policy/os/CreateUserPolicyTest.java         |    9 +-
 .../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    |   74 +
 .../JcloudsLocationRebindMachineLiveTest.java   |  138 +
 .../jclouds/JcloudsLocationResolverTest.java    |  357 +++
 ...ationTemplateOptionsCustomisersLiveTest.java |  107 +
 .../location/jclouds/JcloudsLocationTest.java   |  512 ++++
 .../location/jclouds/JcloudsLoginLiveTest.java  |  407 +++
 .../jclouds/JcloudsMachineNamerTest.java        |   52 +
 ...udsPropertiesFromBrooklynPropertiesTest.java |   99 +
 .../location/jclouds/JcloudsSshingLiveTest.java |   61 +
 .../location/jclouds/LiveTestEntity.java        |   91 +
 .../jclouds/RebindJcloudsLocationLiveTest.java  |  150 +
 .../jclouds/RebindJcloudsLocationTest.java      |   66 +
 ...loudsLocationUserLoginAndConfigLiveTest.java |  249 ++
 ...hineProvisioningLocationJcloudsLiveTest.java |  125 +
 .../jclouds/StandaloneJcloudsLiveTest.java      |  254 ++
 ...oudsLocationSecurityGroupCustomizerTest.java |  311 ++
 .../JcloudsPortForwardingStubbedLiveTest.java   |  196 ++
 .../networking/SecurityGroupLiveTest.java       |   32 +
 .../pool/JcloudsMachinePoolLiveTest.java        |  120 +
 .../provider/AbstractJcloudsLocationTest.java   |  172 ++
 .../provider/AwsEc2LocationLiveTest.java        |   66 +
 .../AwsEc2LocationWindowsLiveTest.groovy        |   95 +
 .../provider/CarrenzaLocationLiveTest.groovy    |  133 +
 .../provider/GoGridLocationLiveTest.groovy      |   52 +
 .../provider/RackspaceLocationLiveTest.java     |   83 +
 .../zone/AwsAvailabilityZoneExtensionTest.java  |  123 +
 ...location-test-various-login-credentials.yaml |   67 -
 ...location-test-various-login-credentials.yaml |   67 +
 parent/pom.xml                                  |    1 -
 .../policy/autoscaling/AutoScalerPolicy.java    |    2 +-
 .../followthesun/DefaultFollowTheSunModel.java  |    5 +-
 .../policy/followthesun/FollowTheSunModel.java  |    2 +-
 .../followthesun/FollowTheSunParameters.java    |    3 +-
 .../policy/followthesun/FollowTheSunPolicy.java |    4 +-
 .../followthesun/FollowTheSunStrategy.java      |    2 +-
 .../policy/ha/ConditionalSuspendPolicy.java     |    2 +-
 .../policy/ha/SshMachineFailureDetector.java    |    4 +-
 .../loadbalancing/BalanceablePoolModel.java     |    2 +-
 .../policy/loadbalancing/BalancingStrategy.java |    3 +-
 .../DefaultBalanceablePoolModel.java            |    3 +-
 .../loadbalancing/LocationConstraint.java       |    2 +-
 .../enricher/HttpLatencyDetectorTest.java       |    3 +-
 .../entity/brooklyn/BrooklynMetricsTest.java    |    3 +-
 .../autoscaling/AutoScalerPolicyRebindTest.java |    6 +-
 .../autoscaling/AutoScalerPolicyTest.java       |    2 +-
 .../AbstractFollowTheSunPolicyTest.java         |    8 +-
 .../followthesun/FollowTheSunModelTest.java     |    5 +-
 .../FollowTheSunPolicySoakTest.java             |    6 +-
 .../followthesun/FollowTheSunPolicyTest.java    |    6 +-
 .../ha/ConnectionFailureDetectorTest.java       |    2 +-
 .../brooklyn/policy/ha/HaPolicyRebindTest.java  |   12 +-
 ...ServiceFailureDetectorStabilizationTest.java |    2 +-
 .../policy/ha/ServiceFailureDetectorTest.java   |    2 +-
 .../brooklyn/policy/ha/ServiceReplacerTest.java |   10 +-
 .../policy/ha/ServiceRestarterTest.java         |    2 +-
 .../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 |   10 +-
 .../brooklyn/entity/basic/SameServerEntity.java |    2 +-
 .../entity/basic/SameServerEntityImpl.java      |    2 +-
 .../brooklyn/entity/basic/SoftwareProcess.java  |    2 +-
 ...wareProcessDriverLifecycleEffectorTasks.java |    4 +-
 .../entity/basic/SoftwareProcessImpl.java       |   18 +-
 .../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 |    6 +-
 .../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 |    6 +-
 .../entity/java/VanillaJavaAppSshDriver.java    |    2 +-
 .../entity/machine/MachineEntityImpl.java       |    5 +-
 .../java/brooklyn/entity/pool/ServerPool.java   |   10 +-
 .../brooklyn/entity/pool/ServerPoolImpl.java    |   18 +-
 .../entity/pool/ServerPoolLocation.java         |   12 +-
 .../entity/pool/ServerPoolLocationResolver.java |   17 +-
 .../entity/service/InitdServiceInstaller.java   |    8 +-
 .../entity/service/SystemServiceEnricher.java   |    6 +-
 .../service/SystemServiceInstallerFactory.java  |    2 +-
 .../entity/software/MachineInitTasks.java       |    2 +-
 .../software/MachineLifecycleEffectorTasks.java |   27 +-
 .../software/ProvidesProvisioningFlags.java     |    3 +-
 .../entity/software/SshEffectorTasks.java       |    8 +-
 .../services/brooklyn.location.LocationResolver |    1 -
 ...pache.brooklyn.api.location.LocationResolver |   19 +
 .../brooklyn/entity/AbstractEc2LiveTest.java    |    8 +-
 .../entity/AbstractGoogleComputeLiveTest.java   |    2 +-
 .../entity/AbstractSoftlayerLiveTest.java       |    2 +-
 ...ctSoftwareProcessRestartIntegrationTest.java |    2 +-
 .../basic/DoNothingSoftwareProcessDriver.java   |    2 +-
 .../entity/basic/SameServerEntityTest.java      |    7 +-
 .../basic/SoftwareProcessEntityLatchTest.java   |    8 +-
 .../basic/SoftwareProcessEntityRebindTest.java  |   12 +-
 .../entity/basic/SoftwareProcessEntityTest.java |   16 +-
 ...SoftwareProcessSshDriverIntegrationTest.java |   10 +-
 .../basic/SoftwareProcessSubclassTest.java      |    2 +-
 ...ftwareProcessAndChildrenIntegrationTest.java |    2 +-
 .../entity/basic/lifecycle/MyEntityImpl.java    |    2 +-
 .../basic/lifecycle/NaiveScriptRunnerTest.java  |    6 +-
 .../basic/lifecycle/ScriptHelperTest.java       |    8 +-
 .../basic/lifecycle/StartStopSshDriverTest.java |    2 +-
 .../BrooklynClusterIntegrationTest.java         |    2 +-
 .../BrooklynNodeIntegrationTest.java            |   10 +-
 .../entity/brooklynnode/BrooklynNodeTest.java   |    6 +-
 .../entity/brooklynnode/MockBrooklynNode.java   |    2 +-
 .../brooklynnode/SameBrooklynNodeImpl.java      |    3 +-
 .../entity/chef/ChefLiveTestSupport.java        |    9 +-
 .../AbstractChefToyMySqlEntityLiveTest.java     |    5 +-
 .../brooklyn/entity/driver/MockSshDriver.java   |    5 +-
 ...rWithAvailabilityZonesMultiLocationTest.java |   14 +-
 .../brooklyn/entity/java/EntityPollingTest.java |    6 +-
 .../java/brooklyn/entity/java/JavaOptsTest.java |    8 +-
 ...SoftwareProcessSshDriverIntegrationTest.java |    8 +-
 .../entity/java/VanillaJavaAppRebindTest.java   |    2 +-
 .../entity/java/VanillaJavaAppTest.java         |    4 +-
 .../machine/MachineEntityEc2LiveTest.java       |    2 +-
 .../entity/pool/AbstractServerPoolTest.java     |   10 +-
 .../entity/pool/ServerPoolLiveTest.java         |    2 +-
 .../pool/ServerPoolLocationResolverTest.java    |   10 +-
 .../brooklyn/entity/pool/ServerPoolTest.java    |    5 +-
 .../service/SystemServiceEnricherTest.java      |    8 +-
 .../entity/software/AbstractDockerLiveTest.java |    2 +-
 .../MachineLifecycleEffectorTasksTest.java      |    2 +-
 .../entity/software/SoftwareEffectorTest.java   |    8 +-
 .../entity/software/SshEffectorTasksTest.java   |    9 +-
 .../software/http/HttpRequestSensorTest.java    |    2 +-
 .../mysql/AbstractToyMySqlEntityTest.java       |   10 +-
 .../mysql/DynamicToyMySqlEntityBuilder.java     |   12 +-
 .../mysql/DynamicToyMySqlEntityTest.java        |    2 +-
 .../software/ssh/SshCommandIntegrationTest.java |    6 +-
 .../PortAttributeSensorAndConfigKeyTest.java    |    7 +-
 .../brooklyn/event/feed/jmx/JmxFeedTest.java    |    7 +-
 .../event/feed/jmx/RebindJmxFeedTest.java       |    8 +-
 .../basic/MachineDetailsEc2LiveTest.java        |   68 -
 .../MachineDetailsGoogleComputeLiveTest.java    |   66 -
 .../basic/WinRmMachineLocationLiveTest.java     |   93 -
 .../basic/WinRmMachineLocationTest.java         |   44 -
 .../usage/ApplicationUsageTrackingTest.java     |    2 +-
 .../usage/LocationUsageTrackingTest.java        |   12 +-
 .../management/usage/UsageListenerTest.java     |    4 +-
 .../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      |    6 +-
 .../entity/database/mysql/MySqlClusterImpl.java |    2 +-
 .../entity/database/mysql/MySqlNode.java        |    2 +-
 .../entity/database/mysql/MySqlNodeImpl.java    |    4 +-
 .../entity/database/mysql/MySqlSshDriver.java   |    8 +-
 .../database/postgresql/PostgreSqlNode.java     |    2 +-
 .../PostgreSqlNodeChefImplFromScratch.java      |    4 +-
 .../postgresql/PostgreSqlSshDriver.java         |    6 +-
 .../database/rubyrep/RubyRepSshDriver.java      |    2 +-
 .../crate/CrateNodeIntegrationTest.java         |    2 +-
 .../mariadb/MariaDbIntegrationTest.java         |    2 +-
 .../database/mariadb/MariaDbLiveEc2Test.java    |    5 +-
 .../mariadb/MariaDbLiveRackspaceTest.java       |    4 +-
 .../database/mysql/MySqlClusterLiveEc2Test.java |    3 +-
 .../mysql/MySqlClusterLiveSoftlayerTest.java    |    3 +-
 .../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 |    8 +-
 .../postgresql/PostgreSqlEc2LiveTest.java       |    2 +-
 .../postgresql/PostgreSqlGceLiveTest.java       |    2 +-
 .../postgresql/PostgreSqlIntegrationTest.java   |    2 +-
 .../postgresql/PostgreSqlRackspaceLiveTest.java |    6 +-
 .../PostgreSqlRebindIntegrationTest.java        |    2 +-
 .../database/rubyrep/RubyRepEc2LiveTest.java    |    5 +-
 .../rubyrep/RubyRepIntegrationTest.java         |    8 +-
 .../rubyrep/RubyRepRackspaceLiveTest.java       |    8 +-
 .../messaging/activemq/ActiveMQSshDriver.java   |    2 +-
 .../kafka/AbstractfKafkaSshDriver.java          |    2 +-
 .../entity/messaging/kafka/KafkaBroker.java     |    2 +-
 .../messaging/kafka/KafkaBrokerSshDriver.java   |    2 +-
 .../entity/messaging/kafka/KafkaCluster.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 |    5 +-
 .../entity/zookeeper/ZooKeeperSshDriver.java    |    2 +-
 .../messaging/activemq/ActiveMQEc2LiveTest.java |    2 +-
 .../activemq/ActiveMQGoogleComputeLiveTest.java |    2 +-
 .../activemq/ActiveMQIntegrationTest.java       |    2 +-
 .../messaging/kafka/KafkaIntegrationTest.java   |    8 +-
 .../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 |    5 +-
 .../storm/StormAbstractCloudLiveTest.java       |    2 +-
 .../messaging/storm/StormEc2LiveTest.java       |    2 +-
 .../zookeeper/ZooKeeperEc2LiveTest.java         |    2 +-
 .../zookeeper/ZooKeeperEnsembleLiveTest.java    |    2 +-
 .../entity/monitoring/monit/MonitNodeImpl.java  |    6 +-
 .../entity/monitoring/monit/MonitSshDriver.java |    6 +-
 .../monitoring/monit/MonitIntegrationTest.java  |    6 +-
 .../entity/network/bind/BindDnsServer.java      |    2 +-
 .../entity/network/bind/BindDnsServerImpl.java  |    8 +-
 .../network/bind/BindDnsServerSshDriver.java    |    2 +-
 .../network/bind/BindDnsServerByonLiveTest.java |    4 +-
 .../network/bind/BindDnsServerEc2LiveTest.java  |    3 +-
 .../bind/BindDnsServerIntegrationTest.java      |    2 +-
 .../network/bind/BindDnsServerLiveTest.java     |    4 +-
 .../bind/BindDnsServerSoftlayerLiveTest.java    |    3 +-
 .../bind/DoNothingSoftwareProcessDriver.java    |    2 +-
 .../network/bind/TestBindDnsServerImpl.java     |    2 +-
 .../cassandra/CassandraDatacenterImpl.java      |    8 +-
 .../entity/nosql/cassandra/CassandraFabric.java |    2 +-
 .../nosql/cassandra/CassandraFabricImpl.java    |    4 +-
 .../entity/nosql/cassandra/CassandraNode.java   |    2 +-
 .../nosql/cassandra/CassandraNodeImpl.java      |   10 +-
 .../nosql/cassandra/CassandraNodeSshDriver.java |   10 +-
 .../nosql/couchbase/CouchbaseClusterImpl.java   |    6 +-
 .../nosql/couchbase/CouchbaseNodeImpl.java      |    8 +-
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |    8 +-
 .../couchbase/CouchbaseSyncGatewayImpl.java     |    2 +-
 .../CouchbaseSyncGatewaySshDriver.java          |    6 +-
 .../nosql/couchdb/CouchDBNodeSshDriver.java     |    6 +-
 .../nosql/elasticsearch/ElasticSearchNode.java  |    2 +-
 .../elasticsearch/ElasticSearchNodeImpl.java    |    2 +-
 .../ElasticSearchNodeSshDriver.java             |    2 +-
 .../nosql/mongodb/AbstractMongoDBSshDriver.java |    6 +-
 .../nosql/mongodb/MongoDBClientSshDriver.java   |    2 +-
 .../nosql/mongodb/MongoDBClientSupport.java     |    3 +-
 .../nosql/mongodb/MongoDBReplicaSetImpl.java    |    4 +-
 .../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      |    4 +-
 .../sharding/MongoDBRouterSshDriver.java        |    2 +-
 .../sharding/MongoDBShardClusterImpl.java       |    3 +-
 .../sharding/MongoDBShardedDeploymentImpl.java  |    4 +-
 .../entity/nosql/redis/RedisClusterImpl.java    |    2 +-
 .../entity/nosql/redis/RedisStoreImpl.java      |    7 +-
 .../entity/nosql/redis/RedisStoreSshDriver.java |    6 +-
 .../entity/nosql/riak/RiakClusterImpl.java      |    4 +-
 .../entity/nosql/riak/RiakNodeImpl.java         |    8 +-
 .../entity/nosql/riak/RiakNodeSshDriver.java    |    7 +-
 .../brooklyn/entity/nosql/solr/SolrServer.java  |    2 +-
 .../entity/nosql/solr/SolrServerImpl.java       |    2 +-
 .../entity/nosql/solr/SolrServerSshDriver.java  |    8 +-
 .../cassandra/AbstractCassandraNodeTest.java    |    4 +-
 .../CassandraDatacenterIntegrationTest.java     |    4 +-
 .../cassandra/CassandraDatacenterLiveTest.java  |    4 +-
 ...assandraDatacenterRebindIntegrationTest.java |    4 +-
 .../cassandra/CassandraDatacenterTest.java      |    8 +-
 .../nosql/cassandra/CassandraFabricTest.java    |   10 +-
 .../cassandra/CassandraNodeEc2LiveTest.java     |    3 +-
 .../nosql/couchbase/CouchbaseOfflineTest.java   |    5 +-
 .../CouchbaseSyncGatewayEc2LiveTest.java        |    5 +-
 .../nosql/couchdb/AbstractCouchDBNodeTest.java  |    7 +-
 .../nosql/couchdb/CouchDBClusterLiveTest.java   |    4 +-
 .../nosql/couchdb/CouchDBNodeEc2LiveTest.java   |    3 +-
 .../ElasticSearchClusterIntegrationTest.java    |    4 +-
 .../ElasticSearchNodeIntegrationTest.java       |    7 +-
 .../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      |    9 +-
 .../entity/nosql/redis/RedisEc2LiveTest.java    |    3 +-
 .../nosql/redis/RedisIntegrationTest.java       |    7 +-
 .../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      |    4 +-
 .../nosql/solr/SolrServerEc2LiveTest.java       |    3 +-
 .../entity/osgi/karaf/KarafSshDriver.java       |    2 +-
 .../osgi/karaf/KarafContainerEc2LiveTest.java   |    2 +-
 .../entity/osgi/karaf/KarafContainerTest.java   |    6 +-
 .../entity/dns/AbstractGeoDnsService.java       |    2 +-
 .../entity/dns/AbstractGeoDnsServiceImpl.java   |    6 +-
 .../geoscaling/GeoscalingDnsServiceImpl.java    |    2 +-
 .../geoscaling/GeoscalingScriptGenerator.java   |    2 +-
 .../entity/proxy/AbstractControllerImpl.java    |   10 +-
 .../AbstractNonProvisionedControllerImpl.java   |    4 +-
 .../entity/proxy/nginx/NginxControllerImpl.java |    2 +-
 .../entity/proxy/nginx/NginxSshDriver.java      |    9 +-
 .../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      |    6 +-
 .../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   |   24 +-
 .../geoscaling/GeoscalingIntegrationTest.java   |   14 +-
 .../GeoscalingScriptGeneratorTest.java          |    3 +-
 .../entity/proxy/AbstractControllerTest.java    |   16 +-
 .../brooklyn/entity/proxy/StubAppServer.java    |    8 +-
 .../brooklyn/entity/proxy/UrlMappingTest.java   |    6 +-
 .../nginx/NginxClusterIntegrationTest.java      |    8 +-
 .../entity/proxy/nginx/NginxEc2LiveTest.java    |    3 +-
 .../nginx/NginxHttpsSslIntegrationTest.java     |    7 +-
 .../proxy/nginx/NginxIntegrationTest.java       |    3 +-
 .../proxy/nginx/NginxLightIntegrationTest.java  |    4 +-
 .../proxy/nginx/NginxRebindIntegrationTest.java |    6 +-
 .../nginx/NginxRebindWithHaIntegrationTest.java |    9 +-
 .../nginx/NginxUrlMappingIntegrationTest.java   |    4 +-
 .../proxy/nginx/NginxWebClusterEc2LiveTest.java |    8 +-
 .../AbstractWebAppFixtureIntegrationTest.java   |    6 +-
 ...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      |    6 +-
 .../webapp/WebAppConcurrentDeployTest.java      |    8 +-
 .../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     |    6 +-
 .../NodeJsWebAppSimpleIntegrationTest.java      |   10 +-
 .../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 +-
 .../BrooklynEntityDecorationResolver.java       |    8 +-
 .../creation/BrooklynYamlLocationResolver.java  |    4 +-
 .../BrooklynYamlTypeInstantiatorTest.java       |    2 +-
 .../camp/brooklyn/ByonLocationsYamlTest.java    |   18 +-
 .../brooklyn/EmptySoftwareProcessYamlTest.java  |    6 +-
 .../camp/brooklyn/EnrichersYamlTest.java        |    2 +-
 .../camp/brooklyn/EntitiesYamlTest.java         |    2 +-
 .../brooklyn/JavaWebAppsIntegrationTest.java    |    2 +-
 .../camp/brooklyn/LocationsYamlTest.java        |   12 +-
 .../camp/brooklyn/PoliciesYamlTest.java         |    2 +-
 .../brooklyn/TestEntityWithInitConfigImpl.java  |    2 +-
 .../CatalogOsgiVersionMoreEntityTest.java       |    6 +-
 .../brooklyn/catalog/CatalogYamlCombiTest.java  |    2 +-
 .../catalog/CatalogYamlLocationTest.java        |   10 +-
 .../brooklyn/catalog/CatalogYamlPolicyTest.java |    2 +-
 .../brooklyn/catalog/CatalogYamlRebindTest.java |    4 +-
 .../org/apache/brooklyn/cli/CloudExplorer.java  |   12 +-
 .../org/apache/brooklyn/cli/ItemLister.java     |    8 +-
 .../apache/brooklyn/cli/lister/ClassFinder.java |    4 +-
 .../brooklyn/cli/lister/ItemDescriptors.java    |    2 +-
 .../java/org/apache/brooklyn/cli/CliTest.java   |   13 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |   12 +-
 .../brooklyn/launcher/BrooklynWebServer.java    |    6 +-
 .../launcher/config/BrooklynGlobalConfig.java   |    2 +-
 .../brooklynnode/BrooklynNodeRestTest.java      |    2 +-
 .../BrooklynLauncherRebindTestFixture.java      |    2 +-
 ...lynLauncherRebindToCloudObjectStoreTest.java |    2 +-
 .../brooklyn/launcher/BrooklynLauncherTest.java |    6 +-
 .../qa/load/SimulatedJBoss7ServerImpl.java      |    4 +-
 .../qa/load/SimulatedMySqlNodeImpl.java         |    2 +-
 .../qa/load/SimulatedNginxControllerImpl.java   |    6 +-
 .../brooklyn/qa/load/SimulatedTheeTierApp.java  |    2 +-
 .../SoftlayerObtainPrivateLiveTest.java         |    4 +-
 .../org/apache/brooklyn/qa/load/LoadTest.java   |    3 +-
 .../qa/longevity/webcluster/WebClusterApp.java  |    2 +-
 .../brooklyn/rest/domain/LocationSpec.java      |    2 +-
 .../ApplicationResourceIntegrationTest.java     |    2 +-
 .../rest/client/BrooklynApiRestClientTest.java  |    3 +-
 .../apache/brooklyn/rest/BrooklynWebConfig.java |    3 +-
 .../rest/resources/ApplicationResource.java     |    2 +-
 .../rest/resources/CatalogResource.java         |    8 +-
 .../brooklyn/rest/resources/EntityResource.java |    2 +-
 .../rest/resources/LocationResource.java        |    6 +-
 .../rest/resources/PolicyConfigResource.java    |    2 +-
 .../brooklyn/rest/resources/PolicyResource.java |    4 +-
 .../rest/transform/ApplicationTransformer.java  |    2 +-
 .../rest/transform/CatalogTransformer.java      |    8 +-
 .../rest/transform/LocationTransformer.java     |   10 +-
 .../rest/transform/PolicyTransformer.java       |    2 +-
 .../rest/util/BrooklynRestResourceUtils.java    |    6 +-
 .../brooklyn/rest/util/EntityLocationUtils.java |    5 +-
 .../rest/util/json/BidiSerialization.java       |    3 +-
 .../rest/resources/ApplicationResourceTest.java |    8 +-
 .../rest/resources/LocationResourceTest.java    |    7 +-
 .../rest/resources/ScriptResourceTest.java      |    2 +-
 .../rest/resources/UsageResourceTest.java       |   13 +-
 .../rest/testing/BrooklynRestApiTest.java       |    6 +-
 .../testing/mocks/RestMockSimpleEntity.java     |    2 +-
 .../util/BrooklynRestResourceUtilsTest.java     |    2 +-
 .../rest/util/EntityLocationUtilsTest.java      |    8 +-
 .../brooklyn/osgi/tests/SimpleLocation.java     |    2 +-
 .../brooklyn/osgi/tests/more/MoreLocation.java  |    2 +-
 .../osgi/tests/more/MoreEntityImpl.java         |    2 +-
 .../osgi/tests/more/MoreEntityImpl.java         |    2 +-
 .../brooklyn/osgi/tests/more/MoreLocation.java  |    2 +-
 1141 files changed, 36004 insertions(+), 35778 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2a0d9e4a/software/database/src/main/java/brooklyn/entity/database/mysql/MySqlClusterImpl.java
----------------------------------------------------------------------


Mime
View raw message