You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/08/20 00:54:24 UTC
[36/36] incubator-brooklyn git commit: This closes #854
This closes #854
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/147f9ec4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/147f9ec4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/147f9ec4
Branch: refs/heads/master
Commit: 147f9ec446a6bb59c8550e62eacc5c0970b73227
Parents: 9e80f33 6f15e8a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Aug 19 23:52:04 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Aug 19 23:52:04 2015 +0100
----------------------------------------------------------------------
.../apache/brooklyn/api/entity/Application.java | 2 +-
.../org/apache/brooklyn/api/entity/Entity.java | 8 +-
.../brooklyn/api/entity/EntityInitializer.java | 2 -
.../apache/brooklyn/api/entity/EntityLocal.java | 176 ++
.../api/entity/drivers/EntityDriver.java | 2 +-
.../brooklyn/api/internal/EntityLocal.java | 178 --
.../BrooklynClassLoadingContext.java | 50 -
.../api/mgmt/rebind/RebindExceptionHandler.java | 2 +-
.../core/BrooklynFeatureEnablement.java | 209 +++
.../apache/brooklyn/core/BrooklynLogging.java | 2 +-
.../brooklyn/core/annotation/Effector.java | 33 +
.../brooklyn/core/annotation/EffectorParam.java | 42 +
.../catalog/internal/BasicBrooklynCatalog.java | 10 +-
.../catalog/internal/CatalogClasspathDo.java | 2 +-
.../core/catalog/internal/CatalogUtils.java | 4 +-
.../brooklyn/core/config/BasicConfigKey.java | 2 +-
.../apache/brooklyn/core/config/ConfigKeys.java | 8 +-
.../config/internal/AbstractConfigMapImpl.java | 2 +-
.../core/config/render/RendererHints.java | 2 +-
.../core/effector/AbstractEffector.java | 90 +
.../core/effector/AddChildrenEffector.java | 117 ++
.../brooklyn/core/effector/AddEffector.java | 116 ++
.../brooklyn/core/effector/AddSensor.java | 126 ++
.../core/effector/BasicParameterType.java | 116 ++
.../brooklyn/core/effector/EffectorAndBody.java | 60 +
.../brooklyn/core/effector/EffectorBase.java | 106 ++
.../brooklyn/core/effector/EffectorBody.java | 100 +
.../brooklyn/core/effector/EffectorTasks.java | 229 +++
.../core/effector/EffectorWithBody.java | 32 +
.../brooklyn/core/effector/Effectors.java | 202 ++
.../core/effector/ExplicitEffector.java | 74 +
.../brooklyn/core/effector/MethodEffector.java | 180 ++
.../core/effector/ssh/SshEffectorTasks.java | 335 ++++
.../core/enricher/AbstractEnricher.java | 115 ++
.../core/enricher/EnricherDynamicType.java | 43 +
.../core/enricher/EnricherTypeSnapshot.java | 39 +
.../core/entity/AbstractApplication.java | 264 +++
.../brooklyn/core/entity/AbstractEntity.java | 1739 ++++++++++++++++++
.../apache/brooklyn/core/entity/Attributes.java | 169 ++
.../core/entity/BrooklynConfigKeys.java | 188 ++
.../apache/brooklyn/core/entity/Entities.java | 1108 +++++++++++
.../brooklyn/core/entity/EntityAdjuncts.java | 70 +
.../core/entity/EntityAndAttribute.java | 107 ++
.../brooklyn/core/entity/EntityDynamicType.java | 339 ++++
.../brooklyn/core/entity/EntityFunctions.java | 153 ++
.../core/entity/EntityInitializers.java | 49 +
.../brooklyn/core/entity/EntityInternal.java | 201 ++
.../brooklyn/core/entity/EntityPredicates.java | 451 +++++
.../brooklyn/core/entity/EntitySuppliers.java | 47 +
.../brooklyn/core/entity/EntityTasks.java | 81 +
.../core/entity/EntityTypeSnapshot.java | 126 ++
.../brooklyn/core/entity/EntityTypes.java | 28 +
.../core/entity/StartableApplication.java | 25 +
.../drivers/BasicEntityDriverManager.java | 56 +
.../drivers/ReflectiveEntityDriverFactory.java | 277 +++
.../drivers/RegistryEntityDriverFactory.java | 127 ++
.../downloads/BasicDownloadRequirement.java | 85 +
.../downloads/BasicDownloadResolver.java | 66 +
.../drivers/downloads/BasicDownloadTargets.java | 121 ++
.../downloads/BasicDownloadsManager.java | 161 ++
.../DownloadProducerFromCloudsoftRepo.java | 83 +
.../DownloadProducerFromLocalRepo.java | 84 +
.../DownloadProducerFromProperties.java | 344 ++++
.../DownloadProducerFromUrlAttribute.java | 63 +
.../drivers/downloads/DownloadSubstituters.java | 172 ++
.../drivers/downloads/FilenameProducers.java | 64 +
.../AbstractConfigurableEntityFactory.java | 82 +
.../core/entity/factory/ApplicationBuilder.java | 247 +++
.../factory/BasicConfigurableEntityFactory.java | 75 +
.../entity/factory/ClosureEntityFactory.java | 53 +
.../factory/ConfigurableEntityFactory.java | 33 +
...figurableEntityFactoryFromEntityFactory.java | 45 +
.../core/entity/factory/EntityFactory.java | 32 +
.../factory/EntityFactoryForLocation.java | 30 +
.../internal/ConfigMapViewWithStringKeys.java | 130 ++
.../core/entity/internal/EntityConfigMap.java | 306 +++
.../internal/EntityTransientCopyInternal.java | 121 ++
.../core/entity/lifecycle/Lifecycle.java | 185 ++
.../core/entity/lifecycle/PolicyDescriptor.java | 68 +
.../core/entity/lifecycle/QuorumCheck.java | 108 ++
.../entity/lifecycle/ServiceStateLogic.java | 639 +++++++
.../brooklyn/core/entity/trait/Changeable.java | 35 +
.../core/entity/trait/MemberReplaceable.java | 45 +
.../brooklyn/core/entity/trait/Resizable.java | 50 +
.../brooklyn/core/entity/trait/Startable.java | 123 ++
.../core/entity/trait/StartableMethods.java | 125 ++
.../apache/brooklyn/core/feed/AbstractFeed.java | 240 +++
.../core/feed/AttributePollHandler.java | 248 +++
.../brooklyn/core/feed/ConfigToAttributes.java | 59 +
.../core/feed/DelegatingPollHandler.java | 96 +
.../apache/brooklyn/core/feed/FeedConfig.java | 297 +++
.../apache/brooklyn/core/feed/PollConfig.java | 85 +
.../apache/brooklyn/core/feed/PollHandler.java | 38 +
.../org/apache/brooklyn/core/feed/Poller.java | 205 +++
.../internal/BrooklynFeatureEnablement.java | 208 ---
.../core/internal/BrooklynInitialization.java | 2 +-
.../core/location/AbstractLocation.java | 709 +++++++
.../core/location/AbstractLocationResolver.java | 188 ++
.../AggregatingMachineProvisioningLocation.java | 141 ++
.../core/location/BasicHardwareDetails.java | 56 +
.../core/location/BasicLocationDefinition.java | 85 +
.../core/location/BasicLocationRegistry.java | 489 +++++
.../core/location/BasicMachineDetails.java | 183 ++
.../core/location/BasicMachineMetadata.java | 84 +
.../brooklyn/core/location/BasicOsDetails.java | 123 ++
.../core/location/CatalogLocationResolver.java | 79 +
.../location/DefinedLocationByIdResolver.java | 74 +
.../location/DeprecatedKeysMappingBuilder.java | 66 +
.../core/location/HasSubnetHostname.java | 32 +
.../core/location/LocationConfigKeys.java | 79 +
.../core/location/LocationConfigUtils.java | 559 ++++++
.../core/location/LocationPredicates.java | 108 ++
...ocationPropertiesFromBrooklynProperties.java | 223 +++
.../brooklyn/core/location/Locations.java | 160 ++
.../apache/brooklyn/core/location/Machines.java | 191 ++
.../core/location/NamedLocationResolver.java | 97 +
.../brooklyn/core/location/PortRanges.java | 257 +++
.../core/location/RegistryLocationResolver.java | 42 +
.../core/location/SupportsPortForwarding.java | 39 +
.../location/access/BrooklynAccessUtils.java | 154 ++
.../location/access/PortForwardManager.java | 328 ++++
.../access/PortForwardManagerAuthority.java | 46 +
.../access/PortForwardManagerClient.java | 405 ++++
.../location/access/PortForwardManagerImpl.java | 505 +++++
.../PortForwardManagerLocationResolver.java | 89 +
.../core/location/access/PortMapping.java | 101 +
.../AbstractAvailabilityZoneExtension.java | 82 +
...bstractCloudMachineProvisioningLocation.java | 97 +
.../cloud/AvailabilityZoneExtension.java | 54 +
.../location/cloud/CloudLocationConfig.java | 116 ++
.../cloud/names/AbstractCloudMachineNamer.java | 150 ++
.../cloud/names/BasicCloudMachineNamer.java | 91 +
.../location/cloud/names/CloudMachineNamer.java | 61 +
.../cloud/names/CustomMachineNamer.java | 72 +
.../core/location/dynamic/DynamicLocation.java | 50 +
.../core/location/dynamic/LocationOwner.java | 85 +
.../location/geo/GeoBytesHostGeoLookup.java | 104 ++
.../core/location/geo/HasHostGeoInfo.java | 25 +
.../brooklyn/core/location/geo/HostGeoInfo.java | 205 +++
.../core/location/geo/HostGeoLookup.java | 27 +
.../location/geo/LocalhostExternalIpLoader.java | 177 ++
.../location/geo/MaxMind2HostGeoLookup.java | 114 ++
.../core/location/geo/UtraceHostGeoLookup.java | 209 +++
.../location/internal/LocationDynamicType.java | 40 +
.../location/internal/LocationInternal.java | 93 +
.../location/internal/LocationTypeSnapshot.java | 40 +
.../core/mgmt/EntityManagementUtils.java | 10 +-
.../AbstractBrooklynClassLoadingContext.java | 1 -
.../BrooklynClassLoadingContext.java | 50 +
.../BrooklynClassLoadingContextSequential.java | 1 -
...ssLoaderFromBrooklynClassLoadingContext.java | 2 -
.../core/mgmt/entitlement/Entitlements.java | 2 +-
.../mgmt/ha/HighAvailabilityManagerImpl.java | 4 +-
.../internal/AbstractManagementContext.java | 14 +-
.../mgmt/internal/BrooklynGarbageCollector.java | 2 +-
.../mgmt/internal/BrooklynShutdownHooks.java | 6 +-
.../core/mgmt/internal/EffectorUtils.java | 6 +-
.../mgmt/internal/EntityManagementSupport.java | 6 +-
.../core/mgmt/internal/LocalEntityManager.java | 10 +-
.../mgmt/internal/LocalLocationManager.java | 6 +-
.../mgmt/internal/LocalManagementContext.java | 6 +-
.../mgmt/internal/LocalSubscriptionManager.java | 2 +-
.../core/mgmt/internal/LocalUsageManager.java | 65 +-
.../internal/ManagementContextInternal.java | 1 +
.../NonDeploymentManagementContext.java | 3 +-
.../internal/NonDeploymentUsageManager.java | 15 +-
.../core/mgmt/internal/UsageListener.java | 103 --
.../core/mgmt/internal/UsageManager.java | 165 --
.../mgmt/persist/BrooklynPersistenceUtils.java | 4 +-
.../core/mgmt/persist/XmlMementoSerializer.java | 12 +-
.../rebind/ActivePartialRebindIteration.java | 2 +-
.../mgmt/rebind/BasicEnricherRebindSupport.java | 2 +-
.../mgmt/rebind/BasicEntityRebindSupport.java | 12 +-
.../mgmt/rebind/BasicFeedRebindSupport.java | 2 +-
.../mgmt/rebind/BasicLocationRebindSupport.java | 2 +-
.../mgmt/rebind/BasicPolicyRebindSupport.java | 2 +-
.../rebind/ImmediateDeltaChangeListener.java | 2 +-
.../mgmt/rebind/InitialFullRebindIteration.java | 2 +-
.../rebind/PeriodicDeltaChangeListener.java | 4 +-
.../mgmt/rebind/RebindExceptionHandlerImpl.java | 2 +-
.../core/mgmt/rebind/RebindIteration.java | 20 +-
.../core/mgmt/rebind/RebindManagerImpl.java | 6 +-
.../core/mgmt/rebind/dto/AbstractMemento.java | 2 +-
.../mgmt/rebind/dto/BasicEnricherMemento.java | 2 +-
.../mgmt/rebind/dto/BasicEntityMemento.java | 4 +-
.../core/mgmt/rebind/dto/BasicFeedMemento.java | 2 +-
.../mgmt/rebind/dto/BasicLocationMemento.java | 2 +-
.../mgmt/rebind/dto/BasicPolicyMemento.java | 2 +-
.../mgmt/rebind/dto/MementosGenerators.java | 12 +-
.../core/mgmt/usage/ApplicationUsage.java | 2 +-
.../brooklyn/core/mgmt/usage/LocationUsage.java | 2 +-
.../brooklyn/core/mgmt/usage/UsageListener.java | 103 ++
.../brooklyn/core/mgmt/usage/UsageManager.java | 165 ++
.../core/objs/AbstractBrooklynObject.java | 2 +-
.../core/objs/AbstractEntityAdjunct.java | 10 +-
.../brooklyn/core/objs/AdjunctConfigMap.java | 6 +-
.../brooklyn/core/objs/BrooklynTypes.java | 6 +-
.../core/objs/proxy/EntityProxyImpl.java | 12 +-
.../core/objs/proxy/InternalEntityFactory.java | 12 +-
.../objs/proxy/InternalLocationFactory.java | 4 +-
.../core/objs/proxy/InternalPolicyFactory.java | 6 +-
.../brooklyn/core/policy/AbstractPolicy.java | 119 ++
.../apache/brooklyn/core/policy/Policies.java | 73 +
.../brooklyn/core/policy/PolicyDynamicType.java | 43 +
.../core/policy/PolicyTypeSnapshot.java | 39 +
.../brooklyn/core/sensor/AttributeMap.java | 202 ++
.../sensor/AttributeSensorAndConfigKey.java | 147 ++
.../core/sensor/BasicAttributeSensor.java | 62 +
.../BasicAttributeSensorAndConfigKey.java | 114 ++
.../core/sensor/BasicNotificationSensor.java | 36 +
.../brooklyn/core/sensor/BasicSensor.java | 114 ++
.../brooklyn/core/sensor/BasicSensorEvent.java | 112 ++
.../core/sensor/DependentConfiguration.java | 823 +++++++++
.../brooklyn/core/sensor/HttpRequestSensor.java | 96 +
.../sensor/PortAttributeSensorAndConfigKey.java | 141 ++
.../apache/brooklyn/core/sensor/Sensors.java | 164 ++
.../brooklyn/core/sensor/StaticSensor.java | 72 +
...platedStringAttributeSensorAndConfigKey.java | 66 +
.../core/server/entity/BrooklynMetrics.java | 4 +-
.../core/server/entity/BrooklynMetricsImpl.java | 2 +-
.../effector/core/AbstractEffector.java | 90 -
.../effector/core/AddChildrenEffector.java | 117 --
.../brooklyn/effector/core/AddEffector.java | 116 --
.../brooklyn/effector/core/AddSensor.java | 126 --
.../effector/core/BasicParameterType.java | 116 --
.../brooklyn/effector/core/EffectorAndBody.java | 60 -
.../brooklyn/effector/core/EffectorBase.java | 106 --
.../brooklyn/effector/core/EffectorBody.java | 100 -
.../brooklyn/effector/core/EffectorTasks.java | 229 ---
.../effector/core/EffectorWithBody.java | 32 -
.../brooklyn/effector/core/Effectors.java | 202 --
.../effector/core/ExplicitEffector.java | 74 -
.../brooklyn/effector/core/MethodEffector.java | 180 --
.../stock/AbstractAggregatingEnricher.java | 174 ++
.../enricher/stock/AbstractAggregator.java | 238 +++
.../stock/AbstractMultipleSensorAggregator.java | 169 ++
.../enricher/stock/AbstractTransformer.java | 101 +
.../stock/AbstractTransformingEnricher.java | 38 +
.../stock/AbstractTypeTransformingEnricher.java | 68 +
.../brooklyn/enricher/stock/AddingEnricher.java | 107 ++
.../brooklyn/enricher/stock/Aggregator.java | 222 +++
.../brooklyn/enricher/stock/Combiner.java | 138 ++
.../stock/CustomAggregatingEnricher.java | 320 ++++
.../brooklyn/enricher/stock/Enrichers.java | 825 +++++++++
.../apache/brooklyn/enricher/stock/Joiner.java | 127 ++
.../brooklyn/enricher/stock/Propagator.java | 201 ++
.../stock/SensorPropagatingEnricher.java | 181 ++
.../stock/SensorTransformingEnricher.java | 106 ++
.../brooklyn/enricher/stock/Transformer.java | 103 ++
.../brooklyn/enricher/stock/UpdatingMap.java | 159 ++
.../YamlRollingTimeWindowMeanEnricher.java | 178 ++
.../stock/YamlTimeWeightedDeltaEnricher.java | 83 +
.../brooklyn/entity/annotation/Effector.java | 33 -
.../entity/annotation/EffectorParam.java | 42 -
.../entity/core/AbstractApplication.java | 264 ---
.../brooklyn/entity/core/AbstractEntity.java | 1739 ------------------
.../apache/brooklyn/entity/core/Attributes.java | 169 --
.../entity/core/BrooklynConfigKeys.java | 188 --
.../apache/brooklyn/entity/core/Entities.java | 1108 -----------
.../brooklyn/entity/core/EntityAdjuncts.java | 70 -
.../entity/core/EntityAndAttribute.java | 107 --
.../brooklyn/entity/core/EntityDynamicType.java | 339 ----
.../brooklyn/entity/core/EntityFunctions.java | 153 --
.../entity/core/EntityInitializers.java | 49 -
.../brooklyn/entity/core/EntityInternal.java | 201 --
.../brooklyn/entity/core/EntityPredicates.java | 451 -----
.../brooklyn/entity/core/EntitySuppliers.java | 47 -
.../brooklyn/entity/core/EntityTasks.java | 81 -
.../entity/core/EntityTypeSnapshot.java | 126 --
.../brooklyn/entity/core/EntityTypes.java | 28 -
.../entity/core/StartableApplication.java | 25 -
.../internal/ConfigMapViewWithStringKeys.java | 130 --
.../entity/core/internal/EntityConfigMap.java | 306 ---
.../internal/EntityTransientCopyInternal.java | 121 --
.../drivers/BasicEntityDriverManager.java | 56 -
.../drivers/ReflectiveEntityDriverFactory.java | 277 ---
.../drivers/RegistryEntityDriverFactory.java | 127 --
.../downloads/BasicDownloadRequirement.java | 85 -
.../downloads/BasicDownloadResolver.java | 66 -
.../drivers/downloads/BasicDownloadTargets.java | 121 --
.../downloads/BasicDownloadsManager.java | 161 --
.../DownloadProducerFromCloudsoftRepo.java | 83 -
.../DownloadProducerFromLocalRepo.java | 84 -
.../DownloadProducerFromProperties.java | 344 ----
.../DownloadProducerFromUrlAttribute.java | 63 -
.../drivers/downloads/DownloadSubstituters.java | 172 --
.../drivers/downloads/FilenameProducers.java | 64 -
.../AbstractConfigurableEntityFactory.java | 82 -
.../entity/factory/ApplicationBuilder.java | 247 ---
.../factory/BasicConfigurableEntityFactory.java | 75 -
.../entity/factory/ClosureEntityFactory.java | 53 -
.../factory/ConfigurableEntityFactory.java | 33 -
...figurableEntityFactoryFromEntityFactory.java | 45 -
.../brooklyn/entity/factory/EntityFactory.java | 32 -
.../factory/EntityFactoryForLocation.java | 30 -
.../brooklyn/entity/group/AbstractGroup.java | 6 +-
.../entity/group/AbstractGroupImpl.java | 10 +-
.../group/AbstractMembershipTrackingPolicy.java | 6 +-
.../apache/brooklyn/entity/group/Cluster.java | 4 +-
.../brooklyn/entity/group/DynamicCluster.java | 20 +-
.../entity/group/DynamicClusterImpl.java | 26 +-
.../brooklyn/entity/group/DynamicFabric.java | 10 +-
.../entity/group/DynamicFabricImpl.java | 28 +-
.../brooklyn/entity/group/DynamicGroup.java | 8 +-
.../brooklyn/entity/group/DynamicGroupImpl.java | 2 +-
.../entity/group/DynamicMultiGroup.java | 2 +-
.../entity/group/DynamicMultiGroupImpl.java | 6 +-
.../entity/group/DynamicRegionsFabric.java | 6 +-
.../entity/group/DynamicRegionsFabricImpl.java | 6 +-
.../brooklyn/entity/group/QuarantineGroup.java | 4 +-
.../entity/group/QuarantineGroupImpl.java | 8 +-
.../BalancingNodePlacementStrategy.java | 2 +-
.../brooklyn/entity/lifecycle/Lifecycle.java | 185 --
.../entity/lifecycle/PolicyDescriptor.java | 68 -
.../brooklyn/entity/lifecycle/QuorumCheck.java | 108 --
.../entity/lifecycle/ServiceStateLogic.java | 639 -------
.../brooklyn/entity/stock/BasicApplication.java | 2 +-
.../entity/stock/BasicApplicationImpl.java | 2 +-
.../brooklyn/entity/stock/BasicEntityImpl.java | 2 +-
.../brooklyn/entity/stock/BasicStartable.java | 4 +-
.../entity/stock/BasicStartableImpl.java | 18 +-
.../brooklyn/entity/stock/DataEntity.java | 2 +-
.../brooklyn/entity/stock/DataEntityImpl.java | 6 +-
.../brooklyn/entity/stock/DelegateEntity.java | 4 +-
.../entity/stock/DelegateEntityImpl.java | 4 +-
.../entity/stock/EffectorStartableImpl.java | 8 +-
.../brooklyn/entity/trait/Changeable.java | 35 -
.../entity/trait/MemberReplaceable.java | 45 -
.../apache/brooklyn/entity/trait/Resizable.java | 50 -
.../apache/brooklyn/entity/trait/Startable.java | 123 --
.../brooklyn/entity/trait/StartableMethods.java | 125 --
.../brooklyn/feed/function/FunctionFeed.java | 208 +++
.../feed/function/FunctionPollConfig.java | 111 ++
.../org/apache/brooklyn/feed/http/HttpFeed.java | 382 ++++
.../brooklyn/feed/http/HttpPollConfig.java | 160 ++
.../brooklyn/feed/http/HttpPollValue.java | 40 +
.../apache/brooklyn/feed/http/HttpPolls.java | 39 +
.../brooklyn/feed/http/HttpValueFunctions.java | 154 ++
.../brooklyn/feed/http/JsonFunctions.java | 235 +++
.../apache/brooklyn/feed/shell/ShellFeed.java | 273 +++
.../brooklyn/feed/shell/ShellPollConfig.java | 125 ++
.../org/apache/brooklyn/feed/ssh/SshFeed.java | 290 +++
.../apache/brooklyn/feed/ssh/SshPollConfig.java | 142 ++
.../apache/brooklyn/feed/ssh/SshPollValue.java | 60 +
.../brooklyn/feed/ssh/SshValueFunctions.java | 73 +
.../windows/WindowsPerformanceCounterFeed.java | 412 +++++
.../WindowsPerformanceCounterPollConfig.java | 53 +
.../location/access/BrooklynAccessUtils.java | 154 --
.../location/access/PortForwardManager.java | 328 ----
.../access/PortForwardManagerAuthority.java | 46 -
.../access/PortForwardManagerClient.java | 405 ----
.../location/access/PortForwardManagerImpl.java | 505 -----
.../PortForwardManagerLocationResolver.java | 89 -
.../brooklyn/location/access/PortMapping.java | 101 -
.../location/byon/ByonLocationResolver.java | 2 +-
.../FixedListMachineProvisioningLocation.java | 6 +-
.../location/byon/HostLocationResolver.java | 8 +-
.../byon/SingleMachineLocationResolver.java | 8 +-
.../AbstractAvailabilityZoneExtension.java | 82 -
...bstractCloudMachineProvisioningLocation.java | 97 -
.../cloud/AvailabilityZoneExtension.java | 54 -
.../location/cloud/CloudLocationConfig.java | 116 --
.../cloud/names/AbstractCloudMachineNamer.java | 150 --
.../cloud/names/BasicCloudMachineNamer.java | 91 -
.../location/cloud/names/CloudMachineNamer.java | 61 -
.../cloud/names/CustomMachineNamer.java | 72 -
.../location/core/AbstractLocation.java | 709 -------
.../location/core/AbstractLocationResolver.java | 188 --
.../AggregatingMachineProvisioningLocation.java | 141 --
.../location/core/BasicHardwareDetails.java | 56 -
.../location/core/BasicLocationDefinition.java | 85 -
.../location/core/BasicLocationRegistry.java | 489 -----
.../location/core/BasicMachineDetails.java | 183 --
.../location/core/BasicMachineMetadata.java | 84 -
.../brooklyn/location/core/BasicOsDetails.java | 123 --
.../location/core/CatalogLocationResolver.java | 79 -
.../core/DefinedLocationByIdResolver.java | 74 -
.../core/DeprecatedKeysMappingBuilder.java | 66 -
.../location/core/HasSubnetHostname.java | 32 -
.../location/core/LocationConfigKeys.java | 79 -
.../location/core/LocationConfigUtils.java | 559 ------
.../location/core/LocationPredicates.java | 108 --
...ocationPropertiesFromBrooklynProperties.java | 223 ---
.../brooklyn/location/core/Locations.java | 160 --
.../apache/brooklyn/location/core/Machines.java | 191 --
.../brooklyn/location/core/MultiLocation.java | 166 --
.../location/core/MultiLocationResolver.java | 145 --
.../location/core/NamedLocationResolver.java | 97 -
.../brooklyn/location/core/PortRanges.java | 257 ---
.../location/core/RegistryLocationResolver.java | 42 -
.../location/core/SupportsPortForwarding.java | 39 -
.../core/internal/LocationDynamicType.java | 40 -
.../core/internal/LocationInternal.java | 93 -
.../core/internal/LocationTypeSnapshot.java | 40 -
.../location/dynamic/DynamicLocation.java | 50 -
.../location/dynamic/LocationOwner.java | 85 -
.../location/geo/GeoBytesHostGeoLookup.java | 104 --
.../brooklyn/location/geo/HasHostGeoInfo.java | 25 -
.../brooklyn/location/geo/HostGeoInfo.java | 205 ---
.../brooklyn/location/geo/HostGeoLookup.java | 27 -
.../location/geo/LocalhostExternalIpLoader.java | 177 --
.../location/geo/MaxMind2HostGeoLookup.java | 114 --
.../location/geo/UtraceHostGeoLookup.java | 209 ---
.../localhost/LocalhostLocationResolver.java | 4 +-
.../LocalhostMachineProvisioningLocation.java | 12 +-
...calhostPropertiesFromBrooklynProperties.java | 2 +-
.../brooklyn/location/multi/MultiLocation.java | 167 ++
.../location/multi/MultiLocationResolver.java | 149 ++
.../location/ssh/SshMachineLocation.java | 16 +-
.../winrm/AdvertiseWinrmLoginPolicy.java | 8 +-
.../location/winrm/WinRmMachineLocation.java | 4 +-
.../brooklyn/policy/core/AbstractPolicy.java | 119 --
.../policy/core/GeneralPurposePolicy.java | 36 -
.../apache/brooklyn/policy/core/Policies.java | 73 -
.../brooklyn/policy/core/PolicyDynamicType.java | 43 -
.../policy/core/PolicyTypeSnapshot.java | 39 -
.../brooklyn/sensor/core/AttributeMap.java | 202 --
.../core/AttributeSensorAndConfigKey.java | 147 --
.../sensor/core/BasicAttributeSensor.java | 62 -
.../core/BasicAttributeSensorAndConfigKey.java | 114 --
.../sensor/core/BasicNotificationSensor.java | 36 -
.../brooklyn/sensor/core/BasicSensor.java | 114 --
.../brooklyn/sensor/core/BasicSensorEvent.java | 112 --
.../sensor/core/DependentConfiguration.java | 823 ---------
.../brooklyn/sensor/core/HttpRequestSensor.java | 96 -
.../core/PortAttributeSensorAndConfigKey.java | 141 --
.../apache/brooklyn/sensor/core/Sensors.java | 164 --
.../brooklyn/sensor/core/StaticSensor.java | 72 -
...platedStringAttributeSensorAndConfigKey.java | 66 -
.../enricher/AbstractAggregatingEnricher.java | 173 --
.../sensor/enricher/AbstractAggregator.java | 237 ---
.../sensor/enricher/AbstractEnricher.java | 115 --
.../AbstractMultipleSensorAggregator.java | 169 --
.../sensor/enricher/AbstractTransformer.java | 100 -
.../enricher/AbstractTransformingEnricher.java | 38 -
.../AbstractTypeTransformingEnricher.java | 67 -
.../sensor/enricher/AddingEnricher.java | 106 --
.../brooklyn/sensor/enricher/Aggregator.java | 221 ---
.../brooklyn/sensor/enricher/Combiner.java | 137 --
.../enricher/CustomAggregatingEnricher.java | 320 ----
.../sensor/enricher/EnricherDynamicType.java | 43 -
.../sensor/enricher/EnricherTypeSnapshot.java | 39 -
.../brooklyn/sensor/enricher/Enrichers.java | 824 ---------
.../apache/brooklyn/sensor/enricher/Joiner.java | 126 --
.../brooklyn/sensor/enricher/Propagator.java | 200 --
.../enricher/SensorPropagatingEnricher.java | 180 --
.../enricher/SensorTransformingEnricher.java | 106 --
.../brooklyn/sensor/enricher/Transformer.java | 103 --
.../brooklyn/sensor/enricher/UpdatingMap.java | 158 --
.../YamlRollingTimeWindowMeanEnricher.java | 178 --
.../enricher/YamlTimeWeightedDeltaEnricher.java | 83 -
.../brooklyn/sensor/feed/AbstractFeed.java | 240 ---
.../sensor/feed/AttributePollHandler.java | 248 ---
.../sensor/feed/ConfigToAttributes.java | 59 -
.../sensor/feed/DelegatingPollHandler.java | 96 -
.../apache/brooklyn/sensor/feed/FeedConfig.java | 297 ---
.../apache/brooklyn/sensor/feed/PollConfig.java | 85 -
.../brooklyn/sensor/feed/PollHandler.java | 38 -
.../org/apache/brooklyn/sensor/feed/Poller.java | 205 ---
.../sensor/feed/function/FunctionFeed.java | 208 ---
.../feed/function/FunctionPollConfig.java | 111 --
.../brooklyn/sensor/feed/http/HttpFeed.java | 382 ----
.../sensor/feed/http/HttpPollConfig.java | 160 --
.../sensor/feed/http/HttpPollValue.java | 40 -
.../brooklyn/sensor/feed/http/HttpPolls.java | 39 -
.../sensor/feed/http/HttpValueFunctions.java | 154 --
.../sensor/feed/http/JsonFunctions.java | 235 ---
.../brooklyn/sensor/feed/shell/ShellFeed.java | 273 ---
.../sensor/feed/shell/ShellPollConfig.java | 125 --
.../brooklyn/sensor/feed/ssh/SshFeed.java | 290 ---
.../brooklyn/sensor/feed/ssh/SshPollConfig.java | 142 --
.../brooklyn/sensor/feed/ssh/SshPollValue.java | 60 -
.../sensor/feed/ssh/SshValueFunctions.java | 73 -
.../windows/WindowsPerformanceCounterFeed.java | 412 -----
.../WindowsPerformanceCounterPollConfig.java | 53 -
.../util/core/BrooklynLanguageExtensions.java | 2 +-
.../util/core/BrooklynNetworkUtils.java | 2 +-
.../brooklyn/util/core/ResourceUtils.java | 2 +-
.../brooklyn/util/core/flags/FlagUtils.java | 7 +-
.../brooklyn/util/core/flags/TypeCoercions.java | 16 +-
.../util/core/http/HttpToolResponse.java | 2 +-
.../brooklyn/util/core/internal/Repeater.java | 2 +-
.../internal/ssh/sshj/SshjClientConnection.java | 2 +-
.../util/core/internal/ssh/sshj/SshjTool.java | 2 +-
.../util/core/task/BasicExecutionContext.java | 2 +-
.../util/core/task/BasicExecutionManager.java | 2 +-
.../brooklyn/util/core/task/BasicTask.java | 2 +-
.../brooklyn/util/core/task/DynamicTasks.java | 2 +-
.../brooklyn/util/core/task/ScheduledTask.java | 4 +-
.../brooklyn/util/core/task/ValueResolver.java | 2 +-
.../brooklyn/util/core/task/ssh/SshTasks.java | 5 +-
.../util/core/text/TemplateProcessor.java | 8 +-
...pache.brooklyn.api.location.LocationResolver | 12 +-
.../core/BrooklynFeatureEnablementTest.java | 118 ++
.../brooklyn/core/BrooklynVersionTest.java | 2 +-
.../core/catalog/internal/CatalogDtoTest.java | 2 +-
.../core/catalog/internal/CatalogScanTest.java | 2 +-
.../core/catalog/internal/CatalogTestUtils.java | 2 +-
.../catalog/internal/CatalogVersioningTest.java | 2 +-
.../core/catalog/internal/MyCatalogItems.java | 4 +-
...apListAndOtherStructuredConfigKeyTest.groovy | 6 +-
.../core/effector/EffectorBasicTest.java | 183 ++
.../core/effector/EffectorConcatenateTest.java | 241 +++
.../core/effector/EffectorMetadataTest.java | 166 ++
.../effector/EffectorSayHiGroovyTest.groovy | 182 ++
.../core/effector/EffectorSayHiTest.java | 173 ++
.../core/effector/EffectorTaskTest.java | 437 +++++
.../core/effector/ssh/SshEffectorTasksTest.java | 265 +++
.../core/enricher/BasicEnricherTest.java | 119 ++
.../core/enricher/EnricherConfigTest.java | 147 ++
.../entity/AbstractApplicationLegacyTest.java | 155 ++
.../core/entity/AbstractEntityLegacyTest.java | 131 ++
.../brooklyn/core/entity/AttributeMapTest.java | 226 +++
.../brooklyn/core/entity/AttributeTest.java | 66 +
.../entity/ConfigEntityInheritanceTest.java | 190 ++
.../core/entity/DependentConfigurationTest.java | 413 +++++
.../brooklyn/core/entity/DynamicEntityTest.java | 60 +
.../brooklyn/core/entity/EntitiesTest.java | 134 ++
.../brooklyn/core/entity/EntityConfigTest.java | 178 ++
.../core/entity/EntityFunctionsTest.java | 77 +
.../core/entity/EntityLocationsTest.java | 126 ++
.../core/entity/EntityPreManagementTest.java | 146 ++
.../core/entity/EntityPredicatesTest.java | 129 ++
.../core/entity/EntityRegistrationTest.java | 102 +
.../core/entity/EntitySetFromFlagTest.java | 213 +++
.../brooklyn/core/entity/EntitySpecTest.java | 214 +++
.../core/entity/EntitySubscriptionTest.java | 242 +++
.../core/entity/EntitySuppliersTest.java | 70 +
.../brooklyn/core/entity/EntityTypeTest.java | 284 +++
.../brooklyn/core/entity/OwnedChildrenTest.java | 213 +++
.../core/entity/PolicyRegistrationTest.java | 152 ++
.../entity/RecordingSensorEventListener.java | 115 ++
.../brooklyn/core/entity/SanitizerTest.java | 38 +
.../drivers/BasicEntityDriverManagerTest.java | 74 +
.../drivers/EntityDriverRegistryTest.java | 59 +
.../ReflectiveEntityDriverFactoryTest.java | 169 ++
.../RegistryEntityDriverFactoryTest.java | 86 +
.../downloads/BasicDownloadsRegistryTest.java | 155 ++
.../DownloadProducerFromLocalRepoTest.java | 130 ++
.../DownloadProducerFromPropertiesTest.java | 162 ++
.../downloads/DownloadSubstitutersTest.java | 131 ++
.../downloads/FilenameProducersTest.java | 34 +
.../drivers/downloads/MyEntityDriver.java | 44 +
.../brooklyn/core/entity/hello/HelloEntity.java | 53 +
.../core/entity/hello/HelloEntityImpl.java | 31 +
.../core/entity/hello/LocalEntitiesTest.java | 282 +++
.../entity/internal/ConfigMapGroovyTest.groovy | 61 +
.../core/entity/internal/ConfigMapTest.java | 298 +++
.../EntityConfigMapUsageLegacyTest.java | 292 +++
.../internal/EntityConfigMapUsageTest.java | 318 ++++
.../lifecycle/LifecycleTransitionTest.java | 51 +
.../entity/lifecycle/ServiceStateLogicTest.java | 314 ++++
.../ApplicationBuilderOverridingTest.java | 221 +++
.../proxying/BasicEntityTypeRegistryTest.java | 135 ++
.../core/entity/proxying/EntityManagerTest.java | 83 +
.../core/entity/proxying/EntityProxyTest.java | 171 ++
.../proxying/InternalEntityFactoryTest.java | 109 ++
.../core/entity/trait/FailingEntity.java | 84 +
.../core/entity/trait/FailingEntityImpl.java | 87 +
.../core/entity/trait/StartableMethodsTest.java | 127 ++
.../core/feed/ConfigToAttributesTest.java | 70 +
.../apache/brooklyn/core/feed/PollerTest.java | 108 ++
.../internal/BrooklynFeatureEnablementTest.java | 117 --
.../core/location/AbstractLocationTest.java | 185 ++
...regatingMachineProvisioningLocationTest.java | 117 ++
.../location/LegacyAbstractLocationTest.java | 151 ++
.../core/location/LocationConfigTest.java | 204 ++
.../core/location/LocationConfigUtilsTest.java | 156 ++
.../core/location/LocationExtensionsTest.java | 187 ++
.../core/location/LocationManagementTest.java | 82 +
.../core/location/LocationPredicatesTest.java | 102 +
...ionPropertiesFromBrooklynPropertiesTest.java | 122 ++
.../core/location/LocationRegistryTest.java | 161 ++
.../core/location/MachineDetailsTest.java | 83 +
.../brooklyn/core/location/PortRangesTest.java | 130 ++
.../RecordingMachineLocationCustomizer.java | 71 +
.../core/location/SimulatedLocation.java | 141 ++
.../core/location/TestPortSupplierLocation.java | 90 +
.../access/BrooklynAccessUtilsTest.java | 139 ++
.../PortForwardManagerLocationResolverTest.java | 83 +
.../access/PortForwardManagerRebindTest.java | 195 ++
.../location/access/PortForwardManagerTest.java | 193 ++
.../location/cloud/CloudMachineNamerTest.java | 161 ++
.../location/cloud/CustomMachineNamerTest.java | 79 +
.../core/location/geo/HostGeoInfoTest.java | 52 +
.../geo/HostGeoLookupIntegrationTest.java | 87 +
...ocalhostExternalIpLoaderIntegrationTest.java | 54 +
.../AcmeEntitlementManagerTestFixture.java | 4 +-
.../core/mgmt/entitlement/EntitlementsTest.java | 4 +-
.../mgmt/entitlement/EntityEntitlementTest.java | 4 +-
.../ha/HighAvailabilityManagerInMemoryTest.java | 2 +-
.../HighAvailabilityManagerSplitBrainTest.java | 6 +-
.../ha/HighAvailabilityManagerTestFixture.java | 2 +-
.../brooklyn/core/mgmt/ha/HotStandbyTest.java | 2 +-
.../core/mgmt/ha/MasterChooserTest.java | 2 +-
.../brooklyn/core/mgmt/ha/WarmStandbyTest.java | 2 +-
.../core/mgmt/internal/AccessManagerTest.java | 6 +-
.../internal/EntityExecutionManagerTest.java | 8 +-
.../internal/LocalSubscriptionManagerTest.java | 2 +-
.../brooklyn/core/mgmt/osgi/OsgiPathTest.java | 2 +-
.../core/mgmt/osgi/OsgiStandaloneTest.java | 2 +-
.../mgmt/osgi/OsgiVersionMoreEntityTest.java | 8 +-
...ntoPersisterInMemorySizeIntegrationTest.java | 2 +-
.../BrooklynMementoPersisterTestFixture.java | 6 +-
.../mgmt/persist/FileBasedObjectStoreTest.java | 2 +-
.../mgmt/persist/XmlMementoSerializerTest.java | 6 +-
.../mgmt/rebind/ActivePartialRebindTest.java | 6 +-
.../core/mgmt/rebind/CheckpointEntityTest.java | 4 +-
.../mgmt/rebind/RebindCatalogEntityTest.java | 14 +-
.../core/mgmt/rebind/RebindCatalogItemTest.java | 4 +-
...talogWhenCatalogPersistenceDisabledTest.java | 2 +-
.../mgmt/rebind/RebindDynamicGroupTest.java | 2 +-
.../core/mgmt/rebind/RebindEnricherTest.java | 14 +-
.../rebind/RebindEntityDynamicTypeInfoTest.java | 4 +-
.../core/mgmt/rebind/RebindEntityTest.java | 22 +-
.../core/mgmt/rebind/RebindFailuresTest.java | 8 +-
.../core/mgmt/rebind/RebindFeedTest.java | 20 +-
.../core/mgmt/rebind/RebindGroupTest.java | 2 +-
.../core/mgmt/rebind/RebindLocationTest.java | 2 +-
.../mgmt/rebind/RebindManagerSorterTest.java | 2 +-
.../core/mgmt/rebind/RebindPolicyTest.java | 10 +-
.../core/mgmt/rebind/RebindTestFixture.java | 8 +-
.../mgmt/rebind/RebindTestFixtureWithApp.java | 2 +-
.../core/policy/basic/BasicPolicyTest.java | 2 +-
.../core/policy/basic/EnricherTypeTest.java | 2 +-
.../core/policy/basic/PolicyConfigTest.java | 2 +-
.../policy/basic/PolicySubscriptionTest.java | 8 +-
.../core/policy/basic/PolicyTypeTest.java | 2 +-
.../core/sensor/HttpRequestSensorTest.java | 85 +
.../brooklyn/core/sensor/StaticSensorTest.java | 55 +
.../core/server/entity/BrooklynMetricsTest.java | 6 +-
.../core/test/BrooklynAppLiveTestSupport.java | 4 +-
.../core/test/BrooklynAppUnitTestSupport.java | 6 +-
.../apache/brooklyn/core/test/HttpService.java | 2 +-
.../core/test/entity/NoopStartable.java | 2 +-
.../core/test/entity/TestApplication.java | 10 +-
.../core/test/entity/TestApplicationImpl.java | 4 +-
.../brooklyn/core/test/entity/TestCluster.java | 2 +-
.../core/test/entity/TestClusterImpl.java | 4 +-
.../brooklyn/core/test/entity/TestEntity.java | 20 +-
.../core/test/entity/TestEntityImpl.java | 6 +-
.../entity/TestEntityTransientCopyImpl.java | 2 +-
.../core/test/location/TestPaasLocation.java | 32 -
.../brooklyn/core/test/policy/TestEnricher.java | 2 +-
.../brooklyn/core/test/policy/TestPolicy.java | 2 +-
.../longevity/EntityCleanupLongevityTest.java | 2 +-
.../EntityCleanupLongevityTestFixture.java | 6 +-
.../test/qa/longevity/EntityCleanupTest.java | 2 +-
.../qa/performance/AbstractPerformanceTest.java | 6 +-
.../qa/performance/EntityPerformanceTest.java | 2 +-
.../EntityPersistencePerformanceTest.java | 2 +-
.../effector/core/EffectorBasicTest.java | 183 --
.../effector/core/EffectorConcatenateTest.java | 241 ---
.../effector/core/EffectorMetadataTest.java | 166 --
.../core/EffectorSayHiGroovyTest.groovy | 179 --
.../effector/core/EffectorSayHiTest.java | 173 --
.../effector/core/EffectorTaskTest.java | 437 -----
...stomAggregatingEnricherDeprecatedTest.groovy | 368 ++++
.../stock/CustomAggregatingEnricherTest.java | 556 ++++++
.../brooklyn/enricher/stock/EnrichersTest.java | 501 +++++
...SensorPropagatingEnricherDeprecatedTest.java | 108 ++
.../stock/SensorPropagatingEnricherTest.java | 218 +++
.../TransformingEnricherDeprecatedTest.groovy | 83 +
.../stock/TransformingEnricherTest.java | 71 +
.../YamlRollingTimeWindowMeanEnricherTest.java | 179 ++
.../YamlTimeWeightedDeltaEnricherTest.java | 107 ++
.../core/AbstractApplicationLegacyTest.java | 156 --
.../entity/core/AbstractEntityLegacyTest.java | 131 --
.../brooklyn/entity/core/AttributeMapTest.java | 226 ---
.../brooklyn/entity/core/AttributeTest.java | 66 -
.../core/ConfigEntityInheritanceTest.java | 188 --
.../entity/core/DependentConfigurationTest.java | 413 -----
.../brooklyn/entity/core/DynamicEntityTest.java | 60 -
.../brooklyn/entity/core/EntitiesTest.java | 134 --
.../brooklyn/entity/core/EntityConfigTest.java | 178 --
.../entity/core/EntityFunctionsTest.java | 77 -
.../entity/core/EntityLocationsTest.java | 126 --
.../entity/core/EntityPreManagementTest.java | 146 --
.../entity/core/EntityPredicatesTest.java | 129 --
.../entity/core/EntityRegistrationTest.java | 102 -
.../entity/core/EntitySetFromFlagTest.java | 213 ---
.../brooklyn/entity/core/EntitySpecTest.java | 214 ---
.../entity/core/EntitySubscriptionTest.java | 242 ---
.../entity/core/EntitySuppliersTest.java | 70 -
.../brooklyn/entity/core/EntityTypeTest.java | 284 ---
.../brooklyn/entity/core/OwnedChildrenTest.java | 213 ---
.../entity/core/PolicyRegistrationTest.java | 152 --
.../core/RecordingSensorEventListener.java | 115 --
.../brooklyn/entity/core/SanitizerTest.java | 38 -
.../core/internal/ConfigMapGroovyTest.groovy | 61 -
.../entity/core/internal/ConfigMapTest.java | 298 ---
.../EntityConfigMapUsageLegacyTest.java | 292 ---
.../core/internal/EntityConfigMapUsageTest.java | 318 ----
.../drivers/BasicEntityDriverManagerTest.java | 74 -
.../drivers/EntityDriverRegistryTest.java | 59 -
.../ReflectiveEntityDriverFactoryTest.java | 169 --
.../RegistryEntityDriverFactoryTest.java | 86 -
.../downloads/BasicDownloadsRegistryTest.java | 155 --
.../DownloadProducerFromLocalRepoTest.java | 130 --
.../DownloadProducerFromPropertiesTest.java | 162 --
.../downloads/DownloadSubstitutersTest.java | 131 --
.../downloads/FilenameProducersTest.java | 34 -
.../drivers/downloads/MyEntityDriver.java | 44 -
.../entity/group/DynamicClusterTest.java | 18 +-
...DynamicClusterWithAvailabilityZonesTest.java | 14 +-
.../entity/group/DynamicFabricTest.java | 12 +-
.../brooklyn/entity/group/DynamicGroupTest.java | 10 +-
.../entity/group/DynamicMultiGroupTest.java | 10 +-
.../entity/group/DynamicRegionsFabricTest.java | 2 +-
.../entity/group/GroupPickUpEntitiesTest.java | 10 +-
.../apache/brooklyn/entity/group/GroupTest.java | 9 +-
.../group/MembershipTrackingPolicyTest.java | 6 +-
.../entity/group/QuarantineGroupTest.java | 4 +-
.../BalancingNodePlacementStrategyTest.java | 2 +-
.../ProportionalZoneFailureDetectorTest.java | 2 +-
.../brooklyn/entity/hello/HelloEntity.java | 53 -
.../brooklyn/entity/hello/HelloEntityImpl.java | 31 -
.../entity/hello/LocalEntitiesTest.java | 282 ---
.../lifecycle/LifecycleTransitionTest.java | 51 -
.../entity/lifecycle/ServiceStateLogicTest.java | 314 ----
.../ApplicationBuilderOverridingTest.java | 221 ---
.../proxying/BasicEntityTypeRegistryTest.java | 135 --
.../entity/proxying/EntityManagerTest.java | 83 -
.../entity/proxying/EntityProxyTest.java | 171 --
.../proxying/InternalEntityFactoryTest.java | 109 --
.../entity/stock/BasicStartableTest.java | 15 +-
.../brooklyn/entity/stock/DataEntityTest.java | 8 +-
.../brooklyn/entity/trait/FailingEntity.java | 84 -
.../entity/trait/FailingEntityImpl.java | 87 -
.../entity/trait/StartableMethodsTest.java | 127 --
.../feed/function/FunctionFeedTest.java | 315 ++++
.../feed/http/HttpFeedIntegrationTest.java | 160 ++
.../apache/brooklyn/feed/http/HttpFeedTest.java | 392 ++++
.../feed/http/HttpValueFunctionsTest.java | 94 +
.../brooklyn/feed/http/JsonFunctionsTest.java | 130 ++
.../feed/shell/ShellFeedIntegrationTest.java | 226 +++
.../feed/ssh/SshFeedIntegrationTest.java | 264 +++
.../WindowsPerformanceCounterFeedLiveTest.java | 104 ++
.../WindowsPerformanceCounterFeedTest.java | 132 ++
.../access/BrooklynAccessUtilsTest.java | 137 --
.../PortForwardManagerLocationResolverTest.java | 82 -
.../access/PortForwardManagerRebindTest.java | 194 --
.../location/access/PortForwardManagerTest.java | 192 --
.../location/byon/ByonLocationResolverTest.java | 10 +-
...stMachineProvisioningLocationRebindTest.java | 6 +-
...ixedListMachineProvisioningLocationTest.java | 6 +-
.../location/byon/HostLocationResolverTest.java | 2 +-
.../byon/SingleMachineLocationResolverTest.java | 2 +-
.../location/cloud/CloudMachineNamerTest.java | 160 --
.../location/cloud/CustomMachineNamerTest.java | 78 -
.../location/core/AbstractLocationTest.java | 185 --
...regatingMachineProvisioningLocationTest.java | 117 --
.../core/LegacyAbstractLocationTest.java | 151 --
.../location/core/LocationConfigTest.java | 204 --
.../location/core/LocationConfigUtilsTest.java | 156 --
.../location/core/LocationExtensionsTest.java | 187 --
.../location/core/LocationManagementTest.java | 82 -
.../location/core/LocationPredicatesTest.java | 102 -
...ionPropertiesFromBrooklynPropertiesTest.java | 122 --
.../location/core/LocationRegistryTest.java | 161 --
.../location/core/MachineDetailsTest.java | 83 -
.../location/core/MultiLocationRebindTest.java | 122 --
.../core/MultiLocationResolverTest.java | 203 --
.../location/core/MultiLocationTest.java | 121 --
.../location/core/PaasLocationTest.java | 35 -
.../brooklyn/location/core/PortRangesTest.java | 130 --
.../RecordingMachineLocationCustomizer.java | 71 -
.../location/core/SimulatedLocation.java | 141 --
.../location/core/TestPortSupplierLocation.java | 90 -
.../LocalhostLocationResolverTest.java | 269 ---
...ocalhostMachineProvisioningLocationTest.java | 215 ---
.../LocalhostProvisioningAndAccessTest.java | 59 -
.../brooklyn/location/geo/HostGeoInfoTest.java | 51 -
.../geo/HostGeoLookupIntegrationTest.java | 83 -
...ocalhostExternalIpLoaderIntegrationTest.java | 53 -
.../LocalhostLocationResolverTest.java | 269 +++
...ocalhostMachineProvisioningLocationTest.java | 215 +++
.../LocalhostProvisioningAndAccessTest.java | 59 +
.../location/multi/MultiLocationRebindTest.java | 122 ++
.../multi/MultiLocationResolverTest.java | 203 ++
.../location/multi/MultiLocationTest.java | 121 ++
.../location/paas/PaasLocationTest.java | 34 +
.../location/paas/TestPaasLocation.java | 32 +
.../ssh/SshMachineLocationIntegrationTest.java | 2 +-
.../SshMachineLocationReuseIntegrationTest.java | 2 +-
.../location/ssh/SshMachineLocationTest.java | 26 +-
.../winrm/WinRmMachineLocationTest.java | 2 +-
.../sensor/core/HttpRequestSensorTest.java | 85 -
.../brooklyn/sensor/core/StaticSensorTest.java | 55 -
.../sensor/enricher/BasicEnricherTest.java | 119 --
...stomAggregatingEnricherDeprecatedTest.groovy | 367 ----
.../enricher/CustomAggregatingEnricherTest.java | 556 ------
.../sensor/enricher/EnricherConfigTest.java | 147 --
.../brooklyn/sensor/enricher/EnrichersTest.java | 501 -----
...SensorPropagatingEnricherDeprecatedTest.java | 108 --
.../enricher/SensorPropagatingEnricherTest.java | 218 ---
.../TransformingEnricherDeprecatedTest.groovy | 82 -
.../enricher/TransformingEnricherTest.java | 71 -
.../YamlRollingTimeWindowMeanEnricherTest.java | 179 --
.../YamlTimeWeightedDeltaEnricherTest.java | 107 --
.../sensor/feed/ConfigToAttributesTest.java | 70 -
.../apache/brooklyn/sensor/feed/PollerTest.java | 108 --
.../sensor/feed/function/FunctionFeedTest.java | 315 ----
.../feed/http/HttpFeedIntegrationTest.java | 160 --
.../brooklyn/sensor/feed/http/HttpFeedTest.java | 392 ----
.../feed/http/HttpValueFunctionsTest.java | 94 -
.../sensor/feed/http/JsonFunctionsTest.java | 130 --
.../feed/shell/ShellFeedIntegrationTest.java | 226 ---
.../sensor/feed/ssh/SshFeedIntegrationTest.java | 264 ---
.../WindowsPerformanceCounterFeedLiveTest.java | 104 --
.../WindowsPerformanceCounterFeedTest.java | 132 --
.../util/core/http/HttpToolIntegrationTest.java | 2 +-
.../util/core/internal/RepeaterTest.groovy | 4 +-
.../util/core/internal/TypeCoercionsTest.java | 2 +-
.../sshj/SshjToolAsyncStubIntegrationTest.java | 2 +-
.../ssh/sshj/SshjToolIntegrationTest.java | 2 +-
.../core/ssh/BashCommandsIntegrationTest.java | 2 +-
.../brooklyn/util/core/task/TasksTest.java | 4 +-
.../util/core/task/ssh/SshTasksTest.java | 5 +-
.../util/core/task/system/SystemTasksTest.java | 2 +-
.../util/core/text/TemplateProcessorTest.java | 2 +-
.../big_examples/global-web-fabric/index.md | 16 +-
...est-app-with-enrichers-slightly-simpler.yaml | 4 +-
.../brooklyn/demo/GlobalWebFabricExample.java | 10 +-
.../brooklyn/demo/KafkaClusterExample.java | 4 +-
.../demo/StandaloneQpidBrokerExample.java | 6 +-
.../brooklyn/demo/CumulusRDFApplication.java | 24 +-
.../demo/HighAvailabilityCassandraCluster.java | 6 +-
.../brooklyn/demo/ResilientMongoDbApp.java | 8 +-
.../brooklyn/demo/RiakClusterExample.java | 6 +-
.../brooklyn/demo/SimpleCassandraCluster.java | 6 +-
.../brooklyn/demo/SimpleCouchDBCluster.java | 2 +-
.../brooklyn/demo/SimpleMongoDBReplicaSet.java | 2 +-
.../brooklyn/demo/SimpleRedisCluster.java | 2 +-
.../apache/brooklyn/demo/StormSampleApp.java | 6 +-
.../brooklyn/demo/WideAreaCassandraCluster.java | 6 +-
.../brooklyn/demo/NodeJsTodoApplication.java | 12 +-
.../brooklyn/demo/SingleWebServerExample.java | 10 +-
.../demo/WebClusterDatabaseExample.java | 16 +-
.../demo/WebClusterDatabaseExampleApp.java | 16 +-
.../demo/WebClusterDatabaseExampleGroovy.groovy | 8 +-
.../apache/brooklyn/demo/WebClusterExample.java | 4 +-
...lusterDatabaseExampleAppIntegrationTest.java | 6 +-
.../JcloudsBlobStoreBasedObjectStore.java | 4 +-
...AbstractJcloudsSubnetSshMachineLocation.java | 2 +-
.../location/jclouds/BrooklynMachinePool.java | 2 +-
.../jclouds/ComputeServiceRegistryImpl.java | 2 +-
.../jclouds/JcloudsByonLocationResolver.java | 10 +-
.../location/jclouds/JcloudsLocation.java | 22 +-
.../location/jclouds/JcloudsLocationConfig.java | 8 +-
.../jclouds/JcloudsLocationResolver.java | 8 +-
.../jclouds/JcloudsMachineLocation.java | 2 +-
.../location/jclouds/JcloudsMachineNamer.java | 2 +-
...JcloudsPropertiesFromBrooklynProperties.java | 6 +-
.../jclouds/JcloudsSshMachineLocation.java | 6 +-
.../JcloudsLocationSecurityGroupCustomizer.java | 2 +-
.../JcloudsPortForwarderExtension.java | 4 +-
.../zone/AwsAvailabilityZoneExtension.java | 4 +-
.../policy/jclouds/os/CreateUserPolicy.java | 10 +-
.../mgmt/persist/jclouds/BlobStoreCleaner.java | 4 +-
.../persist/jclouds/BlobStoreExpiryTest.java | 6 +-
.../mgmt/persist/jclouds/BlobStoreTest.java | 6 +-
.../JcloudsBlobStoreBasedObjectStoreTest.java | 2 +-
.../jclouds/JcloudsExpect100ContinueTest.java | 2 +-
.../JcloudsObjectStoreAccessorWriterTest.java | 2 +-
.../jclouds/AbstractJcloudsLiveTest.java | 2 +-
.../jclouds/JcloudsAddressesLiveTest.java | 2 +-
.../JcloudsByonLocationResolverTest.java | 2 +-
.../jclouds/JcloudsLocationMetadataTest.java | 4 +-
.../jclouds/JcloudsLocationResolverTest.java | 4 +-
.../location/jclouds/JcloudsLocationTest.java | 8 +-
.../location/jclouds/LiveTestEntity.java | 4 +-
.../jclouds/RebindJcloudsLocationLiveTest.java | 4 +-
.../JcloudsPortForwardingStubbedLiveTest.java | 4 +-
.../provider/AbstractJcloudsLocationTest.java | 2 +-
.../AwsEc2LocationWindowsLiveTest.groovy | 2 +-
.../zone/AwsAvailabilityZoneExtensionTest.java | 2 +-
parent/pom.xml | 2 +-
.../policy/autoscaling/AutoScalerPolicy.java | 12 +-
.../brooklyn/policy/enricher/DeltaEnricher.java | 2 +-
.../policy/enricher/HttpLatencyDetector.java | 14 +-
.../policy/enricher/RollingMeanEnricher.java | 2 +-
.../enricher/RollingTimeWindowMeanEnricher.java | 4 +-
.../enricher/TimeFractionDeltaEnricher.java | 2 +-
.../enricher/TimeWeightedDeltaEnricher.java | 6 +-
.../followthesun/DefaultFollowTheSunModel.java | 2 +-
.../policy/followthesun/FollowTheSunPolicy.java | 6 +-
.../policy/followthesun/FollowTheSunPool.java | 4 +-
.../followthesun/FollowTheSunPoolImpl.java | 6 +-
.../policy/ha/AbstractFailureDetector.java | 6 +-
.../policy/ha/ConditionalSuspendPolicy.java | 4 +-
.../policy/ha/ConnectionFailureDetector.java | 2 +-
.../apache/brooklyn/policy/ha/HASensors.java | 2 +-
.../policy/ha/ServiceFailureDetector.java | 12 +-
.../brooklyn/policy/ha/ServiceReplacer.java | 14 +-
.../brooklyn/policy/ha/ServiceRestarter.java | 16 +-
.../policy/ha/SshMachineFailureDetector.java | 4 +-
.../loadbalancing/BalanceableContainer.java | 2 +-
.../loadbalancing/BalanceableWorkerPool.java | 4 +-
.../BalanceableWorkerPoolImpl.java | 6 +-
.../loadbalancing/LoadBalancingPolicy.java | 6 +-
.../brooklyn/policy/loadbalancing/Movable.java | 8 +-
.../autoscaling/AutoScalerPolicyMetricTest.java | 6 +-
.../autoscaling/AutoScalerPolicyRebindTest.java | 8 +-
.../AutoScalerPolicyReconfigurationTest.java | 4 +-
.../autoscaling/AutoScalerPolicyTest.java | 6 +-
.../autoscaling/LocallyResizableEntity.java | 6 +-
.../policy/enricher/DeltaEnrichersTests.groovy | 12 +-
.../enricher/HttpLatencyDetectorTest.java | 4 +-
.../policy/enricher/RebindEnricherTest.java | 4 +-
.../enricher/RollingMeanEnricherTest.groovy | 12 +-
.../RollingTimeWindowMeanEnricherTest.groovy | 12 +-
.../enricher/TimeFractionDeltaEnricherTest.java | 10 +-
.../AbstractFollowTheSunPolicyTest.java | 8 +-
.../followthesun/FollowTheSunModelTest.java | 2 +-
.../FollowTheSunPolicySoakTest.java | 6 +-
.../followthesun/FollowTheSunPolicyTest.java | 6 +-
.../ha/ConnectionFailureDetectorTest.java | 4 +-
.../brooklyn/policy/ha/HaPolicyRebindTest.java | 8 +-
...ServiceFailureDetectorStabilizationTest.java | 10 +-
.../policy/ha/ServiceFailureDetectorTest.java | 12 +-
.../brooklyn/policy/ha/ServiceReplacerTest.java | 18 +-
.../policy/ha/ServiceRestarterTest.java | 10 +-
.../AbstractLoadBalancingPolicyTest.java | 8 +-
.../BalanceableWorkerPoolTest.java | 8 +-
.../ItemsInContainersGroupTest.java | 6 +-
.../LoadBalancingPolicyConcurrencyTest.java | 4 +-
.../LoadBalancingPolicySoakTest.java | 4 +-
.../loadbalancing/LoadBalancingPolicyTest.java | 4 +-
.../loadbalancing/MockContainerEntity.java | 6 +-
.../loadbalancing/MockContainerEntityImpl.java | 2 +-
.../policy/loadbalancing/MockItemEntity.java | 2 +-
.../loadbalancing/MockItemEntityImpl.java | 2 +-
.../brooklyn/entity/database/Database.groovy | 2 +-
.../entity/database/derby/DerbyDatabase.java | 18 +-
.../database/derby/DerbyDatabaseDriver.java | 2 +-
.../database/derby/DerbyDatabaseSshDriver.java | 8 +-
.../entity/database/derby/DerbySchema.java | 22 +-
.../postgresql/PostgreSqlNodeSaltImpl.java | 28 +-
.../brooklyn/entity/salt/SaltBashCommands.java | 9 +-
.../apache/brooklyn/entity/salt/SaltConfig.java | 18 +-
.../brooklyn/entity/salt/SaltConfigs.java | 10 +-
.../entity/salt/SaltLifecycleEffectorTasks.java | 22 +-
.../brooklyn/entity/salt/SaltStackMaster.java | 15 +-
.../entity/salt/SaltStackMasterImpl.java | 3 +-
.../entity/salt/SaltStackMasterSshDriver.java | 10 +-
.../apache/brooklyn/entity/salt/SaltTasks.java | 33 +-
.../postgresql/PostgreSqlSaltLiveTest.java | 17 +-
.../brooklyn/entity/salt/SaltConfigsTest.java | 7 +-
.../entity/salt/SaltLiveTestSupport.java | 6 +-
.../entity/monitoring/zabbix/ZabbixFeed.java | 20 +-
.../monitoring/zabbix/ZabbixMonitored.java | 4 +-
.../monitoring/zabbix/ZabbixPollConfig.java | 6 +-
.../entity/monitoring/zabbix/ZabbixServer.java | 2 +-
.../monitoring/zabbix/ZabbixServerImpl.java | 10 +-
.../nosql/hazelcast/HazelcastCluster.java | 14 +-
.../nosql/hazelcast/HazelcastClusterImpl.java | 13 +-
.../entity/nosql/hazelcast/HazelcastNode.java | 21 +-
.../nosql/hazelcast/HazelcastNodeImpl.java | 13 +-
.../nosql/hazelcast/HazelcastNodeSshDriver.java | 15 +-
.../nosql/infinispan/Infinispan5Server.java | 12 +-
.../nosql/infinispan/Infinispan5SshDriver.java | 10 +-
.../hazelcast/HazelcastClusterEc2LiveTest.java | 7 +-
.../HazelcastClusterSoftlayerLiveTest.java | 7 +-
.../Infinispan5ServerIntegrationTest.groovy | 12 +-
.../entity/brooklynnode/BrooklynCluster.java | 4 +-
.../brooklynnode/BrooklynClusterImpl.java | 14 +-
.../brooklynnode/BrooklynEntityMirror.java | 2 +-
.../brooklynnode/BrooklynEntityMirrorImpl.java | 20 +-
.../entity/brooklynnode/BrooklynNode.java | 14 +-
.../entity/brooklynnode/BrooklynNodeImpl.java | 32 +-
.../brooklynnode/BrooklynNodeSshDriver.java | 6 +-
.../brooklynnode/RemoteEffectorBuilder.java | 4 +-
.../BrooklynClusterUpgradeEffectorBody.java | 12 +-
.../BrooklynNodeUpgradeEffectorBody.java | 12 +-
.../effector/SelectMasterEffectorBody.java | 6 +-
.../SetHighAvailabilityModeEffectorBody.java | 8 +-
...SetHighAvailabilityPriorityEffectorBody.java | 4 +-
.../brooklyn/entity/chef/ChefAttributeFeed.java | 12 +-
.../entity/chef/ChefAttributePollConfig.java | 2 +-
.../brooklyn/entity/chef/ChefConfigs.java | 2 +-
.../entity/chef/ChefLifecycleEffectorTasks.java | 8 +-
.../brooklyn/entity/chef/ChefSoloDriver.java | 2 +-
.../brooklyn/entity/chef/ChefSoloTasks.java | 2 +-
.../apache/brooklyn/entity/chef/ChefTasks.java | 4 +-
.../entity/chef/KnifeConvergeTaskFactory.java | 2 +-
.../brooklyn/entity/java/JavaAppUtils.java | 8 +-
.../java/JavaSoftwareProcessSshDriver.java | 12 +-
.../entity/java/JmxAttributeSensor.java | 14 +-
.../apache/brooklyn/entity/java/JmxSupport.java | 10 +-
.../brooklyn/entity/java/UsesJavaMXBeans.java | 4 +-
.../apache/brooklyn/entity/java/UsesJmx.java | 8 +-
.../brooklyn/entity/java/VanillaJavaApp.java | 2 +-
.../entity/java/VanillaJavaAppImpl.java | 2 +-
.../entity/machine/MachineAttributes.java | 2 +-
.../brooklyn/entity/machine/MachineEntity.java | 6 +-
.../entity/machine/MachineEntityImpl.java | 10 +-
.../entity/machine/MachineInitTasks.java | 2 +-
.../entity/machine/pool/ServerPool.java | 12 +-
.../entity/machine/pool/ServerPoolImpl.java | 18 +-
.../entity/machine/pool/ServerPoolLocation.java | 4 +-
.../pool/ServerPoolLocationResolver.java | 8 +-
.../base/AbstractSoftwareProcessDriver.java | 8 +-
.../base/AbstractSoftwareProcessSshDriver.java | 14 +-
.../AbstractSoftwareProcessWinRmDriver.java | 4 +-
.../software/base/AbstractVanillaProcess.java | 2 +-
.../SameServerDriverLifecycleEffectorTasks.java | 6 +-
.../entity/software/base/SameServerEntity.java | 10 +-
.../software/base/SameServerEntityImpl.java | 8 +-
.../entity/software/base/SoftwareProcess.java | 16 +-
.../software/base/SoftwareProcessDriver.java | 4 +-
...wareProcessDriverLifecycleEffectorTasks.java | 10 +-
.../software/base/SoftwareProcessImpl.java | 30 +-
.../base/VanillaSoftwareProcessSshDriver.java | 4 +-
.../software/base/VanillaWindowsProcess.java | 2 +-
.../base/VanillaWindowsProcessWinRmDriver.java | 4 +-
.../MachineLifecycleEffectorTasks.java | 32 +-
.../software/base/lifecycle/ScriptHelper.java | 2 +-
.../system_service/EntityLaunchListener.java | 2 +-
.../system_service/InitdServiceInstaller.java | 8 +-
.../system_service/SystemServiceEnricher.java | 10 +-
.../feed/jmx/JmxAttributePollConfig.java | 74 +
.../org/apache/brooklyn/feed/jmx/JmxFeed.java | 423 +++++
.../org/apache/brooklyn/feed/jmx/JmxHelper.java | 724 ++++++++
.../feed/jmx/JmxNotificationFilters.java | 64 +
.../jmx/JmxNotificationSubscriptionConfig.java | 95 +
.../feed/jmx/JmxOperationPollConfig.java | 121 ++
.../brooklyn/feed/jmx/JmxValueFunctions.java | 95 +
.../sensor/feed/jmx/JmxAttributePollConfig.java | 74 -
.../brooklyn/sensor/feed/jmx/JmxFeed.java | 423 -----
.../brooklyn/sensor/feed/jmx/JmxHelper.java | 724 --------
.../sensor/feed/jmx/JmxNotificationFilters.java | 64 -
.../jmx/JmxNotificationSubscriptionConfig.java | 95 -
.../sensor/feed/jmx/JmxOperationPollConfig.java | 121 --
.../sensor/feed/jmx/JmxValueFunctions.java | 95 -
.../brooklyn/sensor/ssh/SshCommandEffector.java | 11 +-
.../brooklyn/sensor/ssh/SshCommandSensor.java | 12 +-
.../brooklyn/sensor/ssh/SshEffectorTasks.java | 334 ----
.../winrm/WindowsPerformanceCounterSensors.java | 8 +-
.../entity/AbstractGoogleComputeLiveTest.java | 4 +-
.../entity/AbstractSoftlayerLiveTest.java | 4 +-
.../BrooklynNodeIntegrationTest.java | 12 +-
.../entity/brooklynnode/BrooklynNodeTest.java | 8 +-
.../entity/brooklynnode/MockBrooklynNode.java | 4 +-
.../brooklynnode/SameBrooklynNodeImpl.java | 8 +-
.../brooklynnode/SelectMasterEffectorTest.java | 12 +-
.../brooklyn/entity/chef/ChefConfigsTest.java | 4 +-
.../entity/chef/ChefLiveTestSupport.java | 2 +-
.../chef/ChefServerTasksIntegrationTest.java | 4 +-
.../ChefSoloDriverMySqlEntityLiveTest.java | 4 +-
.../mysql/ChefSoloDriverToyMySqlEntity.java | 6 +-
.../brooklyn/entity/java/EntityPollingTest.java | 8 +-
...SoftwareProcessSshDriverIntegrationTest.java | 4 +-
.../brooklyn/entity/java/JmxSupportTest.java | 2 +-
.../entity/java/VanillaJavaAppRebindTest.java | 4 +-
.../entity/java/VanillaJavaAppTest.java | 10 +-
.../entity/machine/MachineEntityRebindTest.java | 4 +-
.../machine/pool/AbstractServerPoolTest.java | 8 +-
.../entity/machine/pool/ServerPoolLiveTest.java | 2 +-
.../pool/ServerPoolLocationResolverTest.java | 6 +-
.../machine/pool/ServerPoolRebindTest.java | 2 +-
.../entity/machine/pool/ServerPoolTest.java | 4 +-
.../software/base/AbstractDockerLiveTest.java | 4 +-
...ctSoftwareProcessRestartIntegrationTest.java | 6 +-
.../software/base/DoNothingSoftwareProcess.java | 2 +-
.../base/DoNothingSoftwareProcessDriver.java | 2 +-
.../base/DoNothingSoftwareProcessImpl.java | 2 +-
.../software/base/SameServerEntityTest.java | 2 +-
.../software/base/SoftwareEffectorTest.java | 8 +-
.../base/SoftwareProcessEntityLatchTest.java | 8 +-
.../base/SoftwareProcessEntityRebindTest.java | 14 +-
.../base/SoftwareProcessEntityTest.java | 28 +-
...SoftwareProcessSshDriverIntegrationTest.java | 10 +-
.../base/SoftwareProcessSubclassTest.java | 4 +-
...ftwareProcessAndChildrenIntegrationTest.java | 4 +-
.../MachineLifecycleEffectorTasksTest.java | 14 +-
.../base/lifecycle/ScriptHelperTest.java | 8 +-
.../base/lifecycle/StartStopSshDriverTest.java | 6 +-
.../usage/ApplicationUsageTrackingTest.java | 6 +-
.../mgmt/usage/LocationUsageTrackingTest.java | 4 +-
.../usage/RecordingLegacyUsageListener.java | 2 +-
.../core/mgmt/usage/RecordingUsageListener.java | 2 +-
.../test/core/mgmt/usage/UsageListenerTest.java | 8 +-
.../base/test/driver/MockSshDriver.java | 2 +-
...rWithAvailabilityZonesMultiLocationTest.java | 6 +-
.../software/base/test/jmx/JmxService.java | 4 +-
.../location/MachineDetailsEc2LiveTest.java | 6 +-
.../MachineDetailsGoogleComputeLiveTest.java | 6 +-
.../location/WinRmMachineLocationLiveTest.java | 2 +-
.../test/mysql/AbstractToyMySqlEntityTest.java | 8 +-
.../mysql/DynamicToyMySqlEntityBuilder.java | 8 +-
.../PortAttributeSensorAndConfigKeyTest.java | 4 +-
.../test/ssh/SshCommandIntegrationTest.java | 10 +-
.../SystemServiceEnricherTest.java | 10 +-
.../apache/brooklyn/feed/jmx/JmxFeedTest.java | 422 +++++
.../apache/brooklyn/feed/jmx/JmxHelperTest.java | 311 ++++
.../brooklyn/feed/jmx/RebindJmxFeedTest.java | 148 ++
.../brooklyn/sensor/feed/jmx/JmxFeedTest.java | 422 -----
.../brooklyn/sensor/feed/jmx/JmxHelperTest.java | 311 ----
.../sensor/feed/jmx/RebindJmxFeedTest.java | 148 --
.../sensor/ssh/SshEffectorTasksTest.java | 264 ---
.../entity/database/DatastoreMixins.java | 4 +-
.../entity/database/crate/CrateNode.java | 12 +-
.../entity/database/crate/CrateNodeImpl.java | 12 +-
.../database/crate/CrateNodeSshDriver.java | 4 +-
.../entity/database/mariadb/MariaDbNode.java | 12 +-
.../database/mariadb/MariaDbNodeImpl.java | 10 +-
.../database/mariadb/MariaDbSshDriver.java | 6 +-
.../entity/database/mysql/MySqlCluster.java | 4 +-
.../entity/database/mysql/MySqlClusterImpl.java | 20 +-
.../entity/database/mysql/MySqlNode.java | 18 +-
.../entity/database/mysql/MySqlNodeImpl.java | 10 +-
.../entity/database/mysql/MySqlSshDriver.java | 8 +-
.../database/postgresql/PostgreSqlNode.java | 8 +-
.../PostgreSqlNodeChefImplFromScratch.java | 14 +-
.../database/postgresql/PostgreSqlNodeImpl.java | 2 +-
.../postgresql/PostgreSqlSshDriver.java | 6 +-
.../entity/database/rubyrep/RubyRepNode.java | 8 +-
.../database/rubyrep/RubyRepNodeImpl.java | 4 +-
.../database/rubyrep/RubyRepSshDriver.java | 6 +-
.../crate/CrateNodeIntegrationTest.java | 6 +-
.../mariadb/MariaDbIntegrationTest.java | 4 +-
.../database/postgresql/PostgreSqlChefTest.java | 8 +-
.../postgresql/PostgreSqlIntegrationTest.java | 4 +-
.../postgresql/PostgreSqlRackspaceLiveTest.java | 2 +-
.../database/rubyrep/RubyRepEc2LiveTest.java | 2 +-
.../rubyrep/RubyRepIntegrationTest.java | 6 +-
.../rubyrep/RubyRepRackspaceLiveTest.java | 2 +-
.../entity/messaging/MessageBroker.java | 2 +-
.../apache/brooklyn/entity/messaging/Queue.java | 4 +-
.../apache/brooklyn/entity/messaging/Topic.java | 2 +-
.../messaging/activemq/ActiveMQBroker.java | 10 +-
.../messaging/activemq/ActiveMQBrokerImpl.java | 6 +-
.../activemq/ActiveMQDestinationImpl.java | 6 +-
.../messaging/activemq/ActiveMQQueueImpl.java | 4 +-
.../messaging/activemq/ActiveMQSshDriver.java | 2 +-
.../entity/messaging/amqp/AmqpExchange.java | 2 +-
.../entity/messaging/amqp/AmqpServer.java | 6 +-
.../entity/messaging/jms/JMSBrokerImpl.java | 2 +-
.../messaging/jms/JMSDestinationImpl.java | 2 +-
.../kafka/AbstractfKafkaSshDriver.java | 4 +-
.../brooklyn/entity/messaging/kafka/Kafka.java | 4 +-
.../entity/messaging/kafka/KafkaBroker.java | 6 +-
.../entity/messaging/kafka/KafkaBrokerImpl.java | 8 +-
.../entity/messaging/kafka/KafkaCluster.java | 10 +-
.../messaging/kafka/KafkaClusterImpl.java | 10 +-
.../entity/messaging/kafka/KafkaZooKeeper.java | 6 +-
.../messaging/kafka/KafkaZooKeeperImpl.java | 2 +-
.../kafka/KafkaZooKeeperSshDriver.java | 2 +-
.../entity/messaging/qpid/QpidBroker.java | 6 +-
.../entity/messaging/qpid/QpidBrokerImpl.java | 8 +-
.../messaging/qpid/QpidDestinationImpl.java | 6 +-
.../entity/messaging/qpid/QpidQueueImpl.java | 4 +-
.../entity/messaging/qpid/QpidSshDriver.java | 2 +-
.../entity/messaging/rabbit/RabbitBroker.java | 6 +-
.../messaging/rabbit/RabbitBrokerImpl.java | 2 +-
.../messaging/rabbit/RabbitDestination.java | 2 +-
.../entity/messaging/rabbit/RabbitQueue.java | 6 +-
.../messaging/rabbit/RabbitSshDriver.java | 2 +-
.../brooklyn/entity/messaging/storm/Storm.java | 6 +-
.../entity/messaging/storm/StormDeployment.java | 2 +-
.../messaging/storm/StormDeploymentImpl.java | 4 +-
.../entity/messaging/storm/StormImpl.java | 6 +-
.../entity/messaging/storm/StormSshDriver.java | 10 +-
.../entity/zookeeper/AbstractZooKeeperImpl.java | 6 +-
.../entity/zookeeper/ZooKeeperEnsemble.java | 4 +-
.../entity/zookeeper/ZooKeeperEnsembleImpl.java | 4 +-
.../entity/zookeeper/ZooKeeperNode.java | 6 +-
.../entity/zookeeper/ZooKeeperSshDriver.java | 2 +-
.../messaging/activemq/ActiveMQEc2LiveTest.java | 2 +-
.../activemq/ActiveMQGoogleComputeLiveTest.java | 2 +-
.../activemq/ActiveMQIntegrationTest.java | 6 +-
.../messaging/kafka/KafkaIntegrationTest.java | 6 +-
.../entity/messaging/kafka/KafkaLiveTest.java | 4 +-
.../entity/messaging/kafka/KafkaSupport.java | 2 +-
.../messaging/qpid/QpidIntegrationTest.java | 8 +-
.../messaging/rabbit/RabbitIntegrationTest.java | 6 +-
.../storm/StormAbstractCloudLiveTest.java | 8 +-
.../messaging/storm/StormEc2LiveTest.java | 4 +-
.../zookeeper/ZooKeeperEc2LiveTest.java | 4 +-
.../zookeeper/ZooKeeperEnsembleLiveTest.java | 8 +-
.../entity/monitoring/monit/MonitNode.java | 8 +-
.../entity/monitoring/monit/MonitNodeImpl.java | 6 +-
.../entity/monitoring/monit/MonitSshDriver.java | 2 +-
.../monitoring/monit/MonitIntegrationTest.java | 4 +-
.../entity/network/bind/BindDnsServer.java | 8 +-
.../entity/network/bind/BindDnsServerImpl.java | 6 +-
.../bind/BindDnsServerIntegrationTest.java | 12 +-
.../network/bind/BindDnsServerLiveTest.java | 4 +-
.../bind/DoNothingSoftwareProcessDriver.java | 2 +-
.../network/bind/PrefixAndIdEnricher.java | 6 +-
.../network/bind/TestBindDnsServerImpl.java | 2 +-
.../nosql/cassandra/CassandraDatacenter.java | 10 +-
.../cassandra/CassandraDatacenterImpl.java | 16 +-
.../entity/nosql/cassandra/CassandraFabric.java | 4 +-
.../nosql/cassandra/CassandraFabricImpl.java | 10 +-
.../entity/nosql/cassandra/CassandraNode.java | 10 +-
.../nosql/cassandra/CassandraNodeImpl.java | 26 +-
.../nosql/cassandra/CassandraNodeSshDriver.java | 14 +-
.../nosql/couchbase/CouchbaseCluster.java | 2 +-
.../nosql/couchbase/CouchbaseClusterImpl.java | 26 +-
.../entity/nosql/couchbase/CouchbaseNode.java | 16 +-
.../nosql/couchbase/CouchbaseNodeImpl.java | 16 +-
.../nosql/couchbase/CouchbaseNodeSshDriver.java | 18 +-
.../nosql/couchbase/CouchbaseSyncGateway.java | 6 +-
.../couchbase/CouchbaseSyncGatewayImpl.java | 8 +-
.../CouchbaseSyncGatewaySshDriver.java | 8 +-
.../entity/nosql/couchdb/CouchDBCluster.java | 4 +-
.../entity/nosql/couchdb/CouchDBNode.java | 2 +-
.../entity/nosql/couchdb/CouchDBNodeImpl.java | 6 +-
.../nosql/couchdb/CouchDBNodeSshDriver.java | 2 +-
.../elasticsearch/ElasticSearchCluster.java | 2 +-
.../nosql/elasticsearch/ElasticSearchNode.java | 10 +-
.../elasticsearch/ElasticSearchNodeImpl.java | 10 +-
.../ElasticSearchNodeSshDriver.java | 4 +-
.../nosql/mongodb/AbstractMongoDBServer.java | 6 +-
.../nosql/mongodb/AbstractMongoDBSshDriver.java | 4 +-
.../entity/nosql/mongodb/MongoDBClient.java | 6 +-
.../entity/nosql/mongodb/MongoDBClientImpl.java | 2 +-
.../nosql/mongodb/MongoDBClientSshDriver.java | 6 +-
.../nosql/mongodb/MongoDBClientSupport.java | 3 +-
.../entity/nosql/mongodb/MongoDBReplicaSet.java | 2 +-
.../nosql/mongodb/MongoDBReplicaSetImpl.java | 8 +-
.../entity/nosql/mongodb/MongoDBServer.java | 4 +-
.../entity/nosql/mongodb/MongoDBServerImpl.java | 6 +-
.../entity/nosql/mongodb/ReplicaSetConfig.java | 3 +-
.../sharding/CoLocatedMongoDBRouter.java | 2 +-
.../sharding/CoLocatedMongoDBRouterImpl.java | 8 +-
.../sharding/MongoDBConfigServerCluster.java | 2 +-
.../nosql/mongodb/sharding/MongoDBRouter.java | 2 +-
.../mongodb/sharding/MongoDBRouterCluster.java | 2 +-
.../sharding/MongoDBRouterClusterImpl.java | 4 +-
.../mongodb/sharding/MongoDBRouterImpl.java | 4 +-
.../sharding/MongoDBShardClusterImpl.java | 2 +-
.../sharding/MongoDBShardedDeployment.java | 4 +-
.../sharding/MongoDBShardedDeploymentImpl.java | 18 +-
.../entity/nosql/redis/RedisCluster.java | 2 +-
.../entity/nosql/redis/RedisClusterImpl.java | 14 +-
.../entity/nosql/redis/RedisShardImpl.java | 2 +-
.../brooklyn/entity/nosql/redis/RedisStore.java | 6 +-
.../entity/nosql/redis/RedisStoreImpl.java | 8 +-
.../entity/nosql/redis/RedisStoreSshDriver.java | 2 +-
.../brooklyn/entity/nosql/riak/RiakCluster.java | 4 +-
.../entity/nosql/riak/RiakClusterImpl.java | 20 +-
.../brooklyn/entity/nosql/riak/RiakNode.java | 14 +-
.../entity/nosql/riak/RiakNodeImpl.java | 16 +-
.../entity/nosql/riak/RiakNodeSshDriver.java | 6 +-
.../brooklyn/entity/nosql/solr/SolrServer.java | 8 +-
.../entity/nosql/solr/SolrServerImpl.java | 10 +-
.../entity/nosql/solr/SolrServerSshDriver.java | 2 +-
.../entity/nosql/cassandra/AstyanaxSupport.java | 2 +-
.../CassandraDatacenterIntegrationTest.java | 4 +-
.../cassandra/CassandraDatacenterLiveTest.java | 6 +-
...assandraDatacenterRebindIntegrationTest.java | 2 +-
.../cassandra/CassandraDatacenterTest.java | 4 +-
.../nosql/cassandra/CassandraFabricTest.java | 14 +-
.../cassandra/CassandraNodeIntegrationTest.java | 6 +-
.../nosql/couchbase/CouchbaseOfflineTest.java | 6 +-
.../CouchbaseSyncGatewayEc2LiveTest.java | 2 +-
.../nosql/couchdb/AbstractCouchDBNodeTest.java | 6 +-
.../nosql/couchdb/CouchDBClusterLiveTest.java | 6 +-
.../nosql/couchdb/CouchDBNodeEc2LiveTest.java | 2 +-
.../couchdb/CouchDBNodeIntegrationTest.java | 2 +-
.../nosql/couchdb/CouchDBNodeLiveTest.java | 2 +-
.../entity/nosql/couchdb/JcouchdbSupport.java | 2 +-
.../ElasticSearchClusterIntegrationTest.java | 6 +-
.../ElasticSearchNodeIntegrationTest.java | 10 +-
.../nosql/mongodb/MongoDBIntegrationTest.java | 6 +-
.../mongodb/MongoDBReplicaSetEc2LiveTest.java | 2 +-
.../MongoDBReplicaSetIntegrationTest.java | 2 +-
.../entity/nosql/mongodb/MongoDBTestHelper.java | 3 +-
.../MongoDBConfigServerIntegrationTest.java | 6 +-
.../MongoDBShardedDeploymentEc2LiveTest.java | 2 +-
...MongoDBShardedDeploymentIntegrationTest.java | 2 +-
.../redis/RedisClusterIntegrationTest.java | 6 +-
.../nosql/redis/RedisIntegrationTest.java | 6 +-
.../nosql/riak/RiakClusterEc2LiveTest.java | 2 +-
.../nosql/riak/RiakNodeIntegrationTest.java | 4 +-
.../entity/nosql/solr/SolrJSupport.java | 2 +-
.../nosql/solr/SolrServerEc2LiveTest.java | 2 +-
.../nosql/solr/SolrServerIntegrationTest.java | 4 +-
.../entity/nosql/solr/SolrServerLiveTest.java | 2 +-
.../entity/osgi/karaf/KarafContainer.java | 12 +-
.../entity/osgi/karaf/KarafContainerImpl.java | 14 +-
.../entity/osgi/karaf/KarafSshDriver.java | 2 +-
.../entity/osgi/karaf/KarafContainerTest.java | 8 +-
.../entity/dns/AbstractGeoDnsService.java | 10 +-
.../entity/dns/AbstractGeoDnsServiceImpl.java | 12 +-
.../dns/geoscaling/GeoscalingDnsService.java | 4 +-
.../geoscaling/GeoscalingDnsServiceImpl.java | 6 +-
.../geoscaling/GeoscalingScriptGenerator.java | 2 +-
.../entity/proxy/AbstractController.java | 2 +-
.../entity/proxy/AbstractControllerImpl.java | 16 +-
.../AbstractNonProvisionedControllerImpl.java | 6 +-
.../brooklyn/entity/proxy/LoadBalancer.java | 14 +-
.../entity/proxy/nginx/NginxController.java | 10 +-
.../entity/proxy/nginx/NginxControllerImpl.java | 18 +-
.../entity/proxy/nginx/NginxSshDriver.java | 8 +-
.../brooklyn/entity/proxy/nginx/UrlMapping.java | 6 +-
.../entity/proxy/nginx/UrlMappingImpl.java | 10 +-
.../webapp/ControlledDynamicWebAppCluster.java | 16 +-
.../ControlledDynamicWebAppClusterImpl.java | 20 +-
.../entity/webapp/DynamicWebAppCluster.java | 2 +-
.../entity/webapp/DynamicWebAppClusterImpl.java | 10 +-
.../entity/webapp/DynamicWebAppFabric.java | 2 +-
.../entity/webapp/DynamicWebAppFabricImpl.java | 2 +-
.../entity/webapp/ElasticJavaWebAppService.java | 8 +-
.../entity/webapp/JavaWebAppService.java | 8 +-
.../webapp/JavaWebAppSoftwareProcessImpl.java | 4 +-
.../entity/webapp/JavaWebAppSshDriver.java | 2 +-
.../entity/webapp/WebAppServiceConstants.java | 8 +-
.../entity/webapp/WebAppServiceMethods.java | 4 +-
.../entity/webapp/WebAppServiceMetrics.java | 8 +-
.../entity/webapp/jboss/JBoss6Server.java | 2 +-
.../entity/webapp/jboss/JBoss6ServerImpl.java | 8 +-
.../entity/webapp/jboss/JBoss6SshDriver.java | 4 +-
.../entity/webapp/jboss/JBoss7Server.java | 8 +-
.../entity/webapp/jboss/JBoss7ServerImpl.java | 12 +-
.../entity/webapp/jboss/JBoss7SshDriver.java | 2 +-
.../entity/webapp/jetty/Jetty6Server.java | 4 +-
.../entity/webapp/jetty/Jetty6ServerImpl.java | 8 +-
.../entity/webapp/jetty/Jetty6SshDriver.java | 2 +-
.../webapp/nodejs/NodeJsWebAppService.java | 4 +-
.../webapp/nodejs/NodeJsWebAppServiceImpl.java | 12 +-
.../webapp/nodejs/NodeJsWebAppSshDriver.java | 2 +-
.../entity/webapp/tomcat/Tomcat8Server.java | 2 +-
.../entity/webapp/tomcat/TomcatServer.java | 8 +-
.../entity/webapp/tomcat/TomcatServerImpl.java | 4 +-
.../entity/webapp/tomcat/TomcatSshDriver.java | 2 +-
.../entity/dns/AbstractGeoDnsServiceTest.java | 20 +-
.../geoscaling/GeoscalingIntegrationTest.java | 14 +-
.../GeoscalingScriptGeneratorTest.java | 2 +-
.../entity/proxy/AbstractControllerTest.java | 10 +-
.../brooklyn/entity/proxy/StubAppServer.java | 8 +-
.../brooklyn/entity/proxy/UrlMappingTest.java | 12 +-
.../nginx/NginxClusterIntegrationTest.java | 8 +-
.../nginx/NginxHttpsSslIntegrationTest.java | 8 +-
.../proxy/nginx/NginxIntegrationTest.java | 4 +-
.../proxy/nginx/NginxLightIntegrationTest.java | 6 +-
.../proxy/nginx/NginxRebindIntegrationTest.java | 6 +-
.../nginx/NginxRebindWithHaIntegrationTest.java | 12 +-
.../nginx/NginxUrlMappingIntegrationTest.java | 8 +-
.../proxy/nginx/NginxWebClusterEc2LiveTest.java | 8 +-
.../AbstractWebAppFixtureIntegrationTest.java | 12 +-
...lledDynamicWebAppClusterIntegrationTest.java | 8 +-
.../ControlledDynamicWebAppClusterTest.java | 8 +-
.../entity/webapp/DynamicWebAppClusterTest.java | 10 +-
.../entity/webapp/DynamicWebAppFabricTest.java | 10 +-
.../webapp/ElasticCustomLocationTest.java | 10 +-
...ElasticJavaWebAppServiceIntegrationTest.java | 4 +-
.../webapp/TomcatAutoScalerPolicyTest.java | 2 +-
.../webapp/WebAppConcurrentDeployTest.java | 6 +-
.../webapp/WebAppLiveIntegrationTest.groovy | 8 +-
...namicWebAppClusterRebindIntegrationTest.java | 8 +-
...namicWebAppClusterRebindIntegrationTest.java | 6 +-
.../jboss/JBoss6ServerAwsEc2LiveTest.java | 2 +-
...Boss6ServerNonInheritingIntegrationTest.java | 2 +-
.../jboss/JBoss7ServerAwsEc2LiveTest.java | 2 +-
.../jboss/JBoss7ServerDockerLiveTest.java | 2 +-
...Boss7ServerNonInheritingIntegrationTest.java | 4 +-
.../JBoss7ServerRebindingIntegrationTest.java | 2 +-
...ultiVersionWebAppFixtureIntegrationTest.java | 2 +-
.../Jboss7ServerGoogleComputeLiveTest.java | 2 +-
.../JettyWebAppFixtureIntegrationTest.java | 2 +-
.../NodeJsWebAppFixtureIntegrationTest.java | 7 +-
.../NodeJsWebAppSimpleIntegrationTest.java | 2 +-
.../webapp/tomcat/Tomcat8ServerEc2LiveTest.java | 2 +-
.../tomcat/Tomcat8ServerSoftlayerLiveTest.java | 2 +-
...mcat8ServerWebAppFixtureIntegrationTest.java | 4 +-
.../webapp/tomcat/TomcatServerEc2LiveTest.java | 2 +-
.../tomcat/TomcatServerSoftlayerLiveTest.java | 2 +-
...omcatServerWebAppFixtureIntegrationTest.java | 4 +-
.../test/entity/TestJavaWebAppEntity.java | 8 +-
.../app/ClusterWebServerDatabaseSample.java | 16 +-
.../sample/app/SingleWebServerSample.java | 6 +-
.../app/SampleLocalhostIntegrationTest.java | 4 +-
.../brooklyn/sample/app/SampleUnitTest.java | 4 +-
.../camp/brooklyn/YamlLauncherAbstract.java | 2 +-
.../api/AssemblyTemplateSpecInstantiator.java | 2 +-
.../BrooklynAssemblyTemplateInstantiator.java | 4 +-
.../BrooklynComponentTemplateResolver.java | 4 +-
.../spi/creation/BrooklynEntityMatcher.java | 2 +-
.../creation/BrooklynYamlTypeInstantiator.java | 2 +-
.../brooklyn/spi/creation/CampCatalogUtils.java | 2 +-
.../spi/creation/CampToSpecTransformer.java | 2 +-
.../spi/dsl/BrooklynDslDeferredSupplier.java | 6 +-
.../spi/dsl/methods/BrooklynDslCommon.java | 4 +-
.../brooklyn/spi/dsl/methods/DslComponent.java | 10 +-
.../camp/brooklyn/AbstractYamlRebindTest.java | 4 +-
.../camp/brooklyn/AbstractYamlTest.java | 2 +-
.../BrooklynYamlTypeInstantiatorTest.java | 2 +-
.../camp/brooklyn/ByonLocationsYamlTest.java | 10 +-
.../camp/brooklyn/DslAndRebindYamlTest.java | 8 +-
.../brooklyn/EmptySoftwareProcessYamlTest.java | 2 +-
.../EnrichersSlightlySimplerYamlTest.java | 8 +-
.../camp/brooklyn/EnrichersYamlTest.java | 8 +-
.../camp/brooklyn/EntitiesYamlTest.java | 16 +-
...aWebAppWithDslYamlRebindIntegrationTest.java | 2 +-
.../brooklyn/JavaWebAppsIntegrationTest.java | 6 +-
.../camp/brooklyn/JavaWebAppsMatchingTest.java | 2 +-
.../camp/brooklyn/LocationsYamlTest.java | 2 +-
.../camp/brooklyn/MapReferenceYamlTest.java | 2 +-
.../brooklyn/camp/brooklyn/ObjectsYamlTest.java | 2 +-
.../camp/brooklyn/PoliciesYamlTest.java | 4 +-
.../camp/brooklyn/ReferencedYamlTest.java | 2 +-
.../brooklyn/ReferencingYamlTestEntityImpl.java | 2 +-
.../brooklyn/ReloadBrooklynPropertiesTest.java | 4 +-
.../camp/brooklyn/TestEntityWithInitConfig.java | 6 +-
.../brooklyn/TestEntityWithInitConfigImpl.java | 2 +-
.../camp/brooklyn/TestReferencingEnricher.java | 2 +-
.../camp/brooklyn/TestReferencingPolicy.java | 2 +-
.../TestSensorAndEffectorInitializer.java | 10 +-
.../brooklyn/VanillaBashNetcatYamlTest.java | 12 +-
.../brooklyn/camp/brooklyn/WrapAppTest.java | 2 +-
.../catalog/AbstractCatalogXmlTest.java | 2 +-
.../CatalogOsgiVersionMoreEntityTest.java | 2 +-
.../brooklyn/catalog/CatalogYamlCombiTest.java | 2 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 2 +-
.../catalog/CatalogYamlLocationTest.java | 2 +-
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 2 +-
.../brooklyn/catalog/CatalogYamlRebindTest.java | 6 +-
.../catalog/CatalogYamlTemplateTest.java | 2 +-
.../brooklyn/test/lite/CampYamlLiteTest.java | 10 +-
.../test/lite/TestAppAssemblyInstantiator.java | 2 +-
...est-app-with-enrichers-slightly-simpler.yaml | 16 +-
.../test-webapp-with-averaging-enricher.yaml | 4 +-
.../org/apache/brooklyn/cli/CloudExplorer.java | 4 +-
.../main/java/org/apache/brooklyn/cli/Main.java | 12 +-
.../apache/brooklyn/cli/lister/ClassFinder.java | 8 +-
.../brooklyn/cli/lister/ItemDescriptors.java | 2 +-
.../java/org/apache/brooklyn/cli/CliTest.java | 14 +-
.../src/test/resources/ExampleAppInFile.groovy | 2 +-
.../brooklyn/cli/BaseCliIntegrationTest.java | 3 +-
usage/downstream-parent/pom.xml | 4 +-
.../BrooklynJavascriptGuiLauncherTest.java | 2 +-
.../brooklyn/launcher/BrooklynLauncher.java | 10 +-
.../brooklyn/launcher/BrooklynWebServer.java | 2 +-
.../launcher/config/BrooklynGlobalConfig.java | 4 +-
.../entity/basic/VanillaSoftwareYamlTest.java | 2 +-
.../BrooklynEntityMirrorIntegrationTest.java | 6 +-
.../brooklynnode/BrooklynNodeRestTest.java | 8 +-
.../BrooklynLauncherRebindTestFixture.java | 4 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 2 +-
.../launcher/BrooklynWebServerTest.java | 2 +-
.../brooklyn/launcher/WebAppRunnerTest.java | 4 +-
.../blueprints/AbstractBlueprintTest.java | 6 +-
.../qa/load/SimulatedJBoss7ServerImpl.java | 16 +-
.../qa/load/SimulatedMySqlNodeImpl.java | 6 +-
.../qa/load/SimulatedNginxControllerImpl.java | 10 +-
.../brooklyn/qa/load/SimulatedTheeTierApp.java | 18 +-
.../SoftlayerObtainPrivateLiveTest.java | 8 +-
.../org/apache/brooklyn/qa/load/LoadTest.java | 6 +-
.../webcluster/SinusoidalLoadGenerator.java | 4 +-
.../qa/longevity/webcluster/WebClusterApp.java | 10 +-
.../ApplicationResourceIntegrationTest.java | 6 +-
.../rest/client/BrooklynApiRestClientTest.java | 6 +-
.../resources/AbstractBrooklynRestResource.java | 2 +-
.../rest/resources/ApplicationResource.java | 10 +-
.../rest/resources/EffectorResource.java | 2 +-
.../rest/resources/EntityConfigResource.java | 6 +-
.../brooklyn/rest/resources/EntityResource.java | 2 +-
.../rest/resources/LocationResource.java | 2 +-
.../rest/resources/PolicyConfigResource.java | 2 +-
.../brooklyn/rest/resources/PolicyResource.java | 4 +-
.../brooklyn/rest/resources/SensorResource.java | 6 +-
.../brooklyn/rest/resources/ServerResource.java | 10 +-
.../brooklyn/rest/resources/UsageResource.java | 2 +-
.../rest/transform/ApplicationTransformer.java | 6 +-
.../rest/transform/CatalogTransformer.java | 2 +-
.../rest/transform/EffectorTransformer.java | 2 +-
.../rest/transform/EntityTransformer.java | 2 +-
.../rest/transform/LocationTransformer.java | 6 +-
.../rest/transform/PolicyTransformer.java | 4 +-
.../rest/util/BrooklynRestResourceUtils.java | 18 +-
.../brooklyn/rest/util/EntityLocationUtils.java | 2 +-
.../BrooklynRestApiLauncherTestFixture.java | 2 +-
.../brooklyn/rest/HaMasterCheckFilterTest.java | 2 +-
.../brooklyn/rest/domain/ApplicationTest.java | 2 +-
.../brooklyn/rest/domain/SensorSummaryTest.java | 4 +-
.../ApplicationResourceIntegrationTest.java | 2 +-
.../rest/resources/ApplicationResourceTest.java | 20 +-
.../rest/resources/CatalogResourceTest.java | 2 +-
.../rest/resources/DescendantsTest.java | 4 +-
.../resources/EntityConfigResourceTest.java | 4 +-
.../rest/resources/EntityResourceTest.java | 4 +-
.../rest/resources/LocationResourceTest.java | 2 +-
.../rest/resources/ScriptResourceTest.java | 2 +-
.../SensorResourceIntegrationTest.java | 4 +-
.../rest/resources/SensorResourceTest.java | 6 +-
.../rest/resources/ServerShutdownTest.java | 10 +-
.../rest/resources/UsageResourceTest.java | 2 +-
.../brooklynnode/DeployBlueprintTest.java | 4 +-
.../rest/testing/BrooklynRestApiTest.java | 4 +-
.../rest/testing/BrooklynRestResourceTest.java | 2 +-
.../rest/testing/mocks/CapitalizePolicy.java | 4 +-
.../testing/mocks/NameMatcherGroupImpl.java | 2 +-
.../rest/testing/mocks/RestMockApp.java | 2 +-
.../rest/testing/mocks/RestMockAppBuilder.java | 4 +-
.../testing/mocks/RestMockSimpleEntity.java | 10 +-
.../testing/mocks/RestMockSimplePolicy.java | 2 +-
.../util/BrooklynRestResourceUtilsTest.java | 8 +-
.../rest/util/EntityLocationUtilsTest.java | 8 +-
.../json/BrooklynJacksonSerializerTest.java | 4 +-
.../apache/brooklyn/test/EntityTestUtils.java | 2 +-
.../brooklyn/util/GroovyJavaMethods.groovy | 146 --
.../util/groovy/GroovyJavaMethods.groovy | 146 ++
.../brooklyn/util/groovy/JavadocDummy.java | 30 +
.../brooklyn/util/groovy/LanguageUtils.groovy | 383 ++++
.../brooklyn/util/groovy/TimeExtras.groovy | 83 +
.../brooklyn/util/internal/JavadocDummy.java | 30 -
.../brooklyn/util/internal/LanguageUtils.groovy | 383 ----
.../brooklyn/util/internal/TimeExtras.groovy | 83 -
.../util/groovy/LanguageUtilsTest.groovy | 152 ++
.../brooklyn/util/groovy/PojoTestingFields.java | 28 +
.../brooklyn/util/groovy/TimeExtrasTest.groovy | 49 +
.../util/internal/LanguageUtilsTest.groovy | 154 --
.../util/internal/PojoTestingFields.java | 28 -
.../util/internal/TimeExtrasTest.groovy | 49 -
.../test/osgi/entities/SimpleApplication.java | 2 +-
.../osgi/entities/SimpleApplicationImpl.java | 4 +-
.../test/osgi/entities/SimpleEntityImpl.java | 2 +-
.../test/osgi/entities/SimpleLocation.java | 2 +-
.../test/osgi/entities/SimplePolicy.java | 2 +-
.../test/osgi/entities/more/MoreEntity.java | 2 +-
.../test/osgi/entities/more/MoreEntityImpl.java | 4 +-
.../test/osgi/entities/more/MoreLocation.java | 2 +-
.../test/osgi/entities/more/MorePolicy.java | 2 +-
.../test/osgi/entities/more/MoreTemplate.java | 2 +-
.../test/osgi/entities/more/MoreEntity.java | 2 +-
.../test/osgi/entities/more/MoreEntityImpl.java | 4 +-
.../test/osgi/entities/more/MoreEntity.java | 2 +-
.../test/osgi/entities/more/MoreEntityImpl.java | 4 +-
.../test/osgi/entities/more/MoreLocation.java | 2 +-
.../test/osgi/entities/more/MorePolicy.java | 2 +-
.../test/osgi/entities/more/MoreTemplate.java | 2 +-
.../brooklyn/test/BrooklynLeakListener.java | 89 -
.../brooklyn/test/LoggingVerboseReporter.java | 36 -
.../test/PlatformTestSelectorListener.java | 57 -
.../apache/brooklyn/test/StatusListener.java | 100 -
.../test/TestResourceUnavailableException.java | 140 --
.../apache/brooklyn/test/VerboseReporter.java | 343 ----
.../test/support/BrooklynLeakListener.java | 89 +
.../test/support/LoggingVerboseReporter.java | 36 +
.../support/PlatformTestSelectorListener.java | 57 +
.../brooklyn/test/support/StatusListener.java | 100 +
.../TestResourceUnavailableException.java | 140 ++
.../brooklyn/test/support/VerboseReporter.java | 343 ++++
1547 files changed, 54899 insertions(+), 54913 deletions(-)
----------------------------------------------------------------------