brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [71/72] [abbrv] incubator-brooklyn git commit: This closes #844
Date Wed, 19 Aug 2015 11:10:29 GMT
This closes #844


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

Branch: refs/heads/master
Commit: 4b08f9022b6b8094eb114f532f88c45d7ce05aad
Parents: ce5ddaf 95277b3
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Wed Aug 19 12:07:15 2015 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Wed Aug 19 12:07:15 2015 +0100

----------------------------------------------------------------------
 .../api/basic/AbstractBrooklynObjectSpec.java   |  141 --
 .../brooklyn/api/basic/BrooklynObject.java      |   76 -
 .../apache/brooklyn/api/basic/BrooklynType.java |   54 -
 .../api/basic/internal/ApiObjectsFactory.java   |   61 -
 .../internal/ApiObjectsFactoryInterface.java    |   29 -
 .../brooklyn/api/catalog/CatalogItem.java       |    8 +-
 .../apache/brooklyn/api/effector/Effector.java  |   56 +
 .../brooklyn/api/effector/ParameterType.java    |   48 +
 .../apache/brooklyn/api/entity/Application.java |    2 +-
 .../apache/brooklyn/api/entity/Effector.java    |   54 -
 .../org/apache/brooklyn/api/entity/Entity.java  |   15 +-
 .../brooklyn/api/entity/EntityInitializer.java  |   43 +
 .../apache/brooklyn/api/entity/EntitySpec.java  |  470 +++++
 .../apache/brooklyn/api/entity/EntityType.java  |    5 +-
 .../brooklyn/api/entity/EntityTypeRegistry.java |   63 +
 .../org/apache/brooklyn/api/entity/Feed.java    |   70 -
 .../org/apache/brooklyn/api/entity/Group.java   |    2 -
 .../brooklyn/api/entity/ImplementedBy.java      |   46 +
 .../brooklyn/api/entity/ParameterType.java      |   48 -
 .../brooklyn/api/entity/basic/EntityLocal.java  |  179 --
 .../api/entity/drivers/EntityDriver.java        |    2 +-
 .../api/entity/proxying/EntityInitializer.java  |   43 -
 .../api/entity/proxying/EntitySpec.java         |  472 -----
 .../api/entity/proxying/EntityTypeRegistry.java |   64 -
 .../api/entity/proxying/ImplementedBy.java      |   48 -
 .../api/entity/rebind/BrooklynObjectType.java   |   68 -
 .../api/entity/rebind/ChangeListener.java       |   44 -
 .../rebind/PersistenceExceptionHandler.java     |   43 -
 .../api/entity/rebind/RebindContext.java        |   52 -
 .../entity/rebind/RebindExceptionHandler.java   |  109 --
 .../api/entity/rebind/RebindManager.java        |  132 --
 .../api/entity/rebind/RebindSupport.java        |   57 -
 .../brooklyn/api/entity/rebind/Rebindable.java  |   40 -
 .../brooklyn/api/entity/trait/Configurable.java |   93 -
 .../brooklyn/api/entity/trait/HasShortName.java |   26 -
 .../brooklyn/api/entity/trait/Identifiable.java |   24 -
 .../brooklyn/api/event/AttributeSensor.java     |   52 -
 .../org/apache/brooklyn/api/event/Sensor.java   |   77 -
 .../apache/brooklyn/api/event/SensorEvent.java  |   47 -
 .../brooklyn/api/event/SensorEventListener.java |   37 -
 .../internal/AbstractBrooklynObjectSpec.java    |  140 ++
 .../api/internal/ApiObjectsFactory.java         |   61 +
 .../internal/ApiObjectsFactoryInterface.java    |   29 +
 .../brooklyn/api/internal/EntityLocal.java      |  178 ++
 .../apache/brooklyn/api/location/Location.java  |    2 +-
 .../api/location/LocationDefinition.java        |    2 +-
 .../brooklyn/api/location/LocationResolver.java |    2 +-
 .../brooklyn/api/location/LocationSpec.java     |    4 +-
 .../brooklyn/api/location/LocationType.java     |    2 +-
 .../api/management/AccessController.java        |   65 -
 .../brooklyn/api/management/EntityManager.java  |  126 --
 .../api/management/ExecutionContext.java        |   67 -
 .../api/management/ExecutionManager.java        |  117 --
 .../api/management/HasTaskChildren.java         |   39 -
 .../api/management/LocationManager.java         |   87 -
 .../api/management/ManagementContext.java       |  254 ---
 .../api/management/SubscriptionContext.java     |   66 -
 .../api/management/SubscriptionHandle.java      |   27 -
 .../api/management/SubscriptionManager.java     |  112 --
 .../apache/brooklyn/api/management/Task.java    |  128 --
 .../brooklyn/api/management/TaskAdaptable.java  |   24 -
 .../brooklyn/api/management/TaskFactory.java    |   25 -
 .../api/management/TaskQueueingContext.java     |   62 -
 .../brooklyn/api/management/TaskWrapper.java    |   28 -
 .../BrooklynClassLoadingContext.java            |   50 -
 .../entitlement/EntitlementClass.java           |   27 -
 .../entitlement/EntitlementContext.java         |   24 -
 .../entitlement/EntitlementManager.java         |   45 -
 .../management/ha/HighAvailabilityManager.java  |  129 --
 .../api/management/ha/HighAvailabilityMode.java |   67 -
 .../api/management/ha/ManagementNodeState.java  |   72 -
 .../management/ha/ManagementNodeSyncRecord.java |   62 -
 .../ha/ManagementPlaneSyncRecord.java           |   51 -
 .../ha/ManagementPlaneSyncRecordPersister.java  |   68 -
 .../api/management/ha/MementoCopyMode.java      |   29 -
 .../brooklyn/api/mementos/BrooklynMemento.java  |   64 -
 .../api/mementos/BrooklynMementoManifest.java   |   58 -
 .../api/mementos/BrooklynMementoPersister.java  |  137 --
 .../api/mementos/BrooklynMementoRawData.java    |  185 --
 .../api/mementos/CatalogItemMemento.java        |   49 -
 .../brooklyn/api/mementos/EnricherMemento.java  |   33 -
 .../brooklyn/api/mementos/EntityMemento.java    |   80 -
 .../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 -
 .../brooklyn/api/mgmt/AccessController.java     |   65 +
 .../apache/brooklyn/api/mgmt/EntityManager.java |  126 ++
 .../brooklyn/api/mgmt/ExecutionContext.java     |   67 +
 .../brooklyn/api/mgmt/ExecutionManager.java     |  117 ++
 .../brooklyn/api/mgmt/HasTaskChildren.java      |   39 +
 .../brooklyn/api/mgmt/LocationManager.java      |   87 +
 .../brooklyn/api/mgmt/ManagementContext.java    |  254 +++
 .../brooklyn/api/mgmt/SubscriptionContext.java  |   66 +
 .../brooklyn/api/mgmt/SubscriptionHandle.java   |   27 +
 .../brooklyn/api/mgmt/SubscriptionManager.java  |  112 ++
 .../java/org/apache/brooklyn/api/mgmt/Task.java |  128 ++
 .../apache/brooklyn/api/mgmt/TaskAdaptable.java |   24 +
 .../apache/brooklyn/api/mgmt/TaskFactory.java   |   25 +
 .../brooklyn/api/mgmt/TaskQueueingContext.java  |   62 +
 .../apache/brooklyn/api/mgmt/TaskWrapper.java   |   28 +
 .../BrooklynClassLoadingContext.java            |   50 +
 .../api/mgmt/entitlement/EntitlementClass.java  |   27 +
 .../mgmt/entitlement/EntitlementContext.java    |   24 +
 .../mgmt/entitlement/EntitlementManager.java    |   45 +
 .../api/mgmt/ha/HighAvailabilityManager.java    |  129 ++
 .../api/mgmt/ha/HighAvailabilityMode.java       |   67 +
 .../api/mgmt/ha/ManagementNodeState.java        |   72 +
 .../api/mgmt/ha/ManagementNodeSyncRecord.java   |   62 +
 .../api/mgmt/ha/ManagementPlaneSyncRecord.java  |   51 +
 .../ha/ManagementPlaneSyncRecordPersister.java  |   68 +
 .../brooklyn/api/mgmt/ha/MementoCopyMode.java   |   29 +
 .../api/mgmt/rebind/ChangeListener.java         |   44 +
 .../rebind/PersistenceExceptionHandler.java     |   44 +
 .../brooklyn/api/mgmt/rebind/RebindContext.java |   52 +
 .../api/mgmt/rebind/RebindExceptionHandler.java |  110 ++
 .../brooklyn/api/mgmt/rebind/RebindManager.java |  132 ++
 .../brooklyn/api/mgmt/rebind/RebindSupport.java |   57 +
 .../brooklyn/api/mgmt/rebind/Rebindable.java    |   40 +
 .../mgmt/rebind/mementos/BrooklynMemento.java   |   64 +
 .../mementos/BrooklynMementoManifest.java       |   58 +
 .../mementos/BrooklynMementoPersister.java      |  137 ++
 .../rebind/mementos/BrooklynMementoRawData.java |  185 ++
 .../rebind/mementos/CatalogItemMemento.java     |   49 +
 .../mgmt/rebind/mementos/EnricherMemento.java   |   33 +
 .../api/mgmt/rebind/mementos/EntityMemento.java |   80 +
 .../api/mgmt/rebind/mementos/FeedMemento.java   |   33 +
 .../mgmt/rebind/mementos/LocationMemento.java   |   38 +
 .../api/mgmt/rebind/mementos/Memento.java       |   83 +
 .../api/mgmt/rebind/mementos/PolicyMemento.java |   35 +
 .../api/mgmt/rebind/mementos/TreeNode.java      |   48 +
 .../brooklyn/api/objs/BrooklynObject.java       |   73 +
 .../brooklyn/api/objs/BrooklynObjectType.java   |   67 +
 .../apache/brooklyn/api/objs/BrooklynType.java  |   54 +
 .../apache/brooklyn/api/objs/Configurable.java  |   93 +
 .../apache/brooklyn/api/objs/EntityAdjunct.java |   53 +
 .../apache/brooklyn/api/objs/HasShortName.java  |   26 +
 .../apache/brooklyn/api/objs/Identifiable.java  |   24 +
 .../apache/brooklyn/api/policy/Enricher.java    |   70 -
 .../brooklyn/api/policy/EnricherSpec.java       |  213 ---
 .../brooklyn/api/policy/EnricherType.java       |   36 -
 .../brooklyn/api/policy/EntityAdjunct.java      |   55 -
 .../org/apache/brooklyn/api/policy/Policy.java  |   11 +-
 .../apache/brooklyn/api/policy/PolicySpec.java  |    4 +-
 .../apache/brooklyn/api/policy/PolicyType.java  |    2 +-
 .../brooklyn/api/sensor/AttributeSensor.java    |   52 +
 .../apache/brooklyn/api/sensor/Enricher.java    |   72 +
 .../brooklyn/api/sensor/EnricherSpec.java       |  213 +++
 .../brooklyn/api/sensor/EnricherType.java       |   36 +
 .../org/apache/brooklyn/api/sensor/Feed.java    |   70 +
 .../org/apache/brooklyn/api/sensor/Sensor.java  |   77 +
 .../apache/brooklyn/api/sensor/SensorEvent.java |   47 +
 .../api/sensor/SensorEventListener.java         |   37 +
 .../src/main/java/brooklyn/BrooklynVersion.java |  391 ----
 .../enricher/CustomAggregatingEnricher.java     |  322 ----
 .../main/java/brooklyn/enricher/Enrichers.java  |  831 ---------
 .../basic/AbstractAggregatingEnricher.java      |  174 --
 .../enricher/basic/AbstractAggregator.java      |  238 ---
 .../enricher/basic/AbstractEnricher.java        |  116 --
 .../basic/AbstractMultipleSensorAggregator.java |  169 --
 .../enricher/basic/AbstractTransformer.java     |  101 -
 .../basic/AbstractTransformingEnricher.java     |   38 -
 .../basic/AbstractTypeTransformingEnricher.java |   68 -
 .../brooklyn/enricher/basic/AddingEnricher.java |  107 --
 .../brooklyn/enricher/basic/Aggregator.java     |  223 ---
 .../java/brooklyn/enricher/basic/Combiner.java  |  138 --
 .../enricher/basic/EnricherDynamicType.java     |   44 -
 .../enricher/basic/EnricherTypeSnapshot.java    |   39 -
 .../java/brooklyn/enricher/basic/Joiner.java    |  127 --
 .../brooklyn/enricher/basic/Propagator.java     |  201 --
 .../basic/SensorPropagatingEnricher.java        |  182 --
 .../basic/SensorTransformingEnricher.java       |  106 --
 .../brooklyn/enricher/basic/Transformer.java    |  104 --
 .../brooklyn/enricher/basic/UpdatingMap.java    |  159 --
 .../YamlRollingTimeWindowMeanEnricher.java      |  179 --
 .../basic/YamlTimeWeightedDeltaEnricher.java    |   84 -
 .../brooklyn/entity/annotation/Effector.java    |   33 -
 .../entity/annotation/EffectorParam.java        |   42 -
 .../entity/basic/AbstractApplication.java       |  262 ---
 .../AbstractConfigurableEntityFactory.java      |   83 -
 .../brooklyn/entity/basic/AbstractEffector.java |   93 -
 .../brooklyn/entity/basic/AbstractEntity.java   | 1738 -----------------
 .../brooklyn/entity/basic/AbstractGroup.java    |   86 -
 .../entity/basic/AbstractGroupImpl.java         |  272 ---
 .../entity/basic/ApplicationBuilder.java        |  244 ---
 .../java/brooklyn/entity/basic/Attributes.java  |  169 --
 .../brooklyn/entity/basic/BasicApplication.java |   31 -
 .../entity/basic/BasicApplicationImpl.java      |   29 -
 .../basic/BasicConfigurableEntityFactory.java   |   75 -
 .../java/brooklyn/entity/basic/BasicEntity.java |   33 -
 .../brooklyn/entity/basic/BasicEntityImpl.java  |   26 -
 .../java/brooklyn/entity/basic/BasicGroup.java  |   37 -
 .../brooklyn/entity/basic/BasicGroupImpl.java   |   46 -
 .../entity/basic/BasicParameterType.java        |  116 --
 .../brooklyn/entity/basic/BasicStartable.java   |   57 -
 .../entity/basic/BasicStartableImpl.java        |  101 -
 .../entity/basic/BrooklynConfigKeys.java        |  185 --
 .../entity/basic/BrooklynShutdownHooks.java     |  242 ---
 .../brooklyn/entity/basic/BrooklynTags.java     |   66 -
 .../brooklyn/entity/basic/BrooklynTaskTags.java |  447 -----
 .../brooklyn/entity/basic/BrooklynTasks.java    |   24 -
 .../entity/basic/ClosureEntityFactory.java      |   53 -
 .../java/brooklyn/entity/basic/ConfigKeys.java  |  267 ---
 .../basic/ConfigMapViewWithStringKeys.java      |  131 --
 .../entity/basic/ConfigurableEntityFactory.java |   33 -
 ...figurableEntityFactoryFromEntityFactory.java |   45 -
 .../java/brooklyn/entity/basic/DataEntity.java  |   58 -
 .../brooklyn/entity/basic/DataEntityImpl.java   |   79 -
 .../brooklyn/entity/basic/DelegateEntity.java   |   73 -
 .../entity/basic/DelegateEntityImpl.java        |   49 -
 .../brooklyn/entity/basic/DynamicGroup.java     |   88 -
 .../brooklyn/entity/basic/DynamicGroupImpl.java |  230 ---
 .../entity/basic/EffectorStartableImpl.java     |   79 -
 .../java/brooklyn/entity/basic/Entities.java    | 1107 -----------
 .../brooklyn/entity/basic/EntityAdjuncts.java   |   71 -
 .../entity/basic/EntityAndAttribute.java        |  107 --
 .../brooklyn/entity/basic/EntityConfigMap.java  |  305 ---
 .../entity/basic/EntityDynamicType.java         |  339 ----
 .../brooklyn/entity/basic/EntityFactory.java    |   32 -
 .../entity/basic/EntityFactoryForLocation.java  |   30 -
 .../brooklyn/entity/basic/EntityFunctions.java  |  152 --
 .../entity/basic/EntityInitializers.java        |   49 -
 .../brooklyn/entity/basic/EntityInternal.java   |  200 --
 .../brooklyn/entity/basic/EntityPredicates.java |  451 -----
 .../brooklyn/entity/basic/EntitySuppliers.java  |   48 -
 .../java/brooklyn/entity/basic/EntityTasks.java |   82 -
 .../basic/EntityTransientCopyInternal.java      |  121 --
 .../entity/basic/EntityTypeSnapshot.java        |  126 --
 .../java/brooklyn/entity/basic/EntityTypes.java |   28 -
 .../brooklyn/entity/basic/ExplicitEffector.java |   74 -
 .../java/brooklyn/entity/basic/Lifecycle.java   |  185 --
 .../brooklyn/entity/basic/MethodEffector.java   |  180 --
 .../brooklyn/entity/basic/PolicyDescriptor.java |   66 -
 .../java/brooklyn/entity/basic/QuorumCheck.java |  108 --
 .../java/brooklyn/entity/basic/Sanitizer.java   |  172 --
 .../entity/basic/ServiceStateLogic.java         |  634 -------
 .../entity/basic/StartableApplication.java      |   26 -
 .../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      |   84 -
 .../DownloadProducerFromLocalRepo.java          |   85 -
 .../DownloadProducerFromProperties.java         |  345 ----
 .../DownloadProducerFromUrlAttribute.java       |   64 -
 .../drivers/downloads/DownloadSubstituters.java |  173 --
 .../drivers/downloads/FilenameProducers.java    |   64 -
 .../entity/effector/AddChildrenEffector.java    |  118 --
 .../brooklyn/entity/effector/AddEffector.java   |  117 --
 .../brooklyn/entity/effector/AddSensor.java     |  127 --
 .../entity/effector/EffectorAndBody.java        |   61 -
 .../brooklyn/entity/effector/EffectorBase.java  |  107 --
 .../brooklyn/entity/effector/EffectorBody.java  |  101 -
 .../brooklyn/entity/effector/EffectorTasks.java |  231 ---
 .../entity/effector/EffectorWithBody.java       |   33 -
 .../brooklyn/entity/effector/Effectors.java     |  204 --
 .../group/AbstractMembershipTrackingPolicy.java |  248 ---
 .../java/brooklyn/entity/group/Cluster.java     |   36 -
 .../brooklyn/entity/group/DynamicCluster.java   |  204 --
 .../entity/group/DynamicClusterImpl.java        |  888 ---------
 .../brooklyn/entity/group/DynamicFabric.java    |   77 -
 .../entity/group/DynamicFabricImpl.java         |  276 ---
 .../entity/group/DynamicMultiGroup.java         |  106 --
 .../entity/group/DynamicMultiGroupImpl.java     |  206 ---
 .../entity/group/DynamicRegionsFabric.java      |   43 -
 .../entity/group/DynamicRegionsFabricImpl.java  |   78 -
 .../main/java/brooklyn/entity/group/Fabric.java |   26 -
 .../brooklyn/entity/group/QuarantineGroup.java  |   37 -
 .../entity/group/QuarantineGroupImpl.java       |  104 --
 .../group/StopFailedRuntimeException.java       |   40 -
 .../main/java/brooklyn/entity/group/Tier.java   |   28 -
 .../zoneaware/AbstractZoneFailureDetector.java  |  127 --
 .../BalancingNodePlacementStrategy.java         |  132 --
 .../zoneaware/CombiningZoneFailureDetector.java |   82 -
 .../CriticalCauseZoneFailureDetector.java       |   56 -
 .../ProportionalZoneFailureDetector.java        |   59 -
 .../proxying/BasicEntityTypeRegistry.java       |  156 --
 .../brooklyn/entity/proxying/EntityProxy.java   |   27 -
 .../entity/proxying/EntityProxyImpl.java        |  274 ---
 .../entity/proxying/InternalEntityFactory.java  |  403 ----
 .../entity/proxying/InternalFactory.java        |  131 --
 .../proxying/InternalLocationFactory.java       |  151 --
 .../entity/proxying/InternalPolicyFactory.java  |  199 --
 .../AbstractBrooklynObjectRebindSupport.java    |  103 --
 .../rebind/ActivePartialRebindIteration.java    |  165 --
 .../rebind/BasicCatalogItemRebindSupport.java   |   67 -
 .../rebind/BasicEnricherRebindSupport.java      |   51 -
 .../entity/rebind/BasicEntityRebindSupport.java |  237 ---
 .../entity/rebind/BasicFeedRebindSupport.java   |   50 -
 .../rebind/BasicLocationRebindSupport.java      |  139 --
 .../entity/rebind/BasicPolicyRebindSupport.java |   51 -
 .../rebind/ImmediateDeltaChangeListener.java    |  155 --
 .../rebind/InitialFullRebindIteration.java      |  134 --
 .../rebind/PeriodicDeltaChangeListener.java     |  502 -----
 .../rebind/PersistenceExceptionHandlerImpl.java |  108 --
 .../entity/rebind/PersisterDeltaImpl.java       |  174 --
 .../entity/rebind/RebindContextImpl.java        |  190 --
 .../rebind/RebindContextLookupContext.java      |  157 --
 .../rebind/RebindExceptionHandlerImpl.java      |  471 -----
 .../brooklyn/entity/rebind/RebindIteration.java | 1163 ------------
 .../entity/rebind/RebindManagerImpl.java        |  665 -------
 .../java/brooklyn/entity/rebind/TreeUtils.java  |   56 -
 .../entity/rebind/dto/AbstractMemento.java      |  230 ---
 .../rebind/dto/AbstractTreeNodeMemento.java     |  113 --
 .../rebind/dto/BasicCatalogItemMemento.java     |  256 ---
 .../entity/rebind/dto/BasicEnricherMemento.java |   94 -
 .../entity/rebind/dto/BasicEntityMemento.java   |  327 ----
 .../entity/rebind/dto/BasicFeedMemento.java     |   94 -
 .../entity/rebind/dto/BasicLocationMemento.java |  108 --
 .../entity/rebind/dto/BasicPolicyMemento.java   |   94 -
 .../entity/rebind/dto/BrooklynMementoImpl.java  |  257 ---
 .../rebind/dto/BrooklynMementoManifestImpl.java |  172 --
 .../rebind/dto/EntityMementoManifestImpl.java   |   56 -
 .../entity/rebind/dto/MementoValidators.java    |   67 -
 .../entity/rebind/dto/MementosGenerators.java   |  483 -----
 .../rebind/dto/MutableBrooklynMemento.java      |  293 ---
 .../BrooklynMementoPersisterToObjectStore.java  |  698 -------
 .../persister/BrooklynPersistenceUtils.java     |  271 ---
 .../CatalogItemLibrariesConverter.java          |   68 -
 .../rebind/persister/FileBasedObjectStore.java  |  425 -----
 .../persister/FileBasedStoreObjectAccessor.java |  132 --
 .../persister/LocationWithObjectStore.java      |   27 -
 .../rebind/persister/MementoSerializer.java     |   52 -
 .../entity/rebind/persister/PersistMode.java    |   26 -
 .../persister/PersistenceActivityMetrics.java   |   83 -
 .../persister/PersistenceObjectStore.java       |  142 --
 .../persister/RetryingMementoSerializer.java    |   95 -
 .../persister/StoreObjectAccessorLocking.java   |  219 ---
 .../rebind/persister/XmlMementoSerializer.java  |  506 -----
 .../dto/BasicManagementNodeSyncRecord.java      |  195 --
 .../dto/ManagementPlaneSyncRecordImpl.java      |   99 -
 .../transformer/BrooklynMementoTransformer.java |   32 -
 .../rebind/transformer/CompoundTransformer.java |  292 ---
 .../transformer/CompoundTransformerLoader.java  |  109 --
 .../rebind/transformer/RawDataTransformer.java  |   30 -
 .../DeleteOrphanedLocationsTransformer.java     |  126 --
 .../transformer/impl/XsltTransformer.java       |   59 -
 .../java/brooklyn/entity/trait/Changeable.java  |   36 -
 .../entity/trait/MemberReplaceable.java         |   45 -
 .../java/brooklyn/entity/trait/Resizable.java   |   50 -
 .../java/brooklyn/entity/trait/Startable.java   |  124 --
 .../brooklyn/entity/trait/StartableMethods.java |  126 --
 .../basic/AbstractCollectionConfigKey.java      |  119 --
 .../basic/AbstractStructuredConfigKey.java      |  136 --
 .../java/brooklyn/event/basic/AttributeMap.java |  203 --
 .../basic/AttributeSensorAndConfigKey.java      |  147 --
 .../event/basic/BasicAttributeSensor.java       |   62 -
 .../basic/BasicAttributeSensorAndConfigKey.java |  114 --
 .../brooklyn/event/basic/BasicConfigKey.java    |  281 ---
 .../event/basic/BasicNotificationSensor.java    |   36 -
 .../java/brooklyn/event/basic/BasicSensor.java  |  114 --
 .../brooklyn/event/basic/BasicSensorEvent.java  |  112 --
 .../event/basic/DependentConfiguration.java     |  824 ---------
 .../brooklyn/event/basic/ListConfigKey.java     |  127 --
 .../java/brooklyn/event/basic/MapConfigKey.java |  205 ---
 .../basic/PortAttributeSensorAndConfigKey.java  |  143 --
 .../main/java/brooklyn/event/basic/Sensors.java |  164 --
 .../java/brooklyn/event/basic/SetConfigKey.java |  118 --
 .../event/basic/StructuredConfigKey.java        |   60 -
 .../event/basic/SubElementConfigKey.java        |   77 -
 ...platedStringAttributeSensorAndConfigKey.java |   67 -
 .../java/brooklyn/event/feed/AbstractFeed.java  |  241 ---
 .../event/feed/AttributePollHandler.java        |  249 ---
 .../brooklyn/event/feed/ConfigToAttributes.java |   60 -
 .../event/feed/DelegatingPollHandler.java       |   96 -
 .../java/brooklyn/event/feed/FeedConfig.java    |  298 ---
 .../java/brooklyn/event/feed/PollConfig.java    |   85 -
 .../java/brooklyn/event/feed/PollHandler.java   |   38 -
 .../main/java/brooklyn/event/feed/Poller.java   |  206 ---
 .../event/feed/function/FunctionFeed.java       |  209 ---
 .../event/feed/function/FunctionPollConfig.java |  112 --
 .../java/brooklyn/event/feed/http/HttpFeed.java |  383 ----
 .../event/feed/http/HttpPollConfig.java         |  161 --
 .../brooklyn/event/feed/http/HttpPollValue.java |   40 -
 .../brooklyn/event/feed/http/HttpPolls.java     |   39 -
 .../event/feed/http/HttpValueFunctions.java     |  154 --
 .../brooklyn/event/feed/http/JsonFunctions.java |  235 ---
 .../brooklyn/event/feed/shell/ShellFeed.java    |  274 ---
 .../event/feed/shell/ShellPollConfig.java       |  126 --
 .../java/brooklyn/event/feed/ssh/SshFeed.java   |  292 ---
 .../brooklyn/event/feed/ssh/SshPollConfig.java  |  143 --
 .../brooklyn/event/feed/ssh/SshPollValue.java   |   60 -
 .../event/feed/ssh/SshValueFunctions.java       |   73 -
 .../windows/WindowsPerformanceCounterFeed.java  |  414 -----
 .../WindowsPerformanceCounterPollConfig.java    |   54 -
 .../brooklyn/basic/AbstractBrooklynObject.java  |  249 ---
 .../brooklyn/basic/BasicConfigurableObject.java |  119 --
 .../brooklyn/basic/BrooklynDynamicType.java     |  284 ---
 .../brooklyn/basic/BrooklynObjectInternal.java  |  103 --
 .../brooklyn/basic/BrooklynTypeSnapshot.java    |  101 -
 .../apache/brooklyn/basic/BrooklynTypes.java    |  132 --
 .../basic/internal/ApiObjectsFactoryImpl.java   |   42 -
 .../api/AssemblyTemplateSpecInstantiator.java   |    4 +-
 .../api/HasBrooklynManagementContext.java       |    2 +-
 .../apache/brooklyn/core/BrooklynLogging.java   |   73 +
 .../apache/brooklyn/core/BrooklynVersion.java   |  392 ++++
 .../brooklyn/core/catalog/CatalogLoadMode.java  |    3 +-
 .../core/catalog/CatalogPredicates.java         |    6 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |   16 +-
 .../catalog/internal/CatalogClasspathDo.java    |   13 +-
 .../core/catalog/internal/CatalogDo.java        |    4 +-
 .../core/catalog/internal/CatalogDto.java       |    2 +-
 .../core/catalog/internal/CatalogDtoUtils.java  |    2 +-
 .../catalog/internal/CatalogEntityItemDto.java  |    2 +-
 .../catalog/internal/CatalogInitialization.java |   14 +-
 .../core/catalog/internal/CatalogItemDo.java    |    8 +-
 .../internal/CatalogItemDtoAbstract.java        |   13 +-
 .../internal/CatalogTemplateItemDto.java        |    2 +-
 .../core/catalog/internal/CatalogUtils.java     |   25 +-
 .../catalog/internal/CatalogXmlSerializer.java  |    9 +-
 .../brooklyn/core/config/BasicConfigKey.java    |  281 +++
 .../brooklyn/core/config/BrooklynLogging.java   |   74 -
 .../core/config/BrooklynProperties.java         |  483 -----
 .../core/config/BrooklynServerConfig.java       |  192 --
 .../core/config/BrooklynServerPaths.java        |  281 ---
 .../core/config/BrooklynServiceAttributes.java  |   66 -
 .../apache/brooklyn/core/config/ConfigKeys.java |  265 +++
 .../brooklyn/core/config/ConfigUtils.java       |    5 +-
 .../brooklyn/core/config/ListConfigKey.java     |  128 ++
 .../brooklyn/core/config/MapConfigKey.java      |  206 +++
 .../apache/brooklyn/core/config/Sanitizer.java  |  172 ++
 .../brooklyn/core/config/SetConfigKey.java      |  119 ++
 .../core/config/StructuredConfigKey.java        |   60 +
 .../core/config/SubElementConfigKey.java        |   77 +
 .../internal/AbstractCollectionConfigKey.java   |  120 ++
 .../config/internal/AbstractConfigMapImpl.java  |    9 +-
 .../internal/AbstractStructuredConfigKey.java   |  139 ++
 .../core/config/render/RendererHints.java       |    2 +-
 .../core/internal/ApiObjectsFactoryImpl.java    |   41 +
 .../internal/BrooklynFeatureEnablement.java     |    5 +-
 .../core/internal/BrooklynInitialization.java   |   10 +-
 .../core/internal/BrooklynProperties.java       |  482 +++++
 .../core/internal/storage/DataGridFactory.java  |    4 +-
 .../impl/inmemory/InMemoryDataGridFactory.java  |    2 +-
 .../management/ManagementContextInjectable.java |   33 -
 .../AbstractBrooklynClassLoadingContext.java    |   81 -
 .../BrooklynClassLoadingContextSequential.java  |  135 --
 ...ssLoaderFromBrooklynClassLoadingContext.java |   66 -
 .../JavaBrooklynClassLoadingContext.java        |  122 --
 .../OsgiBrooklynClassLoadingContext.java        |  146 --
 .../BasicEntitlementClassDefinition.java        |   56 -
 .../entitlement/EntitlementManagerAdapter.java  |  133 --
 .../entitlement/EntitlementPredicates.java      |   40 -
 .../management/entitlement/Entitlements.java    |  418 -----
 .../entitlement/NotEntitledException.java       |   44 -
 .../entitlement/PerUserEntitlementManager.java  |  100 -
 .../PerUserEntitlementManagerWithDefault.java   |   31 -
 .../entitlement/WebEntitlementContext.java      |   56 -
 .../core/management/ha/BasicMasterChooser.java  |  203 --
 .../ha/HighAvailabilityManagerImpl.java         | 1105 -----------
 .../ha/ManagementPlaneSyncRecordDeltaImpl.java  |  122 --
 ...ntPlaneSyncRecordPersisterToObjectStore.java |  355 ----
 .../core/management/ha/MasterChooser.java       |   39 -
 .../core/management/ha/OsgiManager.java         |  311 ----
 .../internal/AbstractManagementContext.java     |  484 -----
 .../internal/AbstractSubscriptionManager.java   |  141 --
 .../core/management/internal/AccessManager.java |   41 -
 .../internal/AsyncCollectionChangeAdapter.java  |   82 -
 .../internal/BasicSubscriptionContext.java      |  180 --
 .../internal/BrooklynGarbageCollector.java      |  626 -------
 .../internal/BrooklynObjectManagementMode.java  |   31 -
 .../internal/BrooklynObjectManagerInternal.java |   36 -
 .../internal/CollectionChangeListener.java      |   24 -
 .../core/management/internal/EffectorUtils.java |  356 ----
 .../internal/EntityChangeListener.java          |   78 -
 .../internal/EntityManagementSupport.java       |  478 -----
 .../internal/EntityManagementUtils.java         |  325 ----
 .../internal/EntityManagerInternal.java         |   32 -
 ...PropertyChangeToCollectionChangeAdapter.java |   65 -
 .../management/internal/LocalAccessManager.java |  111 --
 .../management/internal/LocalEntityManager.java |  818 --------
 .../internal/LocalLocationManager.java          |  462 -----
 .../internal/LocalManagementContext.java        |  421 -----
 .../internal/LocalSubscriptionManager.java      |  292 ---
 .../management/internal/LocalUsageManager.java  |  429 -----
 .../internal/LocationManagerInternal.java       |   28 -
 .../internal/ManagementContextInternal.java     |  122 --
 .../internal/ManagementTransitionInfo.java      |   48 -
 .../internal/ManagementTransitionMode.java      |  127 --
 .../internal/NonDeploymentAccessManager.java    |   98 -
 .../internal/NonDeploymentEntityManager.java    |  196 --
 .../internal/NonDeploymentLocationManager.java  |  146 --
 .../NonDeploymentManagementContext.java         |  639 -------
 .../internal/NonDeploymentUsageManager.java     |  132 --
 .../internal/QueueingSubscriptionManager.java   |  148 --
 .../core/management/internal/Subscription.java  |   65 -
 .../internal/SubscriptionTracker.java           |  137 --
 .../core/management/internal/UsageListener.java |  103 --
 .../core/management/internal/UsageManager.java  |  166 --
 .../core/management/usage/ApplicationUsage.java |  126 --
 .../core/management/usage/LocationUsage.java    |  135 --
 .../apache/brooklyn/core/mgmt/BrooklynTags.java |   66 +
 .../brooklyn/core/mgmt/BrooklynTaskTags.java    |  447 +++++
 .../brooklyn/core/mgmt/BrooklynTasks.java       |   25 +
 .../core/mgmt/EntityManagementUtils.java        |  323 ++++
 .../core/mgmt/ManagementContextInjectable.java  |   33 +
 .../AbstractBrooklynClassLoadingContext.java    |   81 +
 .../BrooklynClassLoadingContextSequential.java  |  135 ++
 ...ssLoaderFromBrooklynClassLoadingContext.java |   66 +
 .../JavaBrooklynClassLoadingContext.java        |  122 ++
 .../OsgiBrooklynClassLoadingContext.java        |  146 ++
 .../BasicEntitlementClassDefinition.java        |   56 +
 .../entitlement/EntitlementManagerAdapter.java  |  133 ++
 .../mgmt/entitlement/EntitlementPredicates.java |   40 +
 .../core/mgmt/entitlement/Entitlements.java     |  417 +++++
 .../mgmt/entitlement/NotEntitledException.java  |   44 +
 .../entitlement/PerUserEntitlementManager.java  |   99 +
 .../PerUserEntitlementManagerWithDefault.java   |   31 +
 .../mgmt/entitlement/WebEntitlementContext.java |   56 +
 .../core/mgmt/ha/BasicMasterChooser.java        |  203 ++
 .../mgmt/ha/HighAvailabilityManagerImpl.java    | 1104 +++++++++++
 .../ha/ManagementPlaneSyncRecordDeltaImpl.java  |  122 ++
 ...ntPlaneSyncRecordPersisterToObjectStore.java |  354 ++++
 .../brooklyn/core/mgmt/ha/MasterChooser.java    |   39 +
 .../brooklyn/core/mgmt/ha/OsgiManager.java      |  309 ++++
 .../ha/dto/BasicManagementNodeSyncRecord.java   |  194 ++
 .../ha/dto/ManagementPlaneSyncRecordImpl.java   |   99 +
 .../internal/AbstractManagementContext.java     |  482 +++++
 .../internal/AbstractSubscriptionManager.java   |  141 ++
 .../core/mgmt/internal/AccessManager.java       |   41 +
 .../internal/AsyncCollectionChangeAdapter.java  |   82 +
 .../mgmt/internal/BasicSubscriptionContext.java |  180 ++
 .../mgmt/internal/BrooklynGarbageCollector.java |  625 +++++++
 .../internal/BrooklynObjectManagementMode.java  |   31 +
 .../internal/BrooklynObjectManagerInternal.java |   36 +
 .../mgmt/internal/BrooklynShutdownHooks.java    |  242 +++
 .../mgmt/internal/CollectionChangeListener.java |   24 +
 .../core/mgmt/internal/EffectorUtils.java       |  355 ++++
 .../mgmt/internal/EntityChangeListener.java     |   78 +
 .../mgmt/internal/EntityManagementSupport.java  |  477 +++++
 .../mgmt/internal/EntityManagerInternal.java    |   32 +
 ...PropertyChangeToCollectionChangeAdapter.java |   65 +
 .../core/mgmt/internal/LocalAccessManager.java  |  111 ++
 .../core/mgmt/internal/LocalEntityManager.java  |  817 ++++++++
 .../mgmt/internal/LocalLocationManager.java     |  460 +++++
 .../mgmt/internal/LocalManagementContext.java   |  420 +++++
 .../mgmt/internal/LocalSubscriptionManager.java |  291 +++
 .../core/mgmt/internal/LocalUsageManager.java   |  427 +++++
 .../mgmt/internal/LocationManagerInternal.java  |   28 +
 .../internal/ManagementContextInternal.java     |  121 ++
 .../mgmt/internal/ManagementTransitionInfo.java |   48 +
 .../mgmt/internal/ManagementTransitionMode.java |  127 ++
 .../internal/NonDeploymentAccessManager.java    |   98 +
 .../internal/NonDeploymentEntityManager.java    |  196 ++
 .../internal/NonDeploymentLocationManager.java  |  146 ++
 .../NonDeploymentManagementContext.java         |  638 +++++++
 .../internal/NonDeploymentUsageManager.java     |  131 ++
 .../internal/QueueingSubscriptionManager.java   |  148 ++
 .../core/mgmt/internal/Subscription.java        |   65 +
 .../core/mgmt/internal/SubscriptionTracker.java |  137 ++
 .../core/mgmt/internal/UsageListener.java       |  103 ++
 .../core/mgmt/internal/UsageManager.java        |  165 ++
 .../BrooklynMementoPersisterToObjectStore.java  |  697 +++++++
 .../mgmt/persist/BrooklynPersistenceUtils.java  |  269 +++
 .../persist/CatalogItemLibrariesConverter.java  |   68 +
 .../core/mgmt/persist/FileBasedObjectStore.java |  425 +++++
 .../persist/FileBasedStoreObjectAccessor.java   |  132 ++
 .../mgmt/persist/LocationWithObjectStore.java   |   27 +
 .../core/mgmt/persist/MementoSerializer.java    |   52 +
 .../brooklyn/core/mgmt/persist/PersistMode.java |   26 +
 .../persist/PersistenceActivityMetrics.java     |   83 +
 .../mgmt/persist/PersistenceObjectStore.java    |  142 ++
 .../mgmt/persist/RetryingMementoSerializer.java |   95 +
 .../persist/StoreObjectAccessorLocking.java     |  218 +++
 .../core/mgmt/persist/XmlMementoSerializer.java |  505 +++++
 .../AbstractBrooklynObjectRebindSupport.java    |  102 +
 .../rebind/ActivePartialRebindIteration.java    |  164 ++
 .../rebind/BasicCatalogItemRebindSupport.java   |   67 +
 .../mgmt/rebind/BasicEnricherRebindSupport.java |   50 +
 .../mgmt/rebind/BasicEntityRebindSupport.java   |  236 +++
 .../mgmt/rebind/BasicFeedRebindSupport.java     |   49 +
 .../mgmt/rebind/BasicLocationRebindSupport.java |  137 ++
 .../mgmt/rebind/BasicPolicyRebindSupport.java   |   51 +
 .../rebind/ImmediateDeltaChangeListener.java    |  154 ++
 .../mgmt/rebind/InitialFullRebindIteration.java |  133 ++
 .../rebind/PeriodicDeltaChangeListener.java     |  501 +++++
 .../rebind/PersistenceExceptionHandlerImpl.java |  108 ++
 .../core/mgmt/rebind/PersisterDeltaImpl.java    |  174 ++
 .../core/mgmt/rebind/RebindContextImpl.java     |  190 ++
 .../mgmt/rebind/RebindContextLookupContext.java |  157 ++
 .../mgmt/rebind/RebindExceptionHandlerImpl.java |  471 +++++
 .../core/mgmt/rebind/RebindIteration.java       | 1161 ++++++++++++
 .../core/mgmt/rebind/RebindManagerImpl.java     |  664 +++++++
 .../brooklyn/core/mgmt/rebind/TreeUtils.java    |   56 +
 .../core/mgmt/rebind/dto/AbstractMemento.java   |  229 +++
 .../rebind/dto/AbstractTreeNodeMemento.java     |  113 ++
 .../rebind/dto/BasicCatalogItemMemento.java     |  256 +++
 .../mgmt/rebind/dto/BasicEnricherMemento.java   |   93 +
 .../mgmt/rebind/dto/BasicEntityMemento.java     |  326 ++++
 .../core/mgmt/rebind/dto/BasicFeedMemento.java  |   93 +
 .../mgmt/rebind/dto/BasicLocationMemento.java   |  107 ++
 .../mgmt/rebind/dto/BasicPolicyMemento.java     |   93 +
 .../mgmt/rebind/dto/BrooklynMementoImpl.java    |  256 +++
 .../rebind/dto/BrooklynMementoManifestImpl.java |  172 ++
 .../rebind/dto/EntityMementoManifestImpl.java   |   56 +
 .../core/mgmt/rebind/dto/MementoValidators.java |   67 +
 .../mgmt/rebind/dto/MementosGenerators.java     |  481 +++++
 .../mgmt/rebind/dto/MutableBrooklynMemento.java |  293 +++
 .../transformer/BrooklynMementoTransformer.java |   32 +
 .../rebind/transformer/CompoundTransformer.java |  291 +++
 .../transformer/CompoundTransformerLoader.java  |  108 ++
 .../rebind/transformer/RawDataTransformer.java  |   30 +
 .../DeleteOrphanedLocationsTransformer.java     |  125 ++
 .../transformer/impl/XsltTransformer.java       |   59 +
 .../core/mgmt/usage/ApplicationUsage.java       |  126 ++
 .../brooklyn/core/mgmt/usage/LocationUsage.java |  135 ++
 .../core/objs/AbstractBrooklynObject.java       |  248 +++
 .../core/objs/AbstractEntityAdjunct.java        |  514 ++++++
 .../brooklyn/core/objs/AdjunctConfigMap.java    |  139 ++
 .../apache/brooklyn/core/objs/AdjunctType.java  |  173 ++
 .../core/objs/BasicConfigurableObject.java      |  119 ++
 .../core/objs/BasicEntityTypeRegistry.java      |  156 ++
 .../brooklyn/core/objs/BrooklynDynamicType.java |  283 +++
 .../core/objs/BrooklynObjectInternal.java       |  103 ++
 .../core/objs/BrooklynTypeSnapshot.java         |  101 +
 .../brooklyn/core/objs/BrooklynTypes.java       |  131 ++
 .../brooklyn/core/objs/proxy/EntityProxy.java   |   27 +
 .../core/objs/proxy/EntityProxyImpl.java        |  273 +++
 .../core/objs/proxy/InternalEntityFactory.java  |  402 ++++
 .../core/objs/proxy/InternalFactory.java        |  131 ++
 .../objs/proxy/InternalLocationFactory.java     |  151 ++
 .../core/objs/proxy/InternalPolicyFactory.java  |  198 ++
 .../policy/basic/AbstractEntityAdjunct.java     |  510 -----
 .../core/policy/basic/AbstractPolicy.java       |  119 --
 .../brooklyn/core/policy/basic/AdjunctType.java |  173 --
 .../core/policy/basic/ConfigMapImpl.java        |  140 --
 .../core/policy/basic/GeneralPurposePolicy.java |   36 -
 .../brooklyn/core/policy/basic/Policies.java    |   73 -
 .../core/policy/basic/PolicyDynamicType.java    |   44 -
 .../core/policy/basic/PolicyTypeSnapshot.java   |   39 -
 .../core/server/BrooklynServerConfig.java       |  191 ++
 .../core/server/BrooklynServerPaths.java        |  281 +++
 .../core/server/BrooklynServiceAttributes.java  |   66 +
 .../core/server/entity/BrooklynMetrics.java     |   55 +
 .../core/server/entity/BrooklynMetricsImpl.java |   86 +
 .../core/util/BrooklynLanguageExtensions.java   |   47 -
 .../core/util/BrooklynMavenArtifacts.java       |   59 -
 .../core/util/BrooklynNetworkUtils.java         |   42 -
 .../brooklyn/core/util/ResourceUtils.java       |  638 -------
 .../brooklyn/core/util/config/ConfigBag.java    |  589 ------
 .../core/util/crypto/FluentKeySigner.java       |  191 --
 .../brooklyn/core/util/crypto/SecureKeys.java   |  185 --
 .../brooklyn/core/util/file/ArchiveBuilder.java |  423 -----
 .../brooklyn/core/util/file/ArchiveTasks.java   |   57 -
 .../brooklyn/core/util/file/ArchiveUtils.java   |  350 ----
 .../core/util/flags/ClassCoercionException.java |   39 -
 .../brooklyn/core/util/flags/FlagUtils.java     |  586 ------
 .../core/util/flags/MethodCoercions.java        |  185 --
 .../brooklyn/core/util/flags/SetFromFlag.java   |   71 -
 .../brooklyn/core/util/flags/TypeCoercions.java |  879 ---------
 .../brooklyn/core/util/http/HttpTool.java       |  386 ----
 .../core/util/http/HttpToolResponse.java        |  185 --
 .../util/internal/ConfigKeySelfExtracting.java  |   40 -
 .../brooklyn/core/util/internal/Repeater.java   |  369 ----
 .../ssh/BackoffLimitedRetryHandler.java         |   73 -
 .../util/internal/ssh/ShellAbstractTool.java    |  441 -----
 .../core/util/internal/ssh/ShellTool.java       |  114 --
 .../core/util/internal/ssh/SshAbstractTool.java |  172 --
 .../core/util/internal/ssh/SshException.java    |   32 -
 .../core/util/internal/ssh/SshTool.java         |  175 --
 .../core/util/internal/ssh/cli/SshCliTool.java  |  317 ----
 .../util/internal/ssh/process/ProcessTool.java  |  214 ---
 .../internal/ssh/sshj/SshjClientConnection.java |  281 ---
 .../core/util/internal/ssh/sshj/SshjTool.java   | 1090 -----------
 .../core/util/javalang/ReflectionScanner.java   |  134 --
 .../core/util/javalang/UrlClassLoader.java      |   69 -
 .../brooklyn/core/util/mutex/MutexSupport.java  |  119 --
 .../core/util/mutex/SemaphoreForTasks.java      |  111 --
 .../core/util/mutex/SemaphoreWithOwners.java    |  231 ---
 .../brooklyn/core/util/mutex/WithMutexes.java   |   45 -
 .../apache/brooklyn/core/util/osgi/Osgis.java   |  719 --------
 .../util/task/AbstractExecutionContext.java     |   75 -
 .../core/util/task/BasicExecutionContext.java   |  221 ---
 .../core/util/task/BasicExecutionManager.java   |  754 --------
 .../brooklyn/core/util/task/BasicTask.java      |  891 ---------
 .../brooklyn/core/util/task/CanSetName.java     |   25 -
 .../brooklyn/core/util/task/CompoundTask.java   |  131 --
 .../core/util/task/DeferredSupplier.java        |   38 -
 .../core/util/task/DynamicSequentialTask.java   |  480 -----
 .../brooklyn/core/util/task/DynamicTasks.java   |  337 ----
 .../core/util/task/ExecutionListener.java       |   31 -
 .../brooklyn/core/util/task/ExecutionUtils.java |   49 -
 .../brooklyn/core/util/task/ForwardingTask.java |  324 ----
 .../util/task/ListenableForwardingFuture.java   |   50 -
 .../brooklyn/core/util/task/ParallelTask.java   |   84 -
 .../brooklyn/core/util/task/ScheduledTask.java  |  184 --
 .../brooklyn/core/util/task/SequentialTask.java |   58 -
 .../core/util/task/SingleThreadedScheduler.java |  216 ---
 .../brooklyn/core/util/task/TaskBuilder.java    |  183 --
 .../brooklyn/core/util/task/TaskInternal.java   |  124 --
 .../brooklyn/core/util/task/TaskScheduler.java  |   41 -
 .../brooklyn/core/util/task/TaskTags.java       |   71 -
 .../apache/brooklyn/core/util/task/Tasks.java   |  487 -----
 .../brooklyn/core/util/task/ValueResolver.java  |  426 -----
 .../core/util/task/ssh/SshFetchTaskFactory.java |   88 -
 .../core/util/task/ssh/SshFetchTaskWrapper.java |  134 --
 .../core/util/task/ssh/SshPutTaskFactory.java   |  122 --
 .../core/util/task/ssh/SshPutTaskStub.java      |   69 -
 .../core/util/task/ssh/SshPutTaskWrapper.java   |  189 --
 .../brooklyn/core/util/task/ssh/SshTasks.java   |  235 ---
 .../internal/AbstractSshExecTaskFactory.java    |   58 -
 .../ssh/internal/PlainSshExecTaskFactory.java   |   71 -
 .../util/task/system/ProcessTaskFactory.java    |   64 -
 .../core/util/task/system/ProcessTaskStub.java  |  101 -
 .../util/task/system/ProcessTaskWrapper.java    |  187 --
 .../core/util/task/system/SystemTasks.java      |   29 -
 .../internal/AbstractProcessTaskFactory.java    |  215 ---
 .../system/internal/ExecWithLoggingHelpers.java |  199 --
 .../internal/SystemProcessTaskFactory.java      |  130 --
 .../core/util/text/DataUriSchemeParser.java     |  267 ---
 .../core/util/text/TemplateProcessor.java       |  398 ----
 ...ompilerIndependentOuterClassFieldMapper.java |  166 --
 .../xstream/EnumCaseForgivingConverter.java     |   60 -
 .../EnumCaseForgivingSingleValueConverter.java  |   35 -
 .../util/xstream/ImmutableListConverter.java    |   54 -
 .../util/xstream/ImmutableMapConverter.java     |   56 -
 .../util/xstream/ImmutableSetConverter.java     |   54 -
 .../util/xstream/Inet4AddressConverter.java     |   65 -
 .../core/util/xstream/MapConverter.java         |  104 --
 .../core/util/xstream/MutableSetConverter.java  |   44 -
 .../util/xstream/StringKeyMapConverter.java     |  133 --
 .../core/util/xstream/XmlSerializer.java        |   97 -
 .../brooklyn/core/util/xstream/XmlUtil.java     |   58 -
 .../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 ++
 .../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    |   86 +
 .../entity/group/AbstractGroupImpl.java         |  276 +++
 .../group/AbstractMembershipTrackingPolicy.java |  246 +++
 .../brooklyn/entity/group/BasicGroup.java       |   36 +
 .../brooklyn/entity/group/BasicGroupImpl.java   |   46 +
 .../apache/brooklyn/entity/group/Cluster.java   |   35 +
 .../brooklyn/entity/group/DynamicCluster.java   |  201 ++
 .../entity/group/DynamicClusterImpl.java        |  885 +++++++++
 .../brooklyn/entity/group/DynamicFabric.java    |   75 +
 .../entity/group/DynamicFabricImpl.java         |  274 +++
 .../brooklyn/entity/group/DynamicGroup.java     |   89 +
 .../brooklyn/entity/group/DynamicGroupImpl.java |  230 +++
 .../entity/group/DynamicMultiGroup.java         |  103 ++
 .../entity/group/DynamicMultiGroupImpl.java     |  203 ++
 .../entity/group/DynamicRegionsFabric.java      |   42 +
 .../entity/group/DynamicRegionsFabricImpl.java  |   77 +
 .../apache/brooklyn/entity/group/Fabric.java    |   26 +
 .../brooklyn/entity/group/QuarantineGroup.java  |   35 +
 .../entity/group/QuarantineGroupImpl.java       |  102 +
 .../group/StopFailedRuntimeException.java       |   40 +
 .../org/apache/brooklyn/entity/group/Tier.java  |   28 +
 .../zoneaware/AbstractZoneFailureDetector.java  |  126 ++
 .../BalancingNodePlacementStrategy.java         |  131 ++
 .../zoneaware/CombiningZoneFailureDetector.java |   81 +
 .../CriticalCauseZoneFailureDetector.java       |   56 +
 .../ProportionalZoneFailureDetector.java        |   59 +
 .../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 |   32 +
 .../entity/stock/BasicApplicationImpl.java      |   33 +
 .../brooklyn/entity/stock/BasicEntity.java      |   34 +
 .../brooklyn/entity/stock/BasicEntityImpl.java  |   30 +
 .../brooklyn/entity/stock/BasicStartable.java   |   56 +
 .../entity/stock/BasicStartableImpl.java        |  106 ++
 .../brooklyn/entity/stock/DataEntity.java       |   58 +
 .../brooklyn/entity/stock/DataEntityImpl.java   |   79 +
 .../brooklyn/entity/stock/DelegateEntity.java   |   73 +
 .../entity/stock/DelegateEntityImpl.java        |   49 +
 .../entity/stock/EffectorStartableImpl.java     |   79 +
 .../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 ++
 .../location/access/BrooklynAccessUtils.java    |   20 +-
 .../location/access/PortForwardManager.java     |    3 +-
 .../access/PortForwardManagerAuthority.java     |    3 +-
 .../access/PortForwardManagerClient.java        |    2 +-
 .../location/access/PortForwardManagerImpl.java |   11 +-
 .../PortForwardManagerLocationResolver.java     |   10 +-
 .../location/basic/AbstractLocation.java        |  709 -------
 .../basic/AbstractLocationResolver.java         |  188 --
 .../AggregatingMachineProvisioningLocation.java |  139 --
 .../location/basic/BasicHardwareDetails.java    |   56 -
 .../location/basic/BasicLocationDefinition.java |   85 -
 .../location/basic/BasicLocationRegistry.java   |  479 -----
 .../location/basic/BasicMachineDetails.java     |  180 --
 .../location/basic/BasicMachineMetadata.java    |   84 -
 .../brooklyn/location/basic/BasicOsDetails.java |  123 --
 .../location/basic/ByonLocationResolver.java    |  251 ---
 .../location/basic/CatalogLocationResolver.java |   79 -
 .../basic/DefinedLocationByIdResolver.java      |   74 -
 .../basic/DeprecatedKeysMappingBuilder.java     |   66 -
 .../FixedListMachineProvisioningLocation.java   |  475 -----
 .../location/basic/HasSubnetHostname.java       |   32 -
 .../location/basic/HostLocationResolver.java    |   90 -
 .../basic/LocalhostLocationResolver.java        |   74 -
 .../LocalhostMachineProvisioningLocation.java   |  347 ----
 ...calhostPropertiesFromBrooklynProperties.java |   56 -
 .../location/basic/LocationConfigKeys.java      |   80 -
 .../location/basic/LocationConfigUtils.java     |  560 ------
 .../location/basic/LocationDynamicType.java     |   40 -
 .../location/basic/LocationInternal.java        |   94 -
 .../location/basic/LocationPredicates.java      |  108 --
 ...ocationPropertiesFromBrooklynProperties.java |  223 ---
 .../location/basic/LocationTypeSnapshot.java    |   40 -
 .../brooklyn/location/basic/Locations.java      |  159 --
 .../brooklyn/location/basic/Machines.java       |  189 --
 .../brooklyn/location/basic/MultiLocation.java  |  167 --
 .../location/basic/MultiLocationResolver.java   |  145 --
 .../location/basic/NamedLocationResolver.java   |   96 -
 .../brooklyn/location/basic/PortRanges.java     |  257 ---
 .../basic/RegistryLocationResolver.java         |   42 -
 .../basic/SingleMachineLocationResolver.java    |   77 -
 .../SingleMachineProvisioningLocation.java      |   91 -
 .../location/basic/SshMachineLocation.java      | 1033 -----------
 .../location/basic/SupportsPortForwarding.java  |   39 -
 .../location/basic/WinRmMachineLocation.java    |  362 ----
 .../location/byon/ByonLocationResolver.java     |  253 +++
 .../FixedListMachineProvisioningLocation.java   |  476 +++++
 .../location/byon/HostLocationResolver.java     |   93 +
 .../byon/SingleMachineLocationResolver.java     |   81 +
 .../byon/SingleMachineProvisioningLocation.java |   91 +
 .../AbstractAvailabilityZoneExtension.java      |    2 +-
 ...bstractCloudMachineProvisioningLocation.java |    6 +-
 .../cloud/AvailabilityZoneExtension.java        |    5 +-
 .../location/cloud/CloudLocationConfig.java     |    9 +-
 .../cloud/names/AbstractCloudMachineNamer.java  |    4 +-
 .../cloud/names/BasicCloudMachineNamer.java     |    2 +-
 .../location/cloud/names/CloudMachineNamer.java |    2 +-
 .../cloud/names/CustomMachineNamer.java         |   10 +-
 .../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       |    5 +-
 .../location/dynamic/LocationOwner.java         |   11 +-
 .../brooklyn/location/geo/HostGeoInfo.java      |    6 +-
 .../location/geo/LocalhostExternalIpLoader.java |    2 +-
 .../localhost/LocalhostLocationResolver.java    |   76 +
 .../LocalhostMachineProvisioningLocation.java   |  352 ++++
 ...calhostPropertiesFromBrooklynProperties.java |   57 +
 .../location/ssh/SshMachineLocation.java        | 1037 +++++++++++
 .../winrm/AdvertiseWinrmLoginPolicy.java        |   80 +
 .../location/winrm/WinRmMachineLocation.java    |  362 ++++
 .../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   |   47 +
 .../util/core/BrooklynMavenArtifacts.java       |   58 +
 .../util/core/BrooklynNetworkUtils.java         |   42 +
 .../brooklyn/util/core/ResourceUtils.java       |  638 +++++++
 .../brooklyn/util/core/config/ConfigBag.java    |  588 ++++++
 .../util/core/crypto/FluentKeySigner.java       |  191 ++
 .../brooklyn/util/core/crypto/SecureKeys.java   |  185 ++
 .../brooklyn/util/core/file/ArchiveBuilder.java |  423 +++++
 .../brooklyn/util/core/file/ArchiveTasks.java   |   57 +
 .../brooklyn/util/core/file/ArchiveUtils.java   |  350 ++++
 .../util/core/flags/ClassCoercionException.java |   39 +
 .../brooklyn/util/core/flags/FlagUtils.java     |  586 ++++++
 .../util/core/flags/MethodCoercions.java        |  185 ++
 .../brooklyn/util/core/flags/SetFromFlag.java   |   71 +
 .../brooklyn/util/core/flags/TypeCoercions.java |  878 +++++++++
 .../brooklyn/util/core/http/HttpTool.java       |  386 ++++
 .../util/core/http/HttpToolResponse.java        |  184 ++
 .../core/internal/ConfigKeySelfExtracting.java  |   40 +
 .../brooklyn/util/core/internal/Repeater.java   |  369 ++++
 .../ssh/BackoffLimitedRetryHandler.java         |   73 +
 .../core/internal/ssh/ShellAbstractTool.java    |  441 +++++
 .../util/core/internal/ssh/ShellTool.java       |  113 ++
 .../util/core/internal/ssh/SshAbstractTool.java |  172 ++
 .../util/core/internal/ssh/SshException.java    |   32 +
 .../util/core/internal/ssh/SshTool.java         |  174 ++
 .../util/core/internal/ssh/cli/SshCliTool.java  |  316 ++++
 .../core/internal/ssh/process/ProcessTool.java  |  214 +++
 .../internal/ssh/sshj/SshjClientConnection.java |  281 +++
 .../util/core/internal/ssh/sshj/SshjTool.java   | 1090 +++++++++++
 .../util/core/javalang/ReflectionScanner.java   |  134 ++
 .../util/core/javalang/UrlClassLoader.java      |   69 +
 .../brooklyn/util/core/mutex/MutexSupport.java  |  119 ++
 .../util/core/mutex/SemaphoreForTasks.java      |  111 ++
 .../util/core/mutex/SemaphoreWithOwners.java    |  231 +++
 .../brooklyn/util/core/mutex/WithMutexes.java   |   45 +
 .../apache/brooklyn/util/core/osgi/Osgis.java   |  719 ++++++++
 .../core/task/AbstractExecutionContext.java     |   75 +
 .../util/core/task/BasicExecutionContext.java   |  220 +++
 .../util/core/task/BasicExecutionManager.java   |  754 ++++++++
 .../brooklyn/util/core/task/BasicTask.java      |  891 +++++++++
 .../brooklyn/util/core/task/CanSetName.java     |   25 +
 .../brooklyn/util/core/task/CompoundTask.java   |  130 ++
 .../util/core/task/DeferredSupplier.java        |   38 +
 .../util/core/task/DynamicSequentialTask.java   |  479 +++++
 .../brooklyn/util/core/task/DynamicTasks.java   |  336 ++++
 .../util/core/task/ExecutionListener.java       |   31 +
 .../brooklyn/util/core/task/ExecutionUtils.java |   49 +
 .../brooklyn/util/core/task/ForwardingTask.java |  324 ++++
 .../core/task/ListenableForwardingFuture.java   |   50 +
 .../brooklyn/util/core/task/ParallelTask.java   |   84 +
 .../brooklyn/util/core/task/ScheduledTask.java  |  184 ++
 .../brooklyn/util/core/task/SequentialTask.java |   58 +
 .../util/core/task/SingleThreadedScheduler.java |  216 +++
 .../brooklyn/util/core/task/TaskBuilder.java    |  183 ++
 .../brooklyn/util/core/task/TaskInternal.java   |  124 ++
 .../brooklyn/util/core/task/TaskScheduler.java  |   41 +
 .../brooklyn/util/core/task/TaskTags.java       |   71 +
 .../apache/brooklyn/util/core/task/Tasks.java   |  487 +++++
 .../brooklyn/util/core/task/ValueResolver.java  |  425 +++++
 .../util/core/task/ssh/SshFetchTaskFactory.java |   88 +
 .../util/core/task/ssh/SshFetchTaskWrapper.java |  134 ++
 .../util/core/task/ssh/SshPutTaskFactory.java   |  122 ++
 .../util/core/task/ssh/SshPutTaskStub.java      |   69 +
 .../util/core/task/ssh/SshPutTaskWrapper.java   |  189 ++
 .../brooklyn/util/core/task/ssh/SshTasks.java   |  233 +++
 .../internal/AbstractSshExecTaskFactory.java    |   58 +
 .../ssh/internal/PlainSshExecTaskFactory.java   |   71 +
 .../core/task/system/ProcessTaskFactory.java    |   64 +
 .../util/core/task/system/ProcessTaskStub.java  |  101 +
 .../core/task/system/ProcessTaskWrapper.java    |  186 ++
 .../util/core/task/system/SystemTasks.java      |   29 +
 .../internal/AbstractProcessTaskFactory.java    |  213 +++
 .../system/internal/ExecWithLoggingHelpers.java |  199 ++
 .../internal/SystemProcessTaskFactory.java      |  130 ++
 .../util/core/text/DataUriSchemeParser.java     |  267 +++
 .../util/core/text/TemplateProcessor.java       |  397 ++++
 ...ompilerIndependentOuterClassFieldMapper.java |  166 ++
 .../xstream/EnumCaseForgivingConverter.java     |   60 +
 .../EnumCaseForgivingSingleValueConverter.java  |   35 +
 .../core/xstream/ImmutableListConverter.java    |   54 +
 .../core/xstream/ImmutableMapConverter.java     |   56 +
 .../core/xstream/ImmutableSetConverter.java     |   54 +
 .../core/xstream/Inet4AddressConverter.java     |   65 +
 .../util/core/xstream/MapConverter.java         |  104 ++
 .../util/core/xstream/MutableSetConverter.java  |   44 +
 .../core/xstream/StringKeyMapConverter.java     |  133 ++
 .../util/core/xstream/XmlSerializer.java        |   97 +
 .../brooklyn/util/core/xstream/XmlUtil.java     |   58 +
 ...pi.basic.internal.ApiObjectsFactoryInterface |   19 -
 ...klyn.api.internal.ApiObjectsFactoryInterface |   19 +
 ...pache.brooklyn.api.location.LocationResolver |   16 +-
 .../recursiveCopyWithExtraRules.xslt            |   32 -
 .../recursiveCopyWithExtraRules.xslt            |   32 +
 .../test/java/brooklyn/BrooklynVersionTest.java |  126 --
 ...stomAggregatingEnricherDeprecatedTest.groovy |  367 ----
 .../enricher/CustomAggregatingEnricherTest.java |  557 ------
 .../java/brooklyn/enricher/EnrichersTest.java   |  503 -----
 ...SensorPropagatingEnricherDeprecatedTest.java |  109 --
 .../enricher/SensorPropagatingEnricherTest.java |  218 ---
 .../TransformingEnricherDeprecatedTest.groovy   |   84 -
 .../enricher/TransformingEnricherTest.java      |   72 -
 .../enricher/basic/BasicEnricherTest.java       |  119 --
 .../enricher/basic/EnricherConfigTest.java      |  148 --
 .../YamlRollingTimeWindowMeanEnricherTest.java  |  178 --
 .../YamlTimeWeightedDeltaEnricherTest.java      |  107 --
 .../entity/BrooklynAppLiveTestSupport.java      |   67 -
 .../entity/BrooklynAppUnitTestSupport.java      |   75 -
 .../brooklyn/entity/EffectorMetadataTest.java   |  166 --
 .../entity/EffectorSayHiGroovyTest.groovy       |  186 --
 .../java/brooklyn/entity/EffectorSayHiTest.java |  173 --
 .../entity/EntityPreManagementTest.java         |  147 --
 .../java/brooklyn/entity/SetFromFlagTest.java   |  215 ---
 .../basic/AbstractApplicationLegacyTest.java    |  154 --
 .../entity/basic/AbstractEntityLegacyTest.java  |  129 --
 .../brooklyn/entity/basic/AttributeMapTest.java |  227 ---
 .../brooklyn/entity/basic/AttributeTest.java    |   67 -
 .../entity/basic/BasicStartableTest.java        |  172 --
 .../entity/basic/BrooklynShutdownHooksTest.java |   92 -
 .../basic/ConfigEntityInheritanceTest.java      |  188 --
 .../brooklyn/entity/basic/ConfigKeysTest.java   |   87 -
 .../entity/basic/ConfigMapGroovyTest.groovy     |   61 -
 .../brooklyn/entity/basic/ConfigMapTest.java    |  296 ---
 .../brooklyn/entity/basic/DataEntityTest.java   |  141 --
 .../basic/DependentConfigurationTest.java       |  410 -----
 .../entity/basic/DynamicEntityTest.java         |   59 -
 .../brooklyn/entity/basic/DynamicGroupTest.java |  545 ------
 .../brooklyn/entity/basic/EntitiesTest.java     |  133 --
 .../basic/EntityConfigMapUsageLegacyTest.java   |  292 ---
 .../entity/basic/EntityConfigMapUsageTest.java  |  319 ----
 .../brooklyn/entity/basic/EntityConfigTest.java |  174 --
 .../entity/basic/EntityFunctionsTest.java       |   77 -
 .../entity/basic/EntityLocationsTest.java       |  127 --
 .../entity/basic/EntityPredicatesTest.java      |  127 --
 .../entity/basic/EntityRegistrationTest.java    |  101 -
 .../brooklyn/entity/basic/EntitySpecTest.java   |  214 ---
 .../entity/basic/EntitySubscriptionTest.java    |  243 ---
 .../entity/basic/EntitySuppliersTest.java       |   71 -
 .../brooklyn/entity/basic/EntityTypeTest.java   |  282 ---
 .../entity/basic/LifecycleTransitionTest.java   |   51 -
 .../basic/MapConfigKeyAndFriendsMoreTest.java   |  274 ---
 ...apListAndOtherStructuredConfigKeyTest.groovy |  357 ----
 .../entity/basic/OwnedChildrenTest.java         |  210 ---
 .../entity/basic/PolicyRegistrationTest.java    |  151 --
 .../brooklyn/entity/basic/SanitizerTest.java    |   37 -
 .../entity/basic/ServiceStateLogicTest.java     |  309 ----
 .../drivers/BasicEntityDriverManagerTest.java   |   75 -
 .../drivers/EntityDriverRegistryTest.java       |   61 -
 .../ReflectiveEntityDriverFactoryTest.java      |  171 --
 .../RegistryEntityDriverFactoryTest.java        |   87 -
 .../downloads/BasicDownloadsRegistryTest.java   |  157 --
 .../DownloadProducerFromLocalRepoTest.java      |  130 --
 .../DownloadProducerFromPropertiesTest.java     |  161 --
 .../downloads/DownloadSubstitutersTest.java     |  131 --
 .../downloads/FilenameProducersTest.java        |   33 -
 .../drivers/downloads/MyEntityDriver.java       |   44 -
 .../entity/effector/EffectorBasicTest.java      |  185 --
 .../effector/EffectorConcatenateTest.java       |  242 ---
 .../entity/effector/EffectorTaskTest.java       |  434 -----
 .../entity/group/DynamicClusterTest.java        |  985 ----------
 ...DynamicClusterWithAvailabilityZonesTest.java |  226 ---
 .../entity/group/DynamicFabricTest.java         |  498 -----
 .../entity/group/DynamicMultiGroupTest.java     |  224 ---
 .../entity/group/DynamicRegionsFabricTest.java  |  171 --
 .../entity/group/GroupPickUpEntitiesTest.java   |  158 --
 .../java/brooklyn/entity/group/GroupTest.java   |  145 --
 .../group/MembershipTrackingPolicyTest.java     |  314 ----
 .../entity/group/QuarantineGroupTest.java       |   86 -
 .../BalancingNodePlacementStrategyTest.java     |  117 --
 .../ProportionalZoneFailureDetectorTest.java    |  124 --
 .../java/brooklyn/entity/hello/HelloEntity.java |   54 -
 .../brooklyn/entity/hello/HelloEntityImpl.java  |   31 -
 .../entity/hello/LocalEntitiesTest.java         |  284 ---
 .../ApplicationBuilderOverridingTest.java       |  221 ---
 .../proxying/BasicEntityTypeRegistryTest.java   |  135 --
 .../entity/proxying/EntityManagerTest.java      |   83 -
 .../entity/proxying/EntityProxyTest.java        |  171 --
 .../proxying/InternalEntityFactoryTest.java     |  107 --
 .../entity/rebind/ActivePartialRebindTest.java  |  108 --
 .../rebind/ActivePartialRebindVersionTest.java  |  119 --
 .../entity/rebind/CheckpointEntityTest.java     |  110 --
 .../java/brooklyn/entity/rebind/Dumpers.java    |  273 ---
 .../entity/rebind/RebindCatalogEntityTest.java  |  157 --
 .../entity/rebind/RebindCatalogItemTest.java    |  260 ---
 ...talogWhenCatalogPersistenceDisabledTest.java |   95 -
 .../entity/rebind/RebindDynamicGroupTest.java   |   69 -
 .../entity/rebind/RebindEnricherTest.java       |  326 ----
 .../rebind/RebindEntityDynamicTypeInfoTest.java |  123 --
 .../entity/rebind/RebindEntityTest.java         |  955 ----------
 .../entity/rebind/RebindFailuresTest.java       |  294 ---
 .../brooklyn/entity/rebind/RebindFeedTest.java  |  405 ----
 .../entity/rebind/RebindFeedWithHaTest.java     |  131 --
 .../brooklyn/entity/rebind/RebindGroupTest.java |  124 --
 .../rebind/RebindLocalhostLocationTest.java     |  104 --
 .../entity/rebind/RebindLocationTest.java       |  390 ----
 .../entity/rebind/RebindManagerSorterTest.java  |  149 --
 .../entity/rebind/RebindManagerTest.java        |   62 -
 .../brooklyn/entity/rebind/RebindOptions.java   |   94 -
 .../entity/rebind/RebindPolicyTest.java         |  341 ----
 .../rebind/RebindSshMachineLocationTest.java    |   84 -
 .../entity/rebind/RebindTestFixture.java        |  327 ----
 .../entity/rebind/RebindTestFixtureWithApp.java |   33 -
 .../brooklyn/entity/rebind/RebindTestUtils.java |  481 -----
 .../rebind/RecordingRebindExceptionHandler.java |   91 -
 .../BrooklynMementoPersisterFileBasedTest.java  |   55 -
 ...ntoPersisterInMemorySizeIntegrationTest.java |  107 --
 .../BrooklynMementoPersisterInMemoryTest.java   |   34 -
 .../BrooklynMementoPersisterTestFixture.java    |  166 --
 .../persister/FileBasedObjectStoreTest.java     |  100 -
 .../FileBasedStoreObjectAccessorWriterTest.java |   64 -
 .../rebind/persister/InMemoryObjectStore.java   |  167 --
 .../InMemoryStoreObjectAccessorWriterTest.java  |   36 -
 .../rebind/persister/ListeningObjectStore.java  |  252 ---
 ...nceStoreObjectAccessorWriterTestFixture.java |  137 --
 .../persister/XmlMementoSerializerTest.java     |  456 -----
 .../CompoundTransformerLoaderTest.java          |   77 -
 .../transformer/CompoundTransformerTest.java    |  481 -----
 .../transformer/impl/XsltTransformerTest.java   |  167 --
 .../brooklyn/entity/trait/FailingEntity.java    |   85 -
 .../entity/trait/FailingEntityImpl.java         |   88 -
 .../entity/trait/StartableMethodsTest.java      |  128 --
 .../event/feed/ConfigToAttributesTest.java      |   70 -
 .../java/brooklyn/event/feed/PollerTest.java    |  107 --
 .../event/feed/function/FunctionFeedTest.java   |  314 ----
 .../feed/http/HttpFeedIntegrationTest.java      |  160 --
 .../brooklyn/event/feed/http/HttpFeedTest.java  |  390 ----
 .../event/feed/http/HttpValueFunctionsTest.java |   93 -
 .../event/feed/http/JsonFunctionsTest.java      |  129 --
 .../feed/shell/ShellFeedIntegrationTest.java    |  225 ---
 .../event/feed/ssh/SshFeedIntegrationTest.java  |  261 ---
 .../WindowsPerformanceCounterFeedLiveTest.java  |  104 --
 .../WindowsPerformanceCounterFeedTest.java      |  132 --
 .../longevity/EntityCleanupLongevityTest.java   |   61 -
 .../EntityCleanupLongevityTestFixture.java      |  176 --
 .../qa/longevity/EntityCleanupTest.java         |   58 -
 .../qa/performance/AbstractPerformanceTest.java |  138 --
 .../EntityPerformanceLongevityTest.java         |   35 -
 .../qa/performance/EntityPerformanceTest.java   |  145 --
 .../EntityPersistencePerformanceTest.java       |  102 -
 .../FilePersistencePerformanceTest.java         |  187 --
 .../GroovyYardStickPerformanceTest.groovy       |   62 -
 .../JavaYardStickPerformanceTest.java           |   81 -
 .../SubscriptionPerformanceTest.java            |  167 --
 .../qa/performance/TaskPerformanceTest.java     |  181 --
 .../test/java/brooklyn/test/HttpService.java    |  216 ---
 .../brooklyn/test/TestHttpRequestHandler.java   |   72 -
 .../test/java/brooklyn/test/TestHttpServer.java |  143 --
 .../test/location/TestPaasLocation.java         |   32 -
 .../java/brooklyn/test/policy/TestEnricher.java |   63 -
 .../java/brooklyn/test/policy/TestPolicy.java   |   62 -
 .../brooklyn/core/BrooklynVersionTest.java      |  124 ++
 .../core/catalog/internal/CatalogDtoTest.java   |   13 +-
 .../core/catalog/internal/CatalogLoadTest.java  |    2 +-
 .../core/catalog/internal/CatalogScanTest.java  |   13 +-
 .../core/catalog/internal/CatalogTestUtils.java |    6 +-
 .../catalog/internal/CatalogVersioningTest.java |    7 +-
 .../core/catalog/internal/MyCatalogItems.java   |    5 +-
 .../config/BrooklynPropertiesBuilderTest.java   |    2 +-
 .../BrooklynPropertiesFromGroovyTest.groovy     |    2 +-
 .../core/config/BrooklynPropertiesTest.java     |    4 +-
 .../brooklyn/core/config/ConfigKeysTest.java    |   87 +
 .../brooklyn/core/config/ConfigUtilsTest.java   |    2 -
 .../config/MapConfigKeyAndFriendsMoreTest.java  |  271 +++
 ...apListAndOtherStructuredConfigKeyTest.groovy |  357 ++++
 .../internal/BrooklynFeatureEnablementTest.java |    1 -
 .../entitlement/AcmeEntitlementManager.java     |   52 -
 .../entitlement/AcmeEntitlementManagerTest.java |   60 -
 .../AcmeEntitlementManagerTestFixture.java      |  158 --
 .../entitlement/EntitlementsTest.java           |  208 ---
 .../entitlement/EntityEntitlementTest.java      |  185 --
 ...PerUserEntitlementManagerPropertiesTest.java |   52 -
 .../HighAvailabilityManagerFileBasedTest.java   |   47 -
 ...ilabilityManagerInMemoryIntegrationTest.java |   96 -
 .../ha/HighAvailabilityManagerInMemoryTest.java |  144 --
 .../HighAvailabilityManagerSplitBrainTest.java  |  474 -----
 .../ha/HighAvailabilityManagerTestFixture.java  |  287 ---
 .../core/management/ha/HotStandbyTest.java      |  666 -------
 .../ha/ImmutableManagementPlaneSyncRecord.java  |   57 -
 ...agementPlaneSyncRecordPersisterInMemory.java |  100 -
 .../core/management/ha/MasterChooserTest.java   |  146 --
 .../ha/MutableManagementPlaneSyncRecord.java    |   62 -
 .../management/ha/TestEntityFailingRebind.java  |   55 -
 .../core/management/ha/WarmStandbyTest.java     |  155 --
 .../management/internal/AccessManagerTest.java  |  145 --
 .../internal/EntityExecutionManagerTest.java    |  478 -----
 .../LocalManagementContextInstancesTest.java    |   87 -
 .../internal/LocalManagementContextTest.java    |  126 --
 .../internal/LocalSubscriptionManagerTest.java  |  181 --
 .../core/management/osgi/OsgiPathTest.java      |  105 --
 .../management/osgi/OsgiStandaloneTest.java     |  256 ---
 .../core/management/osgi/OsgiTestResources.java |   74 -
 .../osgi/OsgiVersionMoreEntityTest.java         |  458 -----
 .../entitlement/AcmeEntitlementManager.java     |   52 +
 .../entitlement/AcmeEntitlementManagerTest.java |   60 +
 .../AcmeEntitlementManagerTestFixture.java      |  157 ++
 .../core/mgmt/entitlement/EntitlementsTest.java |  207 +++
 .../mgmt/entitlement/EntityEntitlementTest.java |  184 ++
 ...PerUserEntitlementManagerPropertiesTest.java |   52 +
 .../HighAvailabilityManagerFileBasedTest.java   |   46 +
 ...ilabilityManagerInMemoryIntegrationTest.java |   95 +
 .../ha/HighAvailabilityManagerInMemoryTest.java |  142 ++
 .../HighAvailabilityManagerSplitBrainTest.java  |  473 +++++
 .../ha/HighAvailabilityManagerTestFixture.java  |  286 +++
 .../brooklyn/core/mgmt/ha/HotStandbyTest.java   |  664 +++++++
 .../ha/ImmutableManagementPlaneSyncRecord.java  |   57 +
 ...agementPlaneSyncRecordPersisterInMemory.java |   99 +
 .../core/mgmt/ha/MasterChooserTest.java         |  145 ++
 .../ha/MutableManagementPlaneSyncRecord.java    |   62 +
 .../core/mgmt/ha/TestEntityFailingRebind.java   |   55 +
 .../brooklyn/core/mgmt/ha/WarmStandbyTest.java  |  154 ++
 .../core/mgmt/internal/AccessManagerTest.java   |  143 ++
 .../internal/BrooklynShutdownHooksTest.java     |   91 +
 .../internal/EntityExecutionManagerTest.java    |  477 +++++
 .../LocalManagementContextInstancesTest.java    |   87 +
 .../internal/LocalManagementContextTest.java    |  126 ++
 .../internal/LocalSubscriptionManagerTest.java  |  180 ++
 .../brooklyn/core/mgmt/osgi/OsgiPathTest.java   |  104 ++
 .../core/mgmt/osgi/OsgiStandaloneTest.java      |  256 +++
 .../core/mgmt/osgi/OsgiTestResources.java       |   74 +
 .../mgmt/osgi/OsgiVersionMoreEntityTest.java    |  456 +++++
 .../BrooklynMementoPersisterFileBasedTest.java  |   55 +
 ...ntoPersisterInMemorySizeIntegrationTest.java |  106 ++
 .../BrooklynMementoPersisterInMemoryTest.java   |   33 +
 .../BrooklynMementoPersisterTestFixture.java    |  165 ++
 .../mgmt/persist/FileBasedObjectStoreTest.java  |  101 +
 .../FileBasedStoreObjectAccessorWriterTest.java |   65 +
 .../core/mgmt/persist/InMemoryObjectStore.java  |  170 ++
 .../InMemoryStoreObjectAccessorWriterTest.java  |   36 +
 .../core/mgmt/persist/ListeningObjectStore.java |  254 +++
 ...nceStoreObjectAccessorWriterTestFixture.java |  136 ++
 .../mgmt/persist/XmlMementoSerializerTest.java  |  455 +++++
 .../mgmt/rebind/ActivePartialRebindTest.java    |  108 ++
 .../rebind/ActivePartialRebindVersionTest.java  |  119 ++
 .../core/mgmt/rebind/CheckpointEntityTest.java  |  109 ++
 .../brooklyn/core/mgmt/rebind/Dumpers.java      |  273 +++
 .../mgmt/rebind/RebindCatalogEntityTest.java    |  155 ++
 .../core/mgmt/rebind/RebindCatalogItemTest.java |  260 +++
 ...talogWhenCatalogPersistenceDisabledTest.java |   95 +
 .../mgmt/rebind/RebindDynamicGroupTest.java     |   68 +
 .../core/mgmt/rebind/RebindEnricherTest.java    |  324 ++++
 .../rebind/RebindEntityDynamicTypeInfoTest.java |  122 ++
 .../core/mgmt/rebind/RebindEntityTest.java      |  954 ++++++++++
 .../core/mgmt/rebind/RebindFailuresTest.java    |  293 +++
 .../core/mgmt/rebind/RebindFeedTest.java        |  403 ++++
 .../core/mgmt/rebind/RebindFeedWithHaTest.java  |  131 ++
 .../core/mgmt/rebind/RebindGroupTest.java       |  123 ++
 .../rebind/RebindLocalhostLocationTest.java     |  104 ++
 .../core/mgmt/rebind/RebindLocationTest.java    |  389 ++++
 .../mgmt/rebind/RebindManagerSorterTest.java    |  147 ++
 .../core/mgmt/rebind/RebindManagerTest.java     |   62 +
 .../core/mgmt/rebind/RebindOptions.java         |   93 +
 .../core/mgmt/rebind/RebindPolicyTest.java      |  339 ++++
 .../rebind/RebindSshMachineLocationTest.java    |   84 +
 .../core/mgmt/rebind/RebindTestFixture.java     |  326 ++++
 .../mgmt/rebind/RebindTestFixtureWithApp.java   |   32 +
 .../core/mgmt/rebind/RebindTestUtils.java       |  483 +++++
 .../rebind/RecordingRebindExceptionHandler.java |   92 +
 .../CompoundTransformerLoaderTest.java          |   79 +
 .../transformer/CompoundTransformerTest.java    |  481 +++++
 .../transformer/impl/XsltTransformerTest.java   |  170 ++
 .../core/policy/basic/BasicPolicyTest.java      |    9 +-
 .../core/policy/basic/EnricherTypeTest.java     |    7 +-
 .../core/policy/basic/PolicyConfigTest.java     |    9 +-
 .../policy/basic/PolicySubscriptionTest.java    |   22 +-
 .../core/policy/basic/PolicyTypeTest.java       |    5 +-
 .../core/server/entity/BrooklynMetricsTest.java |  127 ++
 .../core/test/BrooklynAppLiveTestSupport.java   |   66 +
 .../core/test/BrooklynAppUnitTestSupport.java   |   74 +
 .../apache/brooklyn/core/test/HttpService.java  |  216 +++
 .../core/test/TestHttpRequestHandler.java       |   72 +
 .../brooklyn/core/test/TestHttpServer.java      |  143 ++
 .../lite/CampPlatformWithJustBrooklynMgmt.java  |    6 +-
 .../camp/brooklyn/lite/CampYamlLiteTest.java    |   29 +-
 .../camp/brooklyn/lite/TestAppAssembly.java     |    2 +-
 .../lite/TestAppAssemblyInstantiator.java       |   12 +-
 .../core/test/entity/BlockingEntity.java        |   45 +
 .../core/test/entity/BlockingEntityImpl.java    |   59 +
 .../entity/LocalManagementContextForTests.java  |  157 ++
 .../core/test/entity/NoopStartable.java         |   29 +
 .../core/test/entity/TestApplication.java       |   59 +
 .../core/test/entity/TestApplicationImpl.java   |   97 +
 .../entity/TestApplicationNoEnrichersImpl.java  |   29 +
 .../brooklyn/core/test/entity/TestCluster.java  |   30 +
 .../core/test/entity/TestClusterImpl.java       |   65 +
 .../brooklyn/core/test/entity/TestEntity.java   |  112 ++
 .../core/test/entity/TestEntityImpl.java        |  185 ++
 .../test/entity/TestEntityNoEnrichersImpl.java  |   32 +
 .../entity/TestEntityTransientCopyImpl.java     |   28 +
 .../core/test/location/TestPaasLocation.java    |   32 +
 .../brooklyn/core/test/policy/TestEnricher.java |   62 +
 .../brooklyn/core/test/policy/TestPolicy.java   |   61 +
 .../longevity/EntityCleanupLongevityTest.java   |   61 +
 .../EntityCleanupLongevityTestFixture.java      |  174 ++
 .../test/qa/longevity/EntityCleanupTest.java    |   58 +
 .../qa/performance/AbstractPerformanceTest.java |  136 ++
 .../EntityPerformanceLongevityTest.java         |   35 +
 .../qa/performance/EntityPerformanceTest.java   |  144 ++
 .../EntityPersistencePerformanceTest.java       |   99 +
 .../FilePersistencePerformanceTest.java         |  186 ++
 .../GroovyYardStickPerformanceTest.groovy       |   62 +
 .../JavaYardStickPerformanceTest.java           |   81 +
 .../SubscriptionPerformanceTest.java            |  167 ++
 .../qa/performance/TaskPerformanceTest.java     |  181 ++
 .../core/util/BrooklynMavenArtifactsTest.java   |   97 -
 .../core/util/ResourceUtilsHttpTest.java        |  197 --
 .../brooklyn/core/util/ResourceUtilsTest.java   |  189 --
 .../core/util/config/ConfigBagTest.java         |  193 --
 .../util/crypto/SecureKeysAndSignerTest.java    |  168 --
 .../core/util/file/ArchiveBuilderTest.java      |  193 --
 .../core/util/file/ArchiveUtilsTest.java        |  138 --
 .../core/util/flags/MethodCoercionsTest.java    |  148 --
 .../core/util/http/BetterMockWebServer.java     |  138 --
 .../core/util/http/HttpToolIntegrationTest.java |  100 -
 .../core/util/internal/FlagUtilsTest.java       |  314 ----
 .../core/util/internal/RepeaterTest.groovy      |  257 ---
 .../core/util/internal/TypeCoercionsTest.java   |  360 ----
 .../util/internal/ssh/RecordingSshTool.java     |   97 -
 .../internal/ssh/ShellToolAbstractTest.java     |  440 -----
 .../ssh/SshToolAbstractIntegrationTest.java     |  303 ---
 .../ssh/SshToolAbstractPerformanceTest.java     |  137 --
 .../ssh/cli/SshCliToolIntegrationTest.java      |  118 --
 .../ssh/cli/SshCliToolPerformanceTest.java      |   44 -
 .../ssh/process/ProcessToolIntegrationTest.java |   69 -
 .../ssh/process/ProcessToolStaticsTest.java     |   79 -
 .../sshj/SshjToolAsyncStubIntegrationTest.java  |  177 --
 .../ssh/sshj/SshjToolIntegrationTest.java       |  313 ----
 .../ssh/sshj/SshjToolPerformanceTest.java       |   44 -
 .../core/util/mutex/WithMutexesTest.java        |  129 --
 .../brooklyn/core/util/osgi/OsgisTest.java      |   41 -
 .../util/ssh/BashCommandsIntegrationTest.java   |  503 -----
 .../task/BasicTaskExecutionPerformanceTest.java |  208 ---
 .../core/util/task/BasicTaskExecutionTest.java  |  461 -----
 .../core/util/task/BasicTasksFutureTest.java    |  226 ---
 .../util/task/CompoundTaskExecutionTest.java    |  257 ---
 .../util/task/DynamicSequentialTaskTest.java    |  370 ----
 .../util/task/NonBasicTaskExecutionTest.java    |  129 --
 .../core/util/task/ScheduledExecutionTest.java  |  290 ---
 .../util/task/SingleThreadedSchedulerTest.java  |  194 --
 .../core/util/task/TaskFinalizationTest.java    |   62 -
 .../brooklyn/core/util/task/TasksTest.java      |  184 --
 .../core/util/task/ValueResolverTest.java       |  134 --
 .../core/util/task/ssh/SshTasksTest.java        |  212 ---
 .../core/util/task/system/SystemTasksTest.java  |  137 --
 .../core/util/text/DataUriSchemeParserTest.java |   53 -
 .../core/util/text/TemplateProcessorTest.java   |  180 --
 .../util/xstream/CompilerCompatibilityTest.java |  158 --
 .../core/util/xstream/ConverterTestFixture.java |   40 -
 .../xstream/EnumCaseForgivingConverterTest.java |   53 -
 .../xstream/ImmutableListConverterTest.java     |   60 -
 .../util/xstream/InetAddressConverterTest.java  |   42 -
 .../util/xstream/StringKeyMapConverterTest.java |   77 -
 .../brooklyn/core/util/xstream/XmlUtilTest.java |   34 -
 .../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 +++++
 .../basic/RecordingSensorEventListener.java     |  115 --
 .../core/AbstractApplicationLegacyTest.java     |  156 ++
 .../entity/core/AbstractEntityLegacyTest.java   |  131 ++
 .../brooklyn/entity/core/AttributeMapTest.java  |  226 +++
 .../brooklyn/entity/core/AttributeTest.java     |   66 +
 .../core/ConfigEntityInheritanceTest.java       |  190 ++
 .../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        |  984 ++++++++++
 ...DynamicClusterWithAvailabilityZonesTest.java |  225 +++
 .../entity/group/DynamicFabricTest.java         |  496 +++++
 .../brooklyn/entity/group/DynamicGroupTest.java |  550 ++++++
 .../entity/group/DynamicMultiGroupTest.java     |  223 +++
 .../entity/group/DynamicRegionsFabricTest.java  |  170 ++
 .../entity/group/GroupPickUpEntitiesTest.java   |  157 ++
 .../apache/brooklyn/entity/group/GroupTest.java |  144 ++
 .../group/MembershipTrackingPolicyTest.java     |  313 ++++
 .../entity/group/QuarantineGroupTest.java       |   85 +
 .../BalancingNodePlacementStrategyTest.java     |  116 ++
 .../ProportionalZoneFailureDetectorTest.java    |  123 ++
 .../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        |  178 ++
 .../brooklyn/entity/stock/DataEntityTest.java   |  142 ++
 .../brooklyn/entity/trait/FailingEntity.java    |   84 +
 .../entity/trait/FailingEntityImpl.java         |   87 +
 .../entity/trait/StartableMethodsTest.java      |  127 ++
 .../access/BrooklynAccessUtilsTest.java         |   13 +-
 .../PortForwardManagerLocationResolverTest.java |    7 +-
 .../access/PortForwardManagerRebindTest.java    |   30 +-
 .../location/access/PortForwardManagerTest.java |   12 +-
 .../location/basic/AbstractLocationTest.java    |  184 --
 ...regatingMachineProvisioningLocationTest.java |  117 --
 .../basic/ByonLocationResolverTest.java         |  423 -----
 ...stMachineProvisioningLocationRebindTest.java |  129 --
 ...ixedListMachineProvisioningLocationTest.java |  575 ------
 .../basic/HostLocationResolverTest.java         |  126 --
 .../basic/LegacyAbstractLocationTest.java       |  150 --
 .../basic/LocalhostLocationResolverTest.java    |  265 ---
 ...ocalhostMachineProvisioningLocationTest.java |  214 ---
 .../LocalhostProvisioningAndAccessTest.java     |   58 -
 .../location/basic/LocationConfigTest.java      |  203 --
 .../location/basic/LocationConfigUtilsTest.java |  154 --
 .../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       |  120 --
 .../location/basic/PaasLocationTest.java        |   35 -
 .../brooklyn/location/basic/PortRangesTest.java |  129 --
 .../RecordingMachineLocationCustomizer.java     |   71 -
 .../location/basic/SimulatedLocation.java       |  136 --
 .../SingleMachineLocationResolverTest.java      |  131 --
 .../SingleMachineProvisioningLocationTest.java  |   63 -
 .../SshMachineLocationIntegrationTest.java      |  140 --
 .../SshMachineLocationPerformanceTest.java      |  171 --
 .../SshMachineLocationReuseIntegrationTest.java |  173 --
 .../location/basic/SshMachineLocationTest.java  |  340 ----
 .../basic/TestPortSupplierLocation.java         |   90 -
 .../location/byon/ByonLocationResolverTest.java |  429 +++++
 ...stMachineProvisioningLocationRebindTest.java |  131 ++
 ...ixedListMachineProvisioningLocationTest.java |  578 ++++++
 .../location/byon/HostLocationResolverTest.java |  126 ++
 .../byon/SingleMachineLocationResolverTest.java |  132 ++
 .../SingleMachineProvisioningLocationTest.java  |   65 +
 .../location/cloud/CloudMachineNamerTest.java   |   16 +-
 .../location/cloud/CustomMachineNamerTest.java  |   16 +-
 .../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  |    2 +-
 .../geo/HostGeoLookupIntegrationTest.java       |    4 +-
 .../ssh/SshMachineLocationIntegrationTest.java  |  141 ++
 .../ssh/SshMachineLocationPerformanceTest.java  |  172 ++
 .../SshMachineLocationReuseIntegrationTest.java |  172 ++
 .../location/ssh/SshMachineLocationTest.java    |  345 ++++
 .../winrm/AdvertiseWinrmLoginPolicyTest.java    |   51 +
 .../winrm/WinRmMachineLocationTest.java         |   44 +
 .../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 ++
 .../brooklyn/test/entity/BlockingEntity.java    |   46 -
 .../test/entity/BlockingEntityImpl.java         |   59 -
 .../entity/LocalManagementContextForTests.java  |  157 --
 .../brooklyn/test/entity/NoopStartable.java     |   29 -
 .../brooklyn/test/entity/TestApplication.java   |   60 -
 .../test/entity/TestApplicationImpl.java        |   99 -
 .../entity/TestApplicationNoEnrichersImpl.java  |   29 -
 .../brooklyn/test/entity/TestCluster.java       |   31 -
 .../brooklyn/test/entity/TestClusterImpl.java   |   65 -
 .../apache/brooklyn/test/entity/TestEntity.java |  113 --
 .../brooklyn/test/entity/TestEntityImpl.java    |  186 --
 .../test/entity/TestEntityNoEnrichersImpl.java  |   32 -
 .../entity/TestEntityTransientCopyImpl.java     |   28 -
 .../util/core/BrooklynMavenArtifactsTest.java   |   97 +
 .../util/core/ResourceUtilsHttpTest.java        |  196 ++
 .../brooklyn/util/core/ResourceUtilsTest.java   |  189 ++
 .../util/core/config/ConfigBagTest.java         |  192 ++
 .../core/crypto/SecureKeysAndSignerTest.java    |  168 ++
 .../util/core/file/ArchiveBuilderTest.java      |  193 ++
 .../util/core/file/ArchiveUtilsTest.java        |  136 ++
 .../util/core/flags/MethodCoercionsTest.java    |  148 ++
 .../util/core/http/BetterMockWebServer.java     |  138 ++
 .../util/core/http/HttpToolIntegrationTest.java |   99 +
 .../util/core/internal/FlagUtilsTest.java       |  313 ++++
 .../util/core/internal/RepeaterTest.groovy      |  256 +++
 .../util/core/internal/TypeCoercionsTest.java   |  359 ++++
 .../core/internal/ssh/RecordingSshTool.java     |   97 +
 .../internal/ssh/ShellToolAbstractTest.java     |  440 +++++
 .../ssh/SshToolAbstractIntegrationTest.java     |  303 +++
 .../ssh/SshToolAbstractPerformanceTest.java     |  137 ++
 .../ssh/cli/SshCliToolIntegrationTest.java      |  118 ++
 .../ssh/cli/SshCliToolPerformanceTest.java      |   44 +
 .../ssh/process/ProcessToolIntegrationTest.java |   69 +
 .../ssh/process/ProcessToolStaticsTest.java     |   79 +
 .../sshj/SshjToolAsyncStubIntegrationTest.java  |  177 ++
 .../ssh/sshj/SshjToolIntegrationTest.java       |  313 ++++
 .../ssh/sshj/SshjToolPerformanceTest.java       |   44 +
 .../util/core/mutex/WithMutexesTest.java        |  129 ++
 .../brooklyn/util/core/osgi/OsgisTest.java      |   41 +
 .../core/ssh/BashCommandsIntegrationTest.java   |  501 +++++
 .../task/BasicTaskExecutionPerformanceTest.java |  208 +++
 .../util/core/task/BasicTaskExecutionTest.java  |  461 +++++
 .../util/core/task/BasicTasksFutureTest.java    |  226 +++
 .../core/task/CompoundTaskExecutionTest.java    |  257 +++
 .../core/task/DynamicSequentialTaskTest.java    |  370 ++++
 .../core/task/NonBasicTaskExecutionTest.java    |  129 ++
 .../util/core/task/ScheduledExecutionTest.java  |  290 +++
 .../core/task/SingleThreadedSchedulerTest.java  |  194 ++
 .../util/core/task/TaskFinalizationTest.java    |   62 +
 .../brooklyn/util/core/task/TasksTest.java      |  183 ++
 .../util/core/task/ValueResolverTest.java       |  133 ++
 .../util/core/task/ssh/SshTasksTest.java        |  210 +++
 .../util/core/task/system/SystemTasksTest.java  |  136 ++
 .../util/core/text/DataUriSchemeParserTest.java |   53 +
 .../util/core/text/TemplateProcessorTest.java   |  179 ++
 .../core/xstream/CompilerCompatibilityTest.java |  158 ++
 .../util/core/xstream/ConverterTestFixture.java |   40 +
 .../xstream/EnumCaseForgivingConverterTest.java |   53 +
 .../xstream/ImmutableListConverterTest.java     |   60 +
 .../core/xstream/InetAddressConverterTest.java  |   42 +
 .../core/xstream/StringKeyMapConverterTest.java |   77 +
 .../brooklyn/util/core/xstream/XmlUtilTest.java |   34 +
 .../rebind/compiler_compatibility_eclipse.xml   |   41 -
 .../rebind/compiler_compatibility_oracle.xml    |   41 -
 .../rebind/compiler_compatibility_eclipse.xml   |   41 +
 .../rebind/compiler_compatibility_oracle.xml    |   41 +
 .../brooklyn/demo/GlobalWebFabricExample.java   |   22 +-
 .../brooklyn/demo/KafkaClusterExample.java      |    7 +-
 .../demo/StandaloneQpidBrokerExample.java       |    9 +-
 .../brooklyn/demo/CumulusRDFApplication.java    |   50 +-
 .../demo/HighAvailabilityCassandraCluster.java  |   14 +-
 .../brooklyn/demo/ResilientMongoDbApp.java      |   20 +-
 .../brooklyn/demo/RiakClusterExample.java       |   14 +-
 .../brooklyn/demo/SimpleCassandraCluster.java   |   10 +-
 .../brooklyn/demo/SimpleCouchDBCluster.java     |    5 +-
 .../brooklyn/demo/SimpleMongoDBReplicaSet.java  |    5 +-
 .../brooklyn/demo/SimpleRedisCluster.java       |    5 +-
 .../apache/brooklyn/demo/StormSampleApp.java    |   10 +-
 .../brooklyn/demo/WideAreaCassandraCluster.java |   14 +-
 .../brooklyn/demo/NodeJsTodoApplication.java    |   17 +-
 .../brooklyn/demo/SingleWebServerExample.java   |   14 +-
 .../demo/WebClusterDatabaseExample.java         |   28 +-
 .../demo/WebClusterDatabaseExampleApp.java      |   36 +-
 .../demo/WebClusterDatabaseExampleGroovy.groovy |   22 +-
 .../apache/brooklyn/demo/WebClusterExample.java |   10 +-
 ...lusterDatabaseExampleAppIntegrationTest.java |   24 +-
 .../JcloudsBlobStoreBasedObjectStore.java       |  239 ---
 .../jclouds/JcloudsStoreObjectAccessor.java     |  128 --
 .../policy/os/AdvertiseWinrmLoginPolicy.java    |   83 -
 .../brooklyn/policy/os/CreateUserPolicy.java    |  175 --
 .../JcloudsBlobStoreBasedObjectStore.java       |  237 +++
 .../jclouds/JcloudsStoreObjectAccessor.java     |  127 ++
 ...AbstractJcloudsSubnetSshMachineLocation.java |    3 +-
 .../location/jclouds/BrooklynMachinePool.java   |   10 +-
 .../jclouds/ComputeServiceRegistry.java         |    2 +-
 .../jclouds/ComputeServiceRegistryImpl.java     |    5 +-
 .../jclouds/JcloudsByonLocationResolver.java    |   17 +-
 .../location/jclouds/JcloudsLocation.java       |   43 +-
 .../location/jclouds/JcloudsLocationConfig.java |   12 +-
 .../jclouds/JcloudsLocationCustomizer.java      |    2 +-
 .../jclouds/JcloudsLocationResolver.java        |   10 +-
 .../jclouds/JcloudsMachineLocation.java         |    2 +-
 .../location/jclouds/JcloudsMachineNamer.java   |    2 +-
 ...JcloudsPropertiesFromBrooklynProperties.java |    8 +-
 .../jclouds/JcloudsSshMachineLocation.java      |   10 +-
 .../brooklyn/location/jclouds/JcloudsUtil.java  |    5 +-
 .../jclouds/JcloudsWinRmMachineLocation.java    |    4 +-
 .../jclouds/SudoTtyFixingCustomizer.java        |    8 +-
 .../JcloudsLocationSecurityGroupCustomizer.java |    2 +-
 .../zone/AwsAvailabilityZoneExtension.java      |    2 +-
 .../policy/jclouds/os/CreateUserPolicy.java     |  173 ++
 .../location/jclouds/sample/setup-server.sh     |   31 +
 .../resources/sample/script/setup-server.sh     |   31 -
 .../persister/jclouds/BlobStoreCleaner.java     |   71 -
 .../persister/jclouds/BlobStoreExpiryTest.java  |  198 --
 .../BlobStorePersistencePerformanceTest.java    |  121 --
 .../rebind/persister/jclouds/BlobStoreTest.java |  152 --
 ...nMementoPersisterJcloudsObjectStoreTest.java |   67 -
 ...tyToBlobStorePersistencePerformanceTest.java |   65 -
 ...ailabilityManagerJcloudsObjectStoreTest.java |   80 -
 .../JcloudsBlobStoreBasedObjectStoreTest.java   |  119 --
 .../jclouds/JcloudsExpect100ContinueTest.java   |  150 --
 .../JcloudsObjectStoreAccessorWriterTest.java   |  182 --
 .../os/AdvertiseWinrmLoginPolicyTest.java       |   52 -
 .../policy/os/CreateUserPolicyLiveTest.java     |  113 --
 .../policy/os/CreateUserPolicyTest.java         |  138 --
 .../mgmt/persist/jclouds/BlobStoreCleaner.java  |   71 +
 .../persist/jclouds/BlobStoreExpiryTest.java    |  196 ++
 .../BlobStorePersistencePerformanceTest.java    |  121 ++
 .../mgmt/persist/jclouds/BlobStoreTest.java     |  150 ++
 ...nMementoPersisterJcloudsObjectStoreTest.java |   67 +
 ...tyToBlobStorePersistencePerformanceTest.java |   65 +
 ...ailabilityManagerJcloudsObjectStoreTest.java |   80 +
 .../JcloudsBlobStoreBasedObjectStoreTest.java   |  118 ++
 .../jclouds/JcloudsExpect100ContinueTest.java   |  148 ++
 .../JcloudsObjectStoreAccessorWriterTest.java   |  182 ++
 .../jclouds/AbstractJcloudsLiveTest.java        |   12 +-
 .../jclouds/AbstractJcloudsStubbedLiveTest.java |    2 +-
 .../jclouds/BailOutJcloudsLocation.java         |   15 +-
 .../jclouds/BrooklynMachinePoolLiveTest.java    |    4 +-
 .../jclouds/JcloudsAddressesLiveTest.java       |    4 +-
 .../JcloudsByonLocationResolverAwsLiveTest.java |    4 +-
 ...dsByonLocationResolverSoftlayerLiveTest.java |    4 +-
 .../JcloudsByonLocationResolverTest.java        |    9 +-
 .../jclouds/JcloudsLocationMetadataTest.java    |   12 +-
 .../JcloudsLocationRebindMachineLiveTest.java   |    2 +-
 .../jclouds/JcloudsLocationResolverTest.java    |   13 +-
 ...ationTemplateOptionsCustomisersLiveTest.java |    2 +-
 .../location/jclouds/JcloudsLocationTest.java   |   15 +-
 .../location/jclouds/JcloudsLoginLiveTest.java  |    2 +-
 .../jclouds/JcloudsMachineNamerTest.java        |    2 +-
 .../location/jclouds/LiveTestEntity.java        |   12 +-
 .../jclouds/RebindJcloudsLocationLiveTest.java  |   15 +-
 .../jclouds/RebindJcloudsLocationTest.java      |    8 +-
 ...loudsLocationUserLoginAndConfigLiveTest.java |    2 +-
 ...hineProvisioningLocationJcloudsLiveTest.java |    6 +-
 .../jclouds/StandaloneJcloudsLiveTest.java      |    2 +-
 .../provider/AbstractJcloudsLocationTest.java   |   10 +-
 .../AwsEc2LocationWindowsLiveTest.groovy        |   11 +-
 .../provider/CarrenzaLocationLiveTest.groovy    |   13 +-
 .../provider/RackspaceLocationLiveTest.java     |    2 +-
 .../zone/AwsAvailabilityZoneExtensionTest.java  |    6 +-
 .../jclouds/os/CreateUserPolicyLiveTest.java    |  112 ++
 .../policy/jclouds/os/CreateUserPolicyTest.java |  137 ++
 .../java/brooklyn/enricher/DeltaEnricher.java   |   54 -
 .../brooklyn/enricher/HttpLatencyDetector.java  |  320 ----
 .../brooklyn/enricher/RollingMeanEnricher.java  |   82 -
 .../enricher/RollingTimeWindowMeanEnricher.java |  213 ---
 .../enricher/TimeFractionDeltaEnricher.java     |  110 --
 .../enricher/TimeWeightedDeltaEnricher.java     |  131 --
 .../entity/brooklyn/BrooklynMetrics.java        |   56 -
 .../entity/brooklyn/BrooklynMetricsImpl.java    |   87 -
 .../policy/autoscaling/AutoScalerPolicy.java    |   32 +-
 .../brooklyn/policy/enricher/DeltaEnricher.java |   53 +
 .../policy/enricher/HttpLatencyDetector.java    |  319 ++++
 .../policy/enricher/RollingMeanEnricher.java    |   81 +
 .../enricher/RollingTimeWindowMeanEnricher.java |  212 +++
 .../enricher/TimeFractionDeltaEnricher.java     |  109 ++
 .../enricher/TimeWeightedDeltaEnricher.java     |  130 ++
 .../followthesun/DefaultFollowTheSunModel.java  |    2 +-
 .../policy/followthesun/FollowTheSunPolicy.java |   18 +-
 .../policy/followthesun/FollowTheSunPool.java   |    7 +-
 .../followthesun/FollowTheSunPoolImpl.java      |   15 +-
 .../policy/ha/AbstractFailureDetector.java      |   22 +-
 .../policy/ha/ConditionalSuspendPolicy.java     |   15 +-
 .../policy/ha/ConnectionFailureDetector.java    |   12 +-
 .../apache/brooklyn/policy/ha/HASensors.java    |    2 +-
 .../policy/ha/ServiceFailureDetector.java       |   28 +-
 .../brooklyn/policy/ha/ServiceReplacer.java     |   32 +-
 .../brooklyn/policy/ha/ServiceRestarter.java    |   30 +-
 .../policy/ha/SshMachineFailureDetector.java    |   12 +-
 .../loadbalancing/BalanceableContainer.java     |    7 +-
 .../loadbalancing/BalanceableWorkerPool.java    |    7 +-
 .../BalanceableWorkerPoolImpl.java              |   15 +-
 .../loadbalancing/ItemsInContainersGroup.java   |    9 +-
 .../ItemsInContainersGroupImpl.java             |   11 +-
 .../loadbalancing/LoadBalancingPolicy.java      |   18 +-
 .../brooklyn/policy/loadbalancing/Movable.java  |   13 +-
 .../enricher/DeltaEnrichersTests.groovy         |  125 --
 .../enricher/HttpLatencyDetectorTest.java       |  150 --
 .../brooklyn/enricher/RebindEnricherTest.java   |  148 --
 .../enricher/RollingMeanEnricherTest.groovy     |  106 --
 .../RollingTimeWindowMeanEnricherTest.groovy    |  156 --
 .../enricher/TimeFractionDeltaEnricherTest.java |  104 --
 .../entity/brooklyn/BrooklynMetricsTest.java    |  128 --
 .../autoscaling/AutoScalerPolicyMetricTest.java |   21 +-
 .../autoscaling/AutoScalerPolicyRebindTest.java |   22 +-
 .../AutoScalerPolicyReconfigurationTest.java    |   13 +-
 .../autoscaling/AutoScalerPolicyTest.java       |   13 +-
 .../autoscaling/LocallyResizableEntity.java     |    9 +-
 .../policy/enricher/DeltaEnrichersTests.groovy  |  123 ++
 .../enricher/HttpLatencyDetectorTest.java       |  149 ++
 .../policy/enricher/RebindEnricherTest.java     |  153 ++
 .../enricher/RollingMeanEnricherTest.groovy     |  105 ++
 .../RollingTimeWindowMeanEnricherTest.groovy    |  155 ++
 .../enricher/TimeFractionDeltaEnricherTest.java |  104 ++
 .../AbstractFollowTheSunPolicyTest.java         |   20 +-
 .../followthesun/FollowTheSunModelTest.java     |    3 +-
 .../FollowTheSunPolicySoakTest.java             |    8 +-
 .../followthesun/FollowTheSunPolicyTest.java    |   12 +-
 .../ha/ConnectionFailureDetectorTest.java       |   18 +-
 .../brooklyn/policy/ha/HaPolicyRebindTest.java  |   28 +-
 ...ServiceFailureDetectorStabilizationTest.java |   30 +-
 .../policy/ha/ServiceFailureDetectorTest.java   |   32 +-
 .../brooklyn/policy/ha/ServiceReplacerTest.java |   38 +-
 .../policy/ha/ServiceRestarterTest.java         |   28 +-
 .../AbstractLoadBalancingPolicyTest.java        |   20 +-
 .../BalanceableWorkerPoolTest.java              |   22 +-
 .../ItemsInContainersGroupTest.java             |   14 +-
 .../LoadBalancingPolicyConcurrencyTest.java     |    7 +-
 .../LoadBalancingPolicySoakTest.java            |    5 +-
 .../loadbalancing/LoadBalancingPolicyTest.java  |    5 +-
 .../loadbalancing/MockContainerEntity.java      |   17 +-
 .../loadbalancing/MockContainerEntityImpl.java  |    7 +-
 .../policy/loadbalancing/MockItemEntity.java    |    7 +-
 .../loadbalancing/MockItemEntityImpl.java       |    5 +-
 .../entity/monitoring/zabbix/ZabbixFeed.java    |   25 +-
 .../monitoring/zabbix/ZabbixMonitored.java      |   11 +-
 .../monitoring/zabbix/ZabbixPollConfig.java     |   11 +-
 .../entity/monitoring/zabbix/ZabbixServer.java  |   11 +-
 .../monitoring/zabbix/ZabbixServerImpl.java     |   19 +-
 .../basic/AbstractSoftwareProcessDriver.java    |  513 ------
 .../basic/AbstractSoftwareProcessSshDriver.java |  654 -------
 .../AbstractSoftwareProcessWinRmDriver.java     |  195 --
 .../entity/basic/AbstractVanillaProcess.java    |   35 -
 .../entity/basic/EmptySoftwareProcess.java      |   28 -
 .../basic/EmptySoftwareProcessDriver.java       |   22 -
 .../entity/basic/EmptySoftwareProcessImpl.java  |   39 -
 .../basic/EmptySoftwareProcessSshDriver.java    |   83 -
 .../SameServerDriverLifecycleEffectorTasks.java |  170 --
 .../brooklyn/entity/basic/SameServerEntity.java |   69 -
 .../entity/basic/SameServerEntityImpl.java      |  126 --
 .../brooklyn/entity/basic/SoftwareProcess.java  |  359 ----
 .../entity/basic/SoftwareProcessDriver.java     |   76 -
 ...wareProcessDriverLifecycleEffectorTasks.java |  258 ---
 .../entity/basic/SoftwareProcessImpl.java       |  647 -------
 .../entity/basic/VanillaSoftwareProcess.java    |   61 -
 .../basic/VanillaSoftwareProcessDriver.java     |   23 -
 .../basic/VanillaSoftwareProcessImpl.java       |   37 -
 .../basic/VanillaSoftwareProcessSshDriver.java  |  163 --
 .../entity/basic/VanillaWindowsProcess.java     |   64 -
 .../basic/VanillaWindowsProcessDriver.java      |   23 -
 .../entity/basic/VanillaWindowsProcessImpl.java |   47 -
 .../basic/VanillaWindowsProcessWinRmDriver.java |   83 -
 .../basic/lifecycle/NaiveScriptRunner.java      |   43 -
 .../entity/basic/lifecycle/ScriptHelper.java    |  438 -----
 .../entity/basic/lifecycle/ScriptPart.java      |   82 -
 .../entity/brooklynnode/BrooklynCluster.java    |   71 -
 .../brooklynnode/BrooklynClusterImpl.java       |  116 --
 .../brooklynnode/BrooklynEntityMirror.java      |   68 -
 .../brooklynnode/BrooklynEntityMirrorImpl.java  |  195 --
 .../entity/brooklynnode/BrooklynNode.java       |  314 ----
 .../entity/brooklynnode/BrooklynNodeDriver.java |   27 -
 .../entity/brooklynnode/BrooklynNodeImpl.java   |  524 ------
 .../brooklynnode/BrooklynNodeSshDriver.java     |  395 ----
 .../entity/brooklynnode/EntityHttpClient.java   |   93 -
 .../brooklynnode/EntityHttpClientImpl.java      |  163 --
 .../entity/brooklynnode/LocalBrooklynNode.java  |   37 -
 .../brooklynnode/LocalBrooklynNodeImpl.java     |   46 -
 .../brooklynnode/RemoteEffectorBuilder.java     |   85 -
 .../BrooklynClusterUpgradeEffectorBody.java     |  207 ---
 .../BrooklynNodeUpgradeEffectorBody.java        |  230 ---
 .../effector/SelectMasterEffectorBody.java      |  175 --
 .../SetHighAvailabilityModeEffectorBody.java    |   64 -
 ...SetHighAvailabilityPriorityEffectorBody.java |   55 -
 .../brooklyn/entity/chef/ChefAttributeFeed.java |  411 -----
 .../entity/chef/ChefAttributePollConfig.java    |   54 -
 .../brooklyn/entity/chef/ChefBashCommands.java  |   42 -
 .../java/brooklyn/entity/chef/ChefConfig.java   |   99 -
 .../java/brooklyn/entity/chef/ChefConfigs.java  |  103 --
 .../java/brooklyn/entity/chef/ChefEntity.java   |   27 -
 .../brooklyn/entity/chef/ChefEntityImpl.java    |   39 -
 .../entity/chef/ChefLifecycleEffectorTasks.java |  362 ----
 .../brooklyn/entity/chef/ChefServerTasks.java   |   97 -
 .../brooklyn/entity/chef/ChefSoloDriver.java    |   87 -
 .../brooklyn/entity/chef/ChefSoloTasks.java     |   71 -
 .../java/brooklyn/entity/chef/ChefTasks.java    |  154 --
 .../entity/chef/KnifeConvergeTaskFactory.java   |  248 ---
 .../brooklyn/entity/chef/KnifeTaskFactory.java  |  241 ---
 .../java/brooklyn/entity/java/JavaAppUtils.java |  264 ---
 .../brooklyn/entity/java/JavaEntityMethods.java |   30 -
 .../entity/java/JavaSoftwareProcessDriver.java  |   30 -
 .../java/JavaSoftwareProcessSshDriver.java      |  444 -----
 .../java/brooklyn/entity/java/JmxSupport.java   |  359 ----
 .../brooklyn/entity/java/JmxmpSslSupport.java   |  134 --
 .../java/brooklyn/entity/java/UsesJava.java     |   69 -
 .../brooklyn/entity/java/UsesJavaMXBeans.java   |   78 -
 .../main/java/brooklyn/entity/java/UsesJmx.java |  192 --
 .../brooklyn/entity/java/VanillaJavaApp.java    |   78 -
 .../entity/java/VanillaJavaAppDriver.java       |   26 -
 .../entity/java/VanillaJavaAppImpl.java         |  113 --
 .../entity/java/VanillaJavaAppSshDriver.java    |  212 ---
 .../entity/machine/MachineAttributes.java       |   88 -
 .../brooklyn/entity/machine/MachineEntity.java  |   60 -
 .../entity/machine/MachineEntityImpl.java       |  184 --
 .../java/brooklyn/entity/pool/ServerPool.java   |  111 --
 .../brooklyn/entity/pool/ServerPoolImpl.java    |  434 -----
 .../entity/pool/ServerPoolLocation.java         |   83 -
 .../entity/pool/ServerPoolLocationResolver.java |  138 --
 .../entity/service/EntityLaunchListener.java    |  112 --
 .../entity/service/InitdServiceInstaller.java   |  137 --
 .../entity/service/SystemServiceEnricher.java   |  154 --
 .../entity/service/SystemServiceInstaller.java  |   25 -
 .../service/SystemServiceInstallerFactory.java  |   28 -
 .../entity/software/MachineInitTasks.java       |  173 --
 .../software/MachineLifecycleEffectorTasks.java |  949 ----------
 .../software/ProvidesProvisioningFlags.java     |   34 -
 .../entity/software/SshEffectorTasks.java       |  336 ----
 .../brooklyn/entity/software/StaticSensor.java  |   73 -
 .../entity/software/http/HttpRequestSensor.java |   99 -
 .../software/java/JmxAttributeSensor.java       |  123 --
 .../entity/software/ssh/SshCommandEffector.java |  104 --
 .../entity/software/ssh/SshCommandSensor.java   |  143 --
 .../winrm/WindowsPerformanceCounterSensors.java |   74 -
 .../event/feed/jmx/JmxAttributePollConfig.java  |   75 -
 .../java/brooklyn/event/feed/jmx/JmxFeed.java   |  437 -----
 .../java/brooklyn/event/feed/jmx/JmxHelper.java |  725 --------
 .../event/feed/jmx/JmxNotificationFilters.java  |   64 -
 .../jmx/JmxNotificationSubscriptionConfig.java  |   96 -
 .../event/feed/jmx/JmxOperationPollConfig.java  |  122 --
 .../event/feed/jmx/JmxValueFunctions.java       |   95 -
 .../entity/brooklynnode/BrooklynCluster.java    |   70 +
 .../brooklynnode/BrooklynClusterImpl.java       |  115 ++
 .../brooklynnode/BrooklynEntityMirror.java      |   67 +
 .../brooklynnode/BrooklynEntityMirrorImpl.java  |  194 ++
 .../entity/brooklynnode/BrooklynNode.java       |  312 ++++
 .../entity/brooklynnode/BrooklynNodeDriver.java |   27 +
 .../entity/brooklynnode/BrooklynNodeImpl.java   |  522 ++++++
 .../brooklynnode/BrooklynNodeSshDriver.java     |  394 ++++
 .../entity/brooklynnode/EntityHttpClient.java   |   93 +
 .../brooklynnode/EntityHttpClientImpl.java      |  162 ++
 .../entity/brooklynnode/LocalBrooklynNode.java  |   37 +
 .../brooklynnode/LocalBrooklynNodeImpl.java     |   46 +
 .../brooklynnode/RemoteEffectorBuilder.java     |   84 +
 .../BrooklynClusterUpgradeEffectorBody.java     |  206 +++
 .../BrooklynNodeUpgradeEffectorBody.java        |  229 +++
 .../effector/SelectMasterEffectorBody.java      |  174 ++
 .../SetHighAvailabilityModeEffectorBody.java    |   63 +
 ...SetHighAvailabilityPriorityEffectorBody.java |   54 +
 .../brooklyn/entity/chef/ChefAttributeFeed.java |  410 +++++
 .../entity/chef/ChefAttributePollConfig.java    |   53 +
 .../brooklyn/entity/chef/ChefBashCommands.java  |   42 +
 .../apache/brooklyn/entity/chef/ChefConfig.java |   98 +
 .../brooklyn/entity/chef/ChefConfigs.java       |  102 +
 .../apache/brooklyn/entity/chef/ChefEntity.java |   26 +
 .../brooklyn/entity/chef/ChefEntityImpl.java    |   38 +
 .../entity/chef/ChefLifecycleEffectorTasks.java |  360 ++++
 .../brooklyn/entity/chef/ChefServerTasks.java   |   97 +
 .../brooklyn/entity/chef/ChefSoloDriver.java    |   85 +
 .../brooklyn/entity/chef/ChefSoloTasks.java     |   70 +
 .../apache/brooklyn/entity/chef/ChefTasks.java  |  153 ++
 .../entity/chef/KnifeConvergeTaskFactory.java   |  246 +++
 .../brooklyn/entity/chef/KnifeTaskFactory.java  |  240 +++
 .../brooklyn/entity/java/JavaAppUtils.java      |  263 +++
 .../brooklyn/entity/java/JavaEntityMethods.java |   30 +
 .../entity/java/JavaSoftwareProcessDriver.java  |   30 +
 .../java/JavaSoftwareProcessSshDriver.java      |  443 +++++
 .../entity/java/JmxAttributeSensor.java         |  121 ++
 .../apache/brooklyn/entity/java/JmxSupport.java |  357 ++++
 .../brooklyn/entity/java/JmxmpSslSupport.java   |  134 ++
 .../apache/brooklyn/entity/java/UsesJava.java   |   68 +
 .../brooklyn/entity/java/UsesJavaMXBeans.java   |   77 +
 .../apache/brooklyn/entity/java/UsesJmx.java    |  190 ++
 .../brooklyn/entity/java/VanillaJavaApp.java    |   77 +
 .../entity/java/VanillaJavaAppDriver.java       |   26 +
 .../entity/java/VanillaJavaAppImpl.java         |  112 ++
 .../entity/java/VanillaJavaAppSshDriver.java    |  211 +++
 .../entity/machine/MachineAttributes.java       |   87 +
 .../brooklyn/entity/machine/MachineEntity.java  |   59 +
 .../entity/machine/MachineEntityImpl.java       |  182 ++
 .../entity/machine/MachineInitTasks.java        |  172 ++
 .../machine/ProvidesProvisioningFlags.java      |   35 +
 .../entity/machine/pool/ServerPool.java         |  109 ++
 .../entity/machine/pool/ServerPoolImpl.java     |  432 +++++
 .../entity/machine/pool/ServerPoolLocation.java |   82 +
 .../pool/ServerPoolLocationResolver.java        |  138 ++
 .../base/AbstractSoftwareProcessDriver.java     |  516 ++++++
 .../base/AbstractSoftwareProcessSshDriver.java  |  657 +++++++
 .../AbstractSoftwareProcessWinRmDriver.java     |  193 ++
 .../software/base/AbstractVanillaProcess.java   |   35 +
 .../software/base/EmptySoftwareProcess.java     |   28 +
 .../base/EmptySoftwareProcessDriver.java        |   22 +
 .../software/base/EmptySoftwareProcessImpl.java |   39 +
 .../base/EmptySoftwareProcessSshDriver.java     |   83 +
 .../SameServerDriverLifecycleEffectorTasks.java |  170 ++
 .../entity/software/base/SameServerEntity.java  |   71 +
 .../software/base/SameServerEntityImpl.java     |  128 ++
 .../entity/software/base/SoftwareProcess.java   |  362 ++++
 .../software/base/SoftwareProcessDriver.java    |   75 +
 ...wareProcessDriverLifecycleEffectorTasks.java |  261 +++
 .../software/base/SoftwareProcessImpl.java      |  651 +++++++
 .../software/base/VanillaSoftwareProcess.java   |   62 +
 .../base/VanillaSoftwareProcessDriver.java      |   23 +
 .../base/VanillaSoftwareProcessImpl.java        |   37 +
 .../base/VanillaSoftwareProcessSshDriver.java   |  162 ++
 .../software/base/VanillaWindowsProcess.java    |   64 +
 .../base/VanillaWindowsProcessDriver.java       |   23 +
 .../base/VanillaWindowsProcessImpl.java         |   47 +
 .../base/VanillaWindowsProcessWinRmDriver.java  |   84 +
 .../MachineLifecycleEffectorTasks.java          |  951 ++++++++++
 .../base/lifecycle/NaiveScriptRunner.java       |   43 +
 .../software/base/lifecycle/ScriptHelper.java   |  436 +++++
 .../software/base/lifecycle/ScriptPart.java     |   82 +
 .../system_service/EntityLaunchListener.java    |  111 ++
 .../system_service/InitdServiceInstaller.java   |  135 ++
 .../system_service/SystemServiceEnricher.java   |  152 ++
 .../system_service/SystemServiceInstaller.java  |   25 +
 .../SystemServiceInstallerFactory.java          |   28 +
 .../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 |  102 +
 .../brooklyn/sensor/ssh/SshCommandSensor.java   |  142 ++
 .../brooklyn/sensor/ssh/SshEffectorTasks.java   |  334 ++++
 .../winrm/WindowsPerformanceCounterSensors.java |   73 +
 ...pache.brooklyn.api.location.LocationResolver |    2 +-
 .../entity/brooklynnode/brooklyn-cluster.yaml   |   33 -
 .../brooklyn-node-persisting-to-tmp.yaml        |   27 -
 .../entity/brooklynnode/brooklyn-node.yaml      |   35 -
 .../brooklyn/entity/service/service.sh          |   51 -
 .../entity/brooklynnode/brooklyn-cluster.yaml   |   33 +
 .../brooklyn-node-persisting-to-tmp.yaml        |   27 +
 .../entity/brooklynnode/brooklyn-node.yaml      |   35 +
 .../brooklyn/entity/system_service/service.sh   |   51 +
 .../brooklyn/entity/AbstractEc2LiveTest.java    |  138 --
 .../entity/AbstractGoogleComputeLiveTest.java   |  138 --
 .../entity/AbstractSoftlayerLiveTest.java       |  116 --
 ...ctSoftwareProcessRestartIntegrationTest.java |   94 -
 .../entity/basic/DoNothingSoftwareProcess.java  |   30 -
 .../basic/DoNothingSoftwareProcessDriver.java   |   69 -
 .../basic/DoNothingSoftwareProcessImpl.java     |   35 -
 .../entity/basic/SameServerEntityTest.java      |   82 -
 .../basic/SoftwareProcessEntityLatchTest.java   |  158 --
 .../basic/SoftwareProcessEntityRebindTest.java  |  177 --
 .../entity/basic/SoftwareProcessEntityTest.java |  786 --------
 ...SoftwareProcessSshDriverIntegrationTest.java |  384 ----
 .../basic/SoftwareProcessSubclassTest.java      |  166 --
 ...ftwareProcessAndChildrenIntegrationTest.java |  194 --
 .../entity/basic/lifecycle/MyEntity.java        |   28 -
 .../entity/basic/lifecycle/MyEntityApp.java     |   26 -
 .../entity/basic/lifecycle/MyEntityImpl.java    |  126 --
 .../basic/lifecycle/NaiveScriptRunnerTest.java  |  254 ---
 .../basic/lifecycle/ScriptHelperTest.java       |  159 --
 .../basic/lifecycle/StartStopSshDriverTest.java |  170 --
 .../BrooklynClusterIntegrationTest.java         |   97 -
 .../BrooklynNodeIntegrationTest.java            |  630 -------
 .../entity/brooklynnode/BrooklynNodeTest.java   |  139 --
 .../brooklynnode/CallbackEntityHttpClient.java  |  101 -
 .../entity/brooklynnode/MockBrooklynNode.java   |   71 -
 .../brooklynnode/SameBrooklynNodeImpl.java      |   96 -
 .../brooklynnode/SelectMasterEffectorTest.java  |  257 ---
 .../brooklyn/entity/chef/ChefConfigsTest.java   |   51 -
 .../entity/chef/ChefLiveTestSupport.java        |  100 -
 .../chef/ChefServerTasksIntegrationTest.java    |  125 --
 .../AbstractChefToyMySqlEntityLiveTest.java     |   42 -
 .../ChefSoloDriverMySqlEntityLiveTest.java      |   50 -
 .../mysql/ChefSoloDriverToyMySqlEntity.java     |   90 -
 ...micChefAutodetectToyMySqlEntityLiveTest.java |   43 -
 ...DynamicChefServerToyMySqlEntityLiveTest.java |   51 -
 .../DynamicChefSoloToyMySqlEntityLiveTest.java  |   43 -
 .../chef/mysql/DynamicToyMySqlEntityChef.java   |   82 -
 .../chef/mysql/TypedToyMySqlEntityChef.java     |   56 -
 .../brooklyn/entity/driver/MockSshDriver.java   |   74 -
 ...rWithAvailabilityZonesMultiLocationTest.java |  115 --
 .../brooklyn/entity/java/EntityPollingTest.java |  206 ---
 .../entity/java/ExampleVanillaMain.java         |   26 -
 .../java/ExampleVanillaMainCpuHungry.java       |   41 -
 .../java/brooklyn/entity/java/JavaOptsTest.java |  359 ----
 ...SoftwareProcessSshDriverIntegrationTest.java |  174 --
 .../brooklyn/entity/java/JmxSupportTest.java    |  135 --
 .../brooklyn/entity/java/SslKeyConfigTest.java  |   53 -
 .../entity/java/VanillaJavaAppRebindTest.java   |  173 --
 .../entity/java/VanillaJavaAppTest.java         |  350 ----
 .../machine/MachineEntityEc2LiveTest.java       |   57 -
 .../entity/machine/MachineEntityRebindTest.java |   45 -
 .../entity/pool/AbstractServerPoolTest.java     |  146 --
 .../entity/pool/ServerPoolLiveTest.java         |   98 -
 .../pool/ServerPoolLocationResolverTest.java    |   89 -
 .../entity/pool/ServerPoolRebindTest.java       |  109 --
 .../brooklyn/entity/pool/ServerPoolTest.java    |  176 --
 .../service/SystemServiceEnricherTest.java      |   96 -
 .../entity/software/AbstractDockerLiveTest.java |  100 -
 .../MachineLifecycleEffectorTasksTest.java      |  140 --
 .../entity/software/SoftwareEffectorTest.java   |  142 --
 .../entity/software/SshEffectorTasksTest.java   |  265 ---
 .../entity/software/StaticSensorTest.java       |   55 -
 .../software/http/HttpRequestSensorTest.java    |   85 -
 .../mysql/AbstractToyMySqlEntityTest.java       |  109 --
 .../mysql/DynamicToyMySqlEntityBuilder.java     |  191 --
 .../mysql/DynamicToyMySqlEntityTest.java        |   58 -
 .../software/ssh/SshCommandIntegrationTest.java |  126 --
 .../PortAttributeSensorAndConfigKeyTest.java    |   87 -
 .../brooklyn/event/feed/jmx/JmxFeedTest.java    |  418 -----
 .../brooklyn/event/feed/jmx/JmxHelperTest.java  |  311 ----
 .../event/feed/jmx/RebindJmxFeedTest.java       |  148 --
 .../usage/ApplicationUsageTrackingTest.java     |  225 ---
 .../usage/LocationUsageTrackingTest.java        |  212 ---
 .../usage/RecordingLegacyUsageListener.java     |   70 -
 .../usage/RecordingUsageListener.java           |   67 -
 .../management/usage/UsageListenerTest.java     |  144 --
 .../brooklyn/test/GeneralisedDynamicMBean.java  |  146 --
 .../src/test/java/brooklyn/test/JmxService.java |  173 --
 .../brooklyn/entity/AbstractEc2LiveTest.java    |  139 ++
 .../entity/AbstractGoogleComputeLiveTest.java   |  137 ++
 .../entity/AbstractSoftlayerLiveTest.java       |  115 ++
 .../BrooklynClusterIntegrationTest.java         |   97 +
 .../BrooklynNodeIntegrationTest.java            |  632 +++++++
 .../entity/brooklynnode/BrooklynNodeTest.java   |  141 ++
 .../brooklynnode/CallbackEntityHttpClient.java  |  100 +
 .../entity/brooklynnode/MockBrooklynNode.java   |   72 +
 .../brooklynnode/SameBrooklynNodeImpl.java      |   97 +
 .../brooklynnode/SelectMasterEffectorTest.java  |  259 +++
 .../brooklyn/entity/chef/ChefConfigsTest.java   |   52 +
 .../entity/chef/ChefLiveTestSupport.java        |   99 +
 .../chef/ChefServerTasksIntegrationTest.java    |  126 ++
 .../AbstractChefToyMySqlEntityLiveTest.java     |   40 +
 .../ChefSoloDriverMySqlEntityLiveTest.java      |   49 +
 .../mysql/ChefSoloDriverToyMySqlEntity.java     |   89 +
 ...micChefAutodetectToyMySqlEntityLiveTest.java |   43 +
 ...DynamicChefServerToyMySqlEntityLiveTest.java |   50 +
 .../DynamicChefSoloToyMySqlEntityLiveTest.java  |   43 +
 .../chef/mysql/DynamicToyMySqlEntityChef.java   |   81 +
 .../chef/mysql/TypedToyMySqlEntityChef.java     |   55 +
 .../brooklyn/entity/java/EntityPollingTest.java |  206 +++
 .../entity/java/ExampleVanillaMain.java         |   26 +
 .../java/ExampleVanillaMainCpuHungry.java       |   41 +
 .../brooklyn/entity/java/JavaOptsTest.java      |  361 ++++
 ...SoftwareProcessSshDriverIntegrationTest.java |  173 ++
 .../brooklyn/entity/java/JmxSupportTest.java    |  135 ++
 .../brooklyn/entity/java/SslKeyConfigTest.java  |   53 +
 .../entity/java/VanillaJavaAppRebindTest.java   |  173 ++
 .../entity/java/VanillaJavaAppTest.java         |  352 ++++
 .../machine/MachineEntityEc2LiveTest.java       |   57 +
 .../entity/machine/MachineEntityRebindTest.java |   44 +
 .../machine/pool/AbstractServerPoolTest.java    |  145 ++
 .../entity/machine/pool/ServerPoolLiveTest.java |   97 +
 .../pool/ServerPoolLocationResolverTest.java    |   90 +
 .../machine/pool/ServerPoolRebindTest.java      |  109 ++
 .../entity/machine/pool/ServerPoolTest.java     |  175 ++
 .../software/base/AbstractDockerLiveTest.java   |   99 +
 ...ctSoftwareProcessRestartIntegrationTest.java |   96 +
 .../software/base/DoNothingSoftwareProcess.java |   33 +
 .../base/DoNothingSoftwareProcessDriver.java    |   69 +
 .../base/DoNothingSoftwareProcessImpl.java      |   38 +
 .../software/base/SameServerEntityTest.java     |   84 +
 .../software/base/SoftwareEffectorTest.java     |  141 ++
 .../base/SoftwareProcessEntityLatchTest.java    |  161 ++
 .../base/SoftwareProcessEntityRebindTest.java   |  179 ++
 .../base/SoftwareProcessEntityTest.java         |  799 ++++++++
 ...SoftwareProcessSshDriverIntegrationTest.java |  389 ++++
 .../base/SoftwareProcessSubclassTest.java       |  169 ++
 ...ftwareProcessAndChildrenIntegrationTest.java |  197 ++
 .../MachineLifecycleEffectorTasksTest.java      |  147 ++
 .../software/base/lifecycle/MyEntity.java       |   27 +
 .../software/base/lifecycle/MyEntityApp.java    |   26 +
 .../software/base/lifecycle/MyEntityImpl.java   |  125 ++
 .../base/lifecycle/NaiveScriptRunnerTest.java   |  254 +++
 .../base/lifecycle/ScriptHelperTest.java        |  157 ++
 .../base/lifecycle/StartStopSshDriverTest.java  |  168 ++
 .../usage/ApplicationUsageTrackingTest.java     |  224 +++
 .../mgmt/usage/LocationUsageTrackingTest.java   |  210 +++
 .../usage/RecordingLegacyUsageListener.java     |   70 +
 .../core/mgmt/usage/RecordingUsageListener.java |   67 +
 .../test/core/mgmt/usage/UsageListenerTest.java |  142 ++
 .../base/test/driver/MockSshDriver.java         |   72 +
 ...rWithAvailabilityZonesMultiLocationTest.java |  115 ++
 .../base/test/jmx/GeneralisedDynamicMBean.java  |  146 ++
 .../software/base/test/jmx/JmxService.java      |  172 ++
 .../location/MachineDetailsEc2LiveTest.java     |   70 +
 .../MachineDetailsGoogleComputeLiveTest.java    |   67 +
 .../location/WinRmMachineLocationLiveTest.java  |   92 +
 .../test/mysql/AbstractToyMySqlEntityTest.java  |  107 ++
 .../mysql/DynamicToyMySqlEntityBuilder.java     |  189 ++
 .../test/mysql/DynamicToyMySqlEntityTest.java   |   58 +
 .../PortAttributeSensorAndConfigKeyTest.java    |   86 +
 .../test/ssh/SshCommandIntegrationTest.java     |  126 ++
 .../SystemServiceEnricherTest.java              |   95 +
 .../basic/MachineDetailsEc2LiveTest.java        |   68 -
 .../MachineDetailsGoogleComputeLiveTest.java    |   65 -
 .../basic/WinRmMachineLocationLiveTest.java     |   94 -
 .../basic/WinRmMachineLocationTest.java         |   44 -
 .../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 +++
 .../resources/brooklyn/entity/basic/frogs.txt   |   27 -
 .../brooklyn/entity/basic/template.yaml         |   23 -
 .../basic/template_with_extra_substitutions.txt |   18 -
 .../brooklyn-tests.pem                          |   27 -
 .../brooklyn-validator.pem                      |   27 -
 .../hosted-chef-brooklyn-credentials/knife.rb   |   27 -
 .../brooklyn-tests.pem                          |   27 +
 .../brooklyn-validator.pem                      |   27 +
 .../hosted-chef-brooklyn-credentials/knife.rb   |   27 +
 .../brooklyn/entity/software/base/frogs.txt     |   27 +
 .../brooklyn/entity/software/base/template.yaml |   23 +
 .../base/template_with_extra_substitutions.txt  |   18 +
 .../brooklyn/entity/database/DatabaseNode.java  |    2 +-
 .../entity/database/DatastoreMixins.java        |   15 +-
 .../entity/database/crate/CrateNode.java        |   32 +-
 .../entity/database/crate/CrateNodeDriver.java  |    2 +-
 .../entity/database/crate/CrateNodeImpl.java    |   17 +-
 .../database/crate/CrateNodeSshDriver.java      |    9 +-
 .../entity/database/mariadb/MariaDbDriver.java  |    7 +-
 .../entity/database/mariadb/MariaDbNode.java    |   30 +-
 .../database/mariadb/MariaDbNodeImpl.java       |   18 +-
 .../database/mariadb/MariaDbSshDriver.java      |   18 +-
 .../entity/database/mysql/MySqlCluster.java     |   14 +-
 .../entity/database/mysql/MySqlClusterImpl.java |   35 +-
 .../entity/database/mysql/MySqlDriver.java      |    7 +-
 .../entity/database/mysql/MySqlNode.java        |   36 +-
 .../entity/database/mysql/MySqlNodeImpl.java    |   18 +-
 .../entity/database/mysql/MySqlSshDriver.java   |   20 +-
 .../database/postgresql/PostgreSqlDriver.java   |    9 +-
 .../database/postgresql/PostgreSqlNode.java     |   24 +-
 .../PostgreSqlNodeChefImplFromScratch.java      |   36 +-
 .../database/postgresql/PostgreSqlNodeImpl.java |    7 +-
 .../database/postgresql/PostgreSqlSpecs.java    |    7 +-
 .../postgresql/PostgreSqlSshDriver.java         |   23 +-
 .../entity/database/rubyrep/RubyRepDriver.java  |    2 +-
 .../entity/database/rubyrep/RubyRepNode.java    |   21 +-
 .../database/rubyrep/RubyRepNodeImpl.java       |    8 +-
 .../database/rubyrep/RubyRepSshDriver.java      |   12 +-
 .../brooklyn/entity/database/mssql/mssql.yaml   |    2 +-
 .../crate/CrateNodeIntegrationTest.java         |   12 +-
 .../mariadb/MariaDbIntegrationTest.java         |   18 +-
 .../database/mariadb/MariaDbLiveEc2Test.java    |    6 +-
 .../mariadb/MariaDbLiveRackspaceTest.java       |    4 +-
 .../mysql/MySqlClusterIntegrationTest.java      |    3 +-
 .../database/mysql/MySqlClusterLiveEc2Test.java |    4 +-
 .../mysql/MySqlClusterLiveSoftlayerTest.java    |    4 +-
 .../database/mysql/MySqlClusterTestHelper.java  |    4 +-
 .../database/mysql/MySqlIntegrationTest.java    |    8 +-
 .../entity/database/mysql/MySqlLiveEc2Test.java |    5 +-
 .../entity/database/mysql/MySqlLiveGceTest.java |    5 +-
 .../database/mysql/MySqlLiveRackspaceTest.java  |    6 +-
 .../mysql/MySqlRestartIntegrationTest.java      |    7 +-
 .../database/mysql/MysqlDockerLiveTest.java     |    4 +-
 .../postgresql/PostgreSqDockerLiveTest.java     |    4 +-
 .../database/postgresql/PostgreSqlChefTest.java |   18 +-
 .../postgresql/PostgreSqlEc2LiveTest.java       |    5 +-
 .../postgresql/PostgreSqlGceLiveTest.java       |    5 +-
 .../postgresql/PostgreSqlIntegrationTest.java   |   18 +-
 .../postgresql/PostgreSqlRackspaceLiveTest.java |    6 +-
 .../PostgreSqlRebindIntegrationTest.java        |    7 +-
 .../PostgreSqlRestartIntegrationTest.java       |    7 +-
 .../database/rubyrep/RubyRepEc2LiveTest.java    |    8 +-
 .../rubyrep/RubyRepIntegrationTest.java         |   20 +-
 .../rubyrep/RubyRepRackspaceLiveTest.java       |    6 +-
 .../entity/messaging/MessageBroker.java         |    5 +-
 .../apache/brooklyn/entity/messaging/Queue.java |    7 +-
 .../apache/brooklyn/entity/messaging/Topic.java |    2 +-
 .../messaging/activemq/ActiveMQBroker.java      |   25 +-
 .../messaging/activemq/ActiveMQBrokerImpl.java  |   11 +-
 .../activemq/ActiveMQDestinationImpl.java       |    7 +-
 .../messaging/activemq/ActiveMQDriver.java      |    2 +-
 .../messaging/activemq/ActiveMQQueue.java       |    3 +-
 .../messaging/activemq/ActiveMQQueueImpl.java   |    5 +-
 .../messaging/activemq/ActiveMQSpecs.java       |    2 +-
 .../messaging/activemq/ActiveMQSshDriver.java   |    7 +-
 .../messaging/activemq/ActiveMQTopic.java       |    3 +-
 .../entity/messaging/amqp/AmqpExchange.java     |    7 +-
 .../entity/messaging/amqp/AmqpServer.java       |    7 +-
 .../entity/messaging/jms/JMSBroker.java         |    2 +-
 .../entity/messaging/jms/JMSBrokerImpl.java     |    6 +-
 .../messaging/jms/JMSDestinationImpl.java       |    2 +-
 .../kafka/AbstractfKafkaSshDriver.java          |   10 +-
 .../brooklyn/entity/messaging/kafka/Kafka.java  |   12 +-
 .../entity/messaging/kafka/KafkaBroker.java     |   24 +-
 .../messaging/kafka/KafkaBrokerDriver.java      |    2 +-
 .../entity/messaging/kafka/KafkaBrokerImpl.java |   13 +-
 .../messaging/kafka/KafkaBrokerSshDriver.java   |    8 +-
 .../entity/messaging/kafka/KafkaCluster.java    |   29 +-
 .../messaging/kafka/KafkaClusterImpl.java       |   17 +-
 .../entity/messaging/kafka/KafkaZooKeeper.java  |   17 +-
 .../messaging/kafka/KafkaZooKeeperDriver.java   |    2 +-
 .../messaging/kafka/KafkaZooKeeperImpl.java     |    3 +-
 .../kafka/KafkaZooKeeperSshDriver.java          |    5 +-
 .../entity/messaging/qpid/QpidBroker.java       |   21 +-
 .../entity/messaging/qpid/QpidBrokerImpl.java   |   15 +-
 .../messaging/qpid/QpidDestinationImpl.java     |   13 +-
 .../entity/messaging/qpid/QpidDriver.java       |    2 +-
 .../entity/messaging/qpid/QpidQueue.java        |    3 +-
 .../entity/messaging/qpid/QpidQueueImpl.java    |    5 +-
 .../entity/messaging/qpid/QpidSshDriver.java    |    8 +-
 .../entity/messaging/qpid/QpidTopic.java        |    3 +-
 .../entity/messaging/rabbit/RabbitBroker.java   |   21 +-
 .../messaging/rabbit/RabbitBrokerImpl.java      |    7 +-
 .../messaging/rabbit/RabbitDestination.java     |    5 +-
 .../entity/messaging/rabbit/RabbitDriver.java   |    2 +-
 .../entity/messaging/rabbit/RabbitQueue.java    |    6 +-
 .../messaging/rabbit/RabbitSshDriver.java       |    9 +-
 .../brooklyn/entity/messaging/storm/Storm.java  |   21 +-
 .../entity/messaging/storm/StormDeployment.java |    9 +-
 .../messaging/storm/StormDeploymentImpl.java    |   13 +-
 .../entity/messaging/storm/StormDriver.java     |    2 +-
 .../entity/messaging/storm/StormImpl.java       |   13 +-
 .../entity/messaging/storm/StormSshDriver.java  |   20 +-
 .../entity/zookeeper/AbstractZooKeeperImpl.java |   11 +-
 .../entity/zookeeper/ZooKeeperDriver.java       |    2 +-
 .../entity/zookeeper/ZooKeeperEnsemble.java     |   15 +-
 .../entity/zookeeper/ZooKeeperEnsembleImpl.java |   11 +-
 .../entity/zookeeper/ZooKeeperNode.java         |   17 +-
 .../entity/zookeeper/ZooKeeperSshDriver.java    |    8 +-
 .../messaging/activemq/ActiveMQEc2LiveTest.java |    7 +-
 .../activemq/ActiveMQGoogleComputeLiveTest.java |    7 +-
 .../activemq/ActiveMQIntegrationTest.java       |   15 +-
 .../messaging/kafka/KafkaIntegrationTest.java   |   16 +-
 .../entity/messaging/kafka/KafkaLiveTest.java   |    9 +-
 .../entity/messaging/kafka/KafkaSupport.java    |    2 +-
 .../entity/messaging/qpid/QpidEc2LiveTest.java  |    5 +-
 .../messaging/qpid/QpidIntegrationTest.java     |   15 +-
 .../messaging/rabbit/RabbitEc2LiveTest.java     |    5 +-
 .../messaging/rabbit/RabbitIntegrationTest.java |   14 +-
 .../storm/StormAbstractCloudLiveTest.java       |   21 +-
 .../messaging/storm/StormEc2LiveTest.java       |    9 +-
 .../zookeeper/ZooKeeperEc2LiveTest.java         |    9 +-
 .../zookeeper/ZooKeeperEnsembleLiveTest.java    |   12 +-
 .../entity/monitoring/monit/MonitDriver.java    |    2 +-
 .../entity/monitoring/monit/MonitNode.java      |   21 +-
 .../entity/monitoring/monit/MonitNodeImpl.java  |   11 +-
 .../entity/monitoring/monit/MonitSshDriver.java |    9 +-
 .../monitoring/monit/MonitIntegrationTest.java  |   15 +-
 .../entity/network/bind/BindDnsServer.java      |   22 +-
 .../network/bind/BindDnsServerDriver.java       |    4 +-
 .../entity/network/bind/BindDnsServerImpl.java  |   19 +-
 .../network/bind/BindDnsServerSshDriver.java    |    5 +-
 .../network/bind/BindDnsServerByonLiveTest.java |    4 +-
 .../network/bind/BindDnsServerEc2LiveTest.java  |    4 +-
 .../bind/BindDnsServerIntegrationTest.java      |   27 +-
 .../network/bind/BindDnsServerLiveTest.java     |   17 +-
 .../bind/BindDnsServerSoftlayerLiveTest.java    |    4 +-
 .../bind/DoNothingSoftwareProcessDriver.java    |    9 +-
 .../network/bind/PrefixAndIdEnricher.java       |   15 +-
 .../network/bind/TestBindDnsServerImpl.java     |    5 +-
 .../nosql/cassandra/CassandraCluster.java       |    2 +-
 .../nosql/cassandra/CassandraDatacenter.java    |   25 +-
 .../cassandra/CassandraDatacenterImpl.java      |   36 +-
 .../entity/nosql/cassandra/CassandraFabric.java |   13 +-
 .../nosql/cassandra/CassandraFabricImpl.java    |   23 +-
 .../entity/nosql/cassandra/CassandraNode.java   |   32 +-
 .../nosql/cassandra/CassandraNodeDriver.java    |    5 +-
 .../nosql/cassandra/CassandraNodeImpl.java      |   40 +-
 .../nosql/cassandra/CassandraNodeSshDriver.java |   31 +-
 .../nosql/couchbase/CouchbaseCluster.java       |   13 +-
 .../nosql/couchbase/CouchbaseClusterImpl.java   |   46 +-
 .../entity/nosql/couchbase/CouchbaseNode.java   |   29 +-
 .../nosql/couchbase/CouchbaseNodeDriver.java    |    3 +-
 .../nosql/couchbase/CouchbaseNodeImpl.java      |   30 +-
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |   36 +-
 .../nosql/couchbase/CouchbaseSyncGateway.java   |   17 +-
 .../couchbase/CouchbaseSyncGatewayDriver.java   |    2 +-
 .../couchbase/CouchbaseSyncGatewayImpl.java     |    9 +-
 .../CouchbaseSyncGatewaySshDriver.java          |   14 +-
 .../entity/nosql/couchdb/CouchDBCluster.java    |   13 +-
 .../nosql/couchdb/CouchDBClusterImpl.java       |    5 +-
 .../entity/nosql/couchdb/CouchDBNode.java       |   11 +-
 .../entity/nosql/couchdb/CouchDBNodeDriver.java |    2 +-
 .../entity/nosql/couchdb/CouchDBNodeImpl.java   |   11 +-
 .../nosql/couchdb/CouchDBNodeSshDriver.java     |    8 +-
 .../elasticsearch/ElasticSearchCluster.java     |    9 +-
 .../elasticsearch/ElasticSearchClusterImpl.java |    5 +-
 .../nosql/elasticsearch/ElasticSearchNode.java  |   24 +-
 .../elasticsearch/ElasticSearchNodeDriver.java  |    2 +-
 .../elasticsearch/ElasticSearchNodeImpl.java    |   16 +-
 .../ElasticSearchNodeSshDriver.java             |   10 +-
 .../nosql/mongodb/AbstractMongoDBServer.java    |   13 +-
 .../nosql/mongodb/AbstractMongoDBSshDriver.java |   12 +-
 .../entity/nosql/mongodb/MongoDBClient.java     |   13 +-
 .../nosql/mongodb/MongoDBClientDriver.java      |    2 +-
 .../entity/nosql/mongodb/MongoDBClientImpl.java |    4 +-
 .../nosql/mongodb/MongoDBClientSshDriver.java   |   10 +-
 .../entity/nosql/mongodb/MongoDBDriver.java     |    2 +-
 .../entity/nosql/mongodb/MongoDBReplicaSet.java |   15 +-
 .../nosql/mongodb/MongoDBReplicaSetImpl.java    |   21 +-
 .../entity/nosql/mongodb/MongoDBServer.java     |   17 +-
 .../entity/nosql/mongodb/MongoDBServerImpl.java |   12 +-
 .../entity/nosql/mongodb/MongoDBSshDriver.java  |    3 +-
 .../sharding/CoLocatedMongoDBRouter.java        |   15 +-
 .../sharding/CoLocatedMongoDBRouterImpl.java    |   13 +-
 .../mongodb/sharding/MongoDBConfigServer.java   |    2 +-
 .../sharding/MongoDBConfigServerCluster.java    |    9 +-
 .../MongoDBConfigServerClusterImpl.java         |    5 +-
 .../sharding/MongoDBConfigServerDriver.java     |    2 +-
 .../sharding/MongoDBConfigServerImpl.java       |    2 +-
 .../sharding/MongoDBConfigServerSshDriver.java  |    3 +-
 .../nosql/mongodb/sharding/MongoDBRouter.java   |    9 +-
 .../mongodb/sharding/MongoDBRouterCluster.java  |    9 +-
 .../sharding/MongoDBRouterClusterImpl.java      |   15 +-
 .../mongodb/sharding/MongoDBRouterDriver.java   |    2 +-
 .../mongodb/sharding/MongoDBRouterImpl.java     |    7 +-
 .../sharding/MongoDBRouterSshDriver.java        |    3 +-
 .../mongodb/sharding/MongoDBShardCluster.java   |    5 +-
 .../sharding/MongoDBShardClusterImpl.java       |   11 +-
 .../sharding/MongoDBShardedDeployment.java      |   15 +-
 .../sharding/MongoDBShardedDeploymentImpl.java  |   25 +-
 .../entity/nosql/redis/RedisCluster.java        |    7 +-
 .../entity/nosql/redis/RedisClusterImpl.java    |   21 +-
 .../brooklyn/entity/nosql/redis/RedisShard.java |    2 +-
 .../entity/nosql/redis/RedisShardImpl.java      |    2 +-
 .../brooklyn/entity/nosql/redis/RedisSlave.java |    7 +-
 .../brooklyn/entity/nosql/redis/RedisStore.java |   17 +-
 .../entity/nosql/redis/RedisStoreDriver.java    |    2 +-
 .../entity/nosql/redis/RedisStoreImpl.java      |   14 +-
 .../entity/nosql/redis/RedisStoreSshDriver.java |    8 +-
 .../brooklyn/entity/nosql/riak/RiakCluster.java |   15 +-
 .../entity/nosql/riak/RiakClusterImpl.java      |   33 +-
 .../brooklyn/entity/nosql/riak/RiakNode.java    |   27 +-
 .../entity/nosql/riak/RiakNodeDriver.java       |    4 +-
 .../entity/nosql/riak/RiakNodeImpl.java         |   20 +-
 .../entity/nosql/riak/RiakNodeSshDriver.java    |   19 +-
 .../brooklyn/entity/nosql/solr/SolrServer.java  |   24 +-
 .../entity/nosql/solr/SolrServerDriver.java     |    4 +-
 .../entity/nosql/solr/SolrServerImpl.java       |   11 +-
 .../entity/nosql/solr/SolrServerSshDriver.java  |   13 +-
 .../cassandra/AbstractCassandraNodeTest.java    |    4 +-
 .../entity/nosql/cassandra/AstyanaxSupport.java |    3 +-
 .../CassandraDatacenterIntegrationTest.java     |    9 +-
 .../cassandra/CassandraDatacenterLiveTest.java  |   11 +-
 ...assandraDatacenterRebindIntegrationTest.java |   11 +-
 .../cassandra/CassandraDatacenterTest.java      |   20 +-
 .../nosql/cassandra/CassandraFabricTest.java    |   26 +-
 .../cassandra/CassandraNodeEc2LiveTest.java     |    5 +-
 .../cassandra/CassandraNodeIntegrationTest.java |    9 +-
 .../nosql/cassandra/CassandraNodeLiveTest.java  |    2 +-
 .../nosql/couchbase/CouchbaseOfflineTest.java   |   12 +-
 .../CouchbaseSyncGatewayEc2LiveTest.java        |    9 +-
 .../nosql/couchdb/AbstractCouchDBNodeTest.java  |   10 +-
 .../nosql/couchdb/CouchDBClusterLiveTest.java   |   11 +-
 .../nosql/couchdb/CouchDBNodeEc2LiveTest.java   |    7 +-
 .../couchdb/CouchDBNodeIntegrationTest.java     |    5 +-
 .../nosql/couchdb/CouchDBNodeLiveTest.java      |    5 +-
 .../entity/nosql/couchdb/JcouchdbSupport.java   |    3 +-
 .../ElasticSearchClusterIntegrationTest.java    |   17 +-
 .../ElasticSearchNodeIntegrationTest.java       |   22 +-
 .../nosql/mongodb/MongoDBEc2LiveTest.java       |    5 +-
 .../nosql/mongodb/MongoDBIntegrationTest.java   |   13 +-
 .../mongodb/MongoDBRebindIntegrationTest.java   |    7 +-
 .../mongodb/MongoDBReplicaSetEc2LiveTest.java   |    9 +-
 .../MongoDBReplicaSetIntegrationTest.java       |   12 +-
 .../mongodb/MongoDBRestartIntegrationTest.java  |    7 +-
 .../nosql/mongodb/MongoDBSoftLayerLiveTest.java |    5 +-
 .../MongoDBConfigServerIntegrationTest.java     |   14 +-
 .../MongoDBShardedDeploymentEc2LiveTest.java    |    7 +-
 ...MongoDBShardedDeploymentIntegrationTest.java |    9 +-
 .../redis/RedisClusterIntegrationTest.java      |   16 +-
 .../entity/nosql/redis/RedisEc2LiveTest.java    |    5 +-
 .../nosql/redis/RedisIntegrationTest.java       |   12 +-
 .../nosql/riak/RiakClusterEc2LiveTest.java      |    7 +-
 .../entity/nosql/riak/RiakNodeEc2LiveTest.java  |    5 +-
 .../riak/RiakNodeGoogleComputeLiveTest.java     |    5 +-
 .../nosql/riak/RiakNodeIntegrationTest.java     |   10 +-
 .../nosql/riak/RiakNodeSoftlayerLiveTest.java   |    5 +-
 .../nosql/solr/AbstractSolrServerTest.java      |    4 +-
 .../entity/nosql/solr/SolrJSupport.java         |    3 +-
 .../nosql/solr/SolrServerEc2LiveTest.java       |    7 +-
 .../nosql/solr/SolrServerIntegrationTest.java   |    7 +-
 .../entity/nosql/solr/SolrServerLiveTest.java   |    5 +-
 .../entity/osgi/karaf/KarafContainer.java       |   27 +-
 .../entity/osgi/karaf/KarafContainerImpl.java   |   23 +-
 .../brooklyn/entity/osgi/karaf/KarafDriver.java |    2 +-
 .../entity/osgi/karaf/KarafSshDriver.java       |    7 +-
 .../osgi/karaf/KarafContainerEc2LiveTest.java   |    5 +-
 .../entity/osgi/karaf/KarafContainerTest.java   |   14 +-
 .../entity/dns/AbstractGeoDnsService.java       |   14 +-
 .../entity/dns/AbstractGeoDnsServiceImpl.java   |   18 +-
 .../dns/geoscaling/GeoscalingDnsService.java    |   15 +-
 .../geoscaling/GeoscalingDnsServiceImpl.java    |    8 +-
 .../geoscaling/GeoscalingScriptGenerator.java   |    2 +-
 .../dns/geoscaling/GeoscalingWebClient.java     |    2 +-
 .../entity/proxy/AbstractController.java        |   15 +-
 .../entity/proxy/AbstractControllerImpl.java    |   28 +-
 .../proxy/AbstractNonProvisionedController.java |    2 +-
 .../AbstractNonProvisionedControllerImpl.java   |   13 +-
 .../brooklyn/entity/proxy/LoadBalancer.java     |   21 +-
 .../entity/proxy/LoadBalancerCluster.java       |    5 +-
 .../entity/proxy/LoadBalancerClusterImpl.java   |    3 +-
 .../brooklyn/entity/proxy/ProxySslConfig.java   |    4 +-
 .../entity/proxy/nginx/NginxController.java     |   23 +-
 .../entity/proxy/nginx/NginxControllerImpl.java |   35 +-
 .../entity/proxy/nginx/NginxDriver.java         |    2 +-
 .../entity/proxy/nginx/NginxSshDriver.java      |   26 +-
 .../nginx/NginxTemplateConfigGenerator.java     |    7 +-
 .../brooklyn/entity/proxy/nginx/UrlMapping.java |   17 +-
 .../entity/proxy/nginx/UrlMappingImpl.java      |   19 +-
 .../webapp/ControlledDynamicWebAppCluster.java  |   37 +-
 .../ControlledDynamicWebAppClusterImpl.java     |   31 +-
 .../entity/webapp/DynamicWebAppCluster.java     |    9 +-
 .../entity/webapp/DynamicWebAppClusterImpl.java |   29 +-
 .../entity/webapp/DynamicWebAppFabric.java      |    9 +-
 .../entity/webapp/DynamicWebAppFabricImpl.java  |    7 +-
 .../entity/webapp/ElasticJavaWebAppService.java |   11 +-
 .../entity/webapp/JavaWebAppDriver.java         |    2 +-
 .../entity/webapp/JavaWebAppService.java        |   17 +-
 .../webapp/JavaWebAppSoftwareProcess.java       |    2 +-
 .../webapp/JavaWebAppSoftwareProcessImpl.java   |    9 +-
 .../entity/webapp/JavaWebAppSshDriver.java      |   13 +-
 .../entity/webapp/WebAppServiceConstants.java   |   13 +-
 .../entity/webapp/WebAppServiceMethods.java     |   10 +-
 .../entity/webapp/WebAppServiceMetrics.java     |   11 +-
 .../entity/webapp/jboss/JBoss6Server.java       |   13 +-
 .../entity/webapp/jboss/JBoss6ServerImpl.java   |    9 +-
 .../entity/webapp/jboss/JBoss6SshDriver.java    |   12 +-
 .../entity/webapp/jboss/JBoss7Server.java       |   21 +-
 .../entity/webapp/jboss/JBoss7ServerImpl.java   |   12 +-
 .../entity/webapp/jboss/JBoss7SshDriver.java    |    8 +-
 .../entity/webapp/jetty/Jetty6Server.java       |   19 +-
 .../entity/webapp/jetty/Jetty6ServerImpl.java   |   13 +-
 .../entity/webapp/jetty/Jetty6SshDriver.java    |    6 +-
 .../webapp/nodejs/NodeJsWebAppDriver.java       |    2 +-
 .../webapp/nodejs/NodeJsWebAppService.java      |   14 +-
 .../webapp/nodejs/NodeJsWebAppServiceImpl.java  |   13 +-
 .../webapp/nodejs/NodeJsWebAppSshDriver.java    |   12 +-
 .../entity/webapp/tomcat/Tomcat7SshDriver.java  |    2 +-
 .../entity/webapp/tomcat/Tomcat8Server.java     |   11 +-
 .../entity/webapp/tomcat/TomcatServer.java      |   24 +-
 .../entity/webapp/tomcat/TomcatServerImpl.java  |    7 +-
 .../entity/webapp/tomcat/TomcatSshDriver.java   |    6 +-
 .../entity/dns/AbstractGeoDnsServiceTest.java   |   42 +-
 .../geoscaling/GeoscalingIntegrationTest.java   |   20 +-
 .../GeoscalingScriptGeneratorTest.java          |    2 +-
 .../dns/geoscaling/GeoscalingWebClientTest.java |    2 +-
 .../entity/proxy/AbstractControllerTest.java    |   32 +-
 .../entity/proxy/ProxySslConfigTest.java        |    2 +-
 .../brooklyn/entity/proxy/StubAppServer.java    |   11 +-
 .../proxy/TrackingAbstractController.java       |    2 +-
 .../proxy/TrackingAbstractControllerImpl.java   |    3 +-
 .../brooklyn/entity/proxy/UrlMappingTest.java   |   26 +-
 .../nginx/NginxClusterIntegrationTest.java      |   18 +-
 .../entity/proxy/nginx/NginxEc2LiveTest.java    |    7 +-
 .../nginx/NginxHttpsSslIntegrationTest.java     |   16 +-
 .../proxy/nginx/NginxIntegrationTest.java       |   11 +-
 .../proxy/nginx/NginxLightIntegrationTest.java  |   16 +-
 .../proxy/nginx/NginxRebindIntegrationTest.java |   22 +-
 .../nginx/NginxRebindWithHaIntegrationTest.java |   36 +-
 .../nginx/NginxUrlMappingIntegrationTest.java   |   20 +-
 .../proxy/nginx/NginxWebClusterEc2LiveTest.java |   16 +-
 .../AbstractWebAppFixtureIntegrationTest.java   |   39 +-
 ...lledDynamicWebAppClusterIntegrationTest.java |   14 +-
 .../ControlledDynamicWebAppClusterTest.java     |   18 +-
 .../entity/webapp/DynamicWebAppClusterTest.java |   16 +-
 .../entity/webapp/DynamicWebAppFabricTest.java  |   18 +-
 .../webapp/ElasticCustomLocationTest.java       |   16 +-
 ...ElasticJavaWebAppServiceIntegrationTest.java |    8 +-
 .../entity/webapp/HttpsSslConfigTest.java       |    2 +-
 .../webapp/TomcatAutoScalerPolicyTest.java      |   12 +-
 .../webapp/WebAppConcurrentDeployTest.java      |   18 +-
 .../webapp/WebAppLiveIntegrationTest.groovy     |   29 +-
 ...namicWebAppClusterRebindIntegrationTest.java |   18 +-
 ...namicWebAppClusterRebindIntegrationTest.java |   16 +-
 .../jboss/JBoss6ServerAwsEc2LiveTest.java       |    5 +-
 ...Boss6ServerNonInheritingIntegrationTest.java |   10 +-
 .../jboss/JBoss7ServerAwsEc2LiveTest.java       |    5 +-
 .../jboss/JBoss7ServerDockerLiveTest.java       |    5 +-
 ...Boss7ServerNonInheritingIntegrationTest.java |   10 +-
 .../JBoss7ServerRebindingIntegrationTest.java   |   13 +-
 ...ultiVersionWebAppFixtureIntegrationTest.java |    9 +-
 .../Jboss7ServerGoogleComputeLiveTest.java      |    5 +-
 .../JettyWebAppFixtureIntegrationTest.java      |    9 +-
 .../webapp/nodejs/NodeJsWebAppEc2LiveTest.java  |    5 +-
 .../NodeJsWebAppFixtureIntegrationTest.java     |   15 +-
 .../NodeJsWebAppSimpleIntegrationTest.java      |   10 +-
 .../nodejs/NodeJsWebAppSoftlayerLiveTest.java   |    5 +-
 .../webapp/tomcat/Tomcat8ServerEc2LiveTest.java |    6 +-
 .../Tomcat8ServerRestartIntegrationTest.java    |    7 +-
 .../tomcat/Tomcat8ServerSoftlayerLiveTest.java  |    6 +-
 ...mcat8ServerWebAppFixtureIntegrationTest.java |   10 +-
 ...ableRetrieveUsageMetricsIntegrationTest.java |   10 +-
 .../webapp/tomcat/TomcatServerEc2LiveTest.java  |    5 +-
 .../TomcatServerRestartIntegrationTest.java     |    7 +-
 .../tomcat/TomcatServerSoftlayerLiveTest.java   |    5 +-
 ...omcatServerWebAppFixtureIntegrationTest.java |   10 +-
 .../test/entity/TestJavaWebAppEntity.java       |   21 +-
 .../test/entity/TestJavaWebAppEntityImpl.java   |    5 +-
 .../impl/hazelcast/EntityStreamSerializer.java  |    3 +-
 .../impl/hazelcast/HazelcastDataGrid.java       |    2 +-
 .../hazelcast/HazelcastDataGridFactory.java     |    2 +-
 .../impl/hazelcast/HazelcastStorageTest.java    |    4 +-
 .../app/ClusterWebServerDatabaseSample.java     |   36 +-
 .../sample/app/SingleWebServerSample.java       |   13 +-
 .../app/SampleLocalhostIntegrationTest.java     |   19 +-
 .../brooklyn/sample/app/SampleUnitTest.java     |   21 +-
 .../camp/brooklyn/BrooklynCampConstants.java    |    5 +-
 .../camp/brooklyn/BrooklynCampPlatform.java     |    6 +-
 .../BrooklynCampPlatformLauncherAbstract.java   |    4 +-
 .../camp/brooklyn/YamlLauncherAbstract.java     |   13 +-
 .../BrooklynAssemblyTemplateInstantiator.java   |   19 +-
 .../BrooklynComponentTemplateResolver.java      |   33 +-
 .../BrooklynEntityDecorationResolver.java       |   12 +-
 .../spi/creation/BrooklynEntityMatcher.java     |    6 +-
 .../creation/BrooklynYamlLocationResolver.java  |    2 +-
 .../creation/BrooklynYamlTypeInstantiator.java  |    4 +-
 .../spi/creation/EntitySpecConfiguration.java   |    2 +-
 .../service/BrooklynServiceTypeResolver.java    |    2 +-
 .../service/CatalogServiceTypeResolver.java     |   13 +-
 .../service/ChefServiceTypeResolver.java        |    7 +-
 .../service/JavaServiceTypeResolver.java        |    2 +-
 .../creation/service/ServiceTypeResolver.java   |    2 +-
 .../spi/dsl/BrooklynDslDeferredSupplier.java    |   13 +-
 .../camp/brooklyn/spi/dsl/DslUtils.java         |    2 +-
 .../spi/dsl/methods/BrooklynDslCommon.java      |   25 +-
 .../brooklyn/spi/dsl/methods/DslComponent.java  |   27 +-
 .../lookup/AbstractBrooklynResourceLookup.java  |    2 +-
 .../lookup/AbstractTemplateBrooklynLookup.java  |    4 +-
 .../spi/lookup/AssemblyBrooklynLookup.java      |    2 +-
 .../lookup/AssemblyTemplateBrooklynLookup.java  |    4 +-
 .../brooklyn/spi/lookup/BrooklynUrlLookup.java  |    5 +-
 .../lookup/PlatformComponentBrooklynLookup.java |    2 +-
 ...PlatformComponentTemplateBrooklynLookup.java |    4 +-
 .../platform/BrooklynImmutableCampPlatform.java |    2 +-
 .../camp/brooklyn/AbstractYamlRebindTest.java   |   21 +-
 .../camp/brooklyn/AbstractYamlTest.java         |   17 +-
 .../brooklyn/camp/brooklyn/AppYamlTest.java     |   19 +-
 .../camp/brooklyn/ApplicationsYamlTest.java     |    7 +-
 .../BrooklynYamlTypeInstantiatorTest.java       |    4 +-
 .../camp/brooklyn/ByonLocationsYamlTest.java    |   17 +-
 .../camp/brooklyn/DslAndRebindYamlTest.java     |   23 +-
 .../brooklyn/EmptySoftwareProcessYamlTest.java  |    8 +-
 .../EnrichersSlightlySimplerYamlTest.java       |   11 +-
 .../camp/brooklyn/EnrichersYamlTest.java        |   17 +-
 .../brooklyn/EntitiesYamlIntegrationTest.java   |    5 +-
 .../camp/brooklyn/EntitiesYamlTest.java         |   83 +-
 ...aWebAppWithDslYamlRebindIntegrationTest.java |   15 +-
 .../brooklyn/JavaWebAppsIntegrationTest.java    |   16 +-
 .../camp/brooklyn/JavaWebAppsMatchingTest.java  |   11 +-
 .../camp/brooklyn/LocationsYamlTest.java        |   34 +-
 .../camp/brooklyn/MapReferenceYamlTest.java     |    9 +-
 .../brooklyn/camp/brooklyn/ObjectsYamlTest.java |   21 +-
 .../camp/brooklyn/PoliciesYamlTest.java         |   13 +-
 .../camp/brooklyn/ReferencedYamlTest.java       |    7 +-
 .../brooklyn/ReferencingYamlTestEntity.java     |    5 +-
 .../brooklyn/ReferencingYamlTestEntityImpl.java |    2 +-
 .../brooklyn/ReloadBrooklynPropertiesTest.java  |    9 +-
 .../camp/brooklyn/TestEntityWithInitConfig.java |   11 +-
 .../brooklyn/TestEntityWithInitConfigImpl.java  |    3 +-
 .../camp/brooklyn/TestReferencingEnricher.java  |    5 +-
 .../camp/brooklyn/TestReferencingPolicy.java    |    5 +-
 .../TestSensorAndEffectorInitializer.java       |   19 +-
 .../brooklyn/VanillaBashNetcatYamlTest.java     |   19 +-
 .../brooklyn/camp/brooklyn/WrapAppTest.java     |   15 +-
 .../catalog/AbstractCatalogXmlTest.java         |   12 +-
 .../CatalogOsgiVersionMoreEntityTest.java       |    8 +-
 .../brooklyn/catalog/CatalogYamlCombiTest.java  |   10 +-
 .../brooklyn/catalog/CatalogYamlEntityTest.java |   14 +-
 .../catalog/CatalogYamlLocationTest.java        |    8 +-
 .../brooklyn/catalog/CatalogYamlPolicyTest.java |    6 +-
 .../brooklyn/catalog/CatalogYamlRebindTest.java |   13 +-
 .../catalog/CatalogYamlTemplateTest.java        |    4 +-
 .../catalog/CatalogYamlVersioningTest.java      |    7 +-
 .../camp/brooklyn/catalog/TestBasicApp.java     |    5 +-
 .../camp/brooklyn/catalog/TestBasicAppImpl.java |    2 +-
 .../test/resources/same-server-entity-test.yaml |    6 +-
 .../test/resources/test-app-with-enricher.yaml  |    4 +-
 ...est-app-with-enrichers-slightly-simpler.yaml |   20 +-
 .../test-cluster-with-member-spec.yaml          |    6 +-
 .../resources/test-entity-basic-template.yaml   |    2 +-
 .../test-entity-reference-map-template.yaml     |    2 +-
 .../resources/test-entity-with-enricher.yaml    |    2 +-
 .../resources/test-entity-with-init-config.yaml |    2 +-
 .../test/resources/test-entity-with-policy.yaml |    2 +-
 .../resources/test-propagating-enricher.yaml    |    4 +-
 .../test-webapp-with-averaging-enricher.yaml    |    4 +-
 .../org/apache/brooklyn/cli/AbstractMain.java   |    4 +-
 .../org/apache/brooklyn/cli/CloudExplorer.java  |    4 +-
 .../org/apache/brooklyn/cli/ItemLister.java     |   10 +-
 .../main/java/org/apache/brooklyn/cli/Main.java |   37 +-
 .../apache/brooklyn/cli/lister/ClassFinder.java |   19 +-
 .../brooklyn/cli/lister/ItemDescriptors.java    |   16 +-
 .../main/resources/brooklyn/default.catalog.bom |   31 +-
 .../java/org/apache/brooklyn/cli/CliTest.java   |   24 +-
 .../src/test/resources/ExampleAppInFile.groovy  |    3 +-
 .../brooklyn/cli/BaseCliIntegrationTest.java    |    2 +-
 .../main/webapp/assets/js/view/script-groovy.js |    2 +-
 .../BrooklynJavascriptGuiLauncherTest.java      |    8 +-
 .../specs/model/catalog-application-spec.js     |    8 +-
 .../specs/model/sensor-summary-spec.js          |    2 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |   69 +-
 .../launcher/BrooklynServerDetails.java         |    2 +-
 .../brooklyn/launcher/BrooklynWebServer.java    |   29 +-
 .../camp/BrooklynCampPlatformLauncher.java      |    7 +-
 .../config/BrooklynDevelopmentModes.java        |    3 +-
 .../launcher/config/BrooklynGlobalConfig.java   |    7 +-
 .../launcher/config/CustomResourceLocator.java  |    5 +-
 .../entity/basic/VanillaSoftwareYamlTest.java   |    8 +-
 .../BrooklynEntityMirrorIntegrationTest.java    |   20 +-
 .../brooklynnode/BrooklynNodeRestTest.java      |   33 +-
 .../database/mssql/MssqlBlueprintLiveTest.java  |    4 +-
 .../BrooklynLauncherHighAvailabilityTest.java   |   21 +-
 .../BrooklynLauncherRebindCatalogTest.java      |    7 +-
 .../BrooklynLauncherRebindTestFixture.java      |   25 +-
 .../BrooklynLauncherRebindTestToFiles.java      |   19 +-
 ...lynLauncherRebindToCloudObjectStoreTest.java |   23 +-
 .../brooklyn/launcher/BrooklynLauncherTest.java |   30 +-
 .../launcher/BrooklynWebServerTest.java         |   14 +-
 .../launcher/SimpleYamlLauncherForTests.java    |    4 +-
 .../brooklyn/launcher/WebAppRunnerTest.java     |    9 +-
 .../blueprints/AbstractBlueprintTest.java       |   22 +-
 .../resources/rebind-test-catalog-additions.bom |    4 +-
 .../src/test/resources/rebind-test-catalog.bom  |    4 +-
 .../qa/load/SimulatedJBoss7ServerImpl.java      |   17 +-
 .../qa/load/SimulatedMySqlNodeImpl.java         |   15 +-
 .../qa/load/SimulatedNginxControllerImpl.java   |   17 +-
 .../brooklyn/qa/load/SimulatedTheeTierApp.java  |   29 +-
 .../brooklyn/qa/longevity/MonitorUtils.java     |    4 +-
 .../SoftlayerObtainPrivateLiveTest.java         |   27 +-
 .../org/apache/brooklyn/qa/load/LoadTest.java   |   17 +-
 .../webcluster/SinusoidalLoadGenerator.java     |    9 +-
 .../qa/longevity/webcluster/WebClusterApp.java  |   19 +-
 .../org/apache/brooklyn/rest/api/ServerApi.java |    4 +-
 .../rest/domain/SummaryComparators.java         |    2 +-
 .../fixtures/catalog-application-list.json      |    6 +-
 .../resources/fixtures/catalog-application.json |    2 +-
 .../resources/fixtures/sensor-summary-list.json |    2 +-
 .../ApplicationResourceIntegrationTest.java     |   12 +-
 .../rest/client/BrooklynApiRestClientTest.java  |   14 +-
 .../apache/brooklyn/rest/BrooklynWebConfig.java |    3 +-
 .../BrooklynPropertiesSecurityFilter.java       |    8 +-
 .../rest/filter/HaHotCheckResourceFilter.java   |    4 +-
 .../rest/filter/HaMasterCheckFilter.java        |    6 +-
 .../brooklyn/rest/filter/LoggingFilter.java     |    2 +-
 .../resources/AbstractBrooklynRestResource.java |   12 +-
 .../brooklyn/rest/resources/AccessResource.java |    4 +-
 .../rest/resources/ActivityResource.java        |    9 +-
 .../rest/resources/ApplicationResource.java     |   35 +-
 .../rest/resources/CatalogResource.java         |    8 +-
 .../rest/resources/EffectorResource.java        |   12 +-
 .../rest/resources/EntityConfigResource.java    |   16 +-
 .../brooklyn/rest/resources/EntityResource.java |   22 +-
 .../rest/resources/LocationResource.java        |    2 +-
 .../rest/resources/PolicyConfigResource.java    |    8 +-
 .../brooklyn/rest/resources/PolicyResource.java |    4 +-
 .../brooklyn/rest/resources/SensorResource.java |   16 +-
 .../brooklyn/rest/resources/ServerResource.java |   47 +-
 .../brooklyn/rest/resources/UsageResource.java  |   12 +-
 .../rest/resources/VersionResource.java         |    2 +-
 ...nUserWithRandomPasswordSecurityProvider.java |    2 +-
 .../provider/DelegatingSecurityProvider.java    |    2 +-
 .../provider/ExplicitUsersSecurityProvider.java |    4 +-
 .../security/provider/LdapSecurityProvider.java |    2 +-
 .../rest/transform/AccessTransformer.java       |    2 +-
 .../rest/transform/ApplicationTransformer.java  |    7 +-
 .../transform/BrooklynFeatureTransformer.java   |    2 +-
 .../rest/transform/CatalogTransformer.java      |   12 +-
 .../rest/transform/EffectorTransformer.java     |   10 +-
 .../rest/transform/EntityTransformer.java       |    2 +-
 .../transform/HighAvailabilityTransformer.java  |    4 +-
 .../rest/transform/LocationTransformer.java     |   14 +-
 .../rest/transform/PolicyTransformer.java       |    4 +-
 .../rest/transform/SensorTransformer.java       |    4 +-
 .../rest/transform/TaskTransformer.java         |   12 +-
 .../rest/util/BrooklynRestResourceUtils.java    |   58 +-
 .../rest/util/DefaultExceptionMapper.java       |    4 +-
 .../brooklyn/rest/util/EntityLocationUtils.java |    4 +-
 .../rest/util/ManagementContextProvider.java    |    2 +-
 .../rest/util/json/BidiSerialization.java       |    4 +-
 .../util/json/BrooklynJacksonJsonProvider.java  |   11 +-
 .../src/main/resources/reset-catalog.xml        |    6 +-
 .../BrooklynPropertiesSecurityFilterTest.java   |    4 +-
 .../brooklyn/rest/BrooklynRestApiLauncher.java  |   12 +-
 .../BrooklynRestApiLauncherTestFixture.java     |   14 +-
 .../apache/brooklyn/rest/HaHotCheckTest.java    |   10 +-
 .../brooklyn/rest/HaMasterCheckFilterTest.java  |   22 +-
 .../brooklyn/rest/domain/ApplicationTest.java   |    7 +-
 .../brooklyn/rest/domain/SensorSummaryTest.java |   18 +-
 .../ApplicationResourceIntegrationTest.java     |    4 +-
 .../rest/resources/ApplicationResourceTest.java |   23 +-
 .../rest/resources/CatalogResetTest.java        |   11 +-
 .../rest/resources/CatalogResourceTest.java     |   22 +-
 .../rest/resources/DescendantsTest.java         |    6 +-
 .../resources/EntityConfigResourceTest.java     |    6 +-
 .../rest/resources/EntityResourceTest.java      |    9 +-
 .../rest/resources/LocationResourceTest.java    |    2 +-
 .../rest/resources/ScriptResourceTest.java      |    6 +-
 .../SensorResourceIntegrationTest.java          |   17 +-
 .../rest/resources/SensorResourceTest.java      |    9 +-
 .../ServerResourceIntegrationTest.java          |   14 +-
 .../rest/resources/ServerResourceTest.java      |   17 +-
 .../rest/resources/ServerShutdownTest.java      |   19 +-
 .../rest/resources/UsageResourceTest.java       |   20 +-
 .../brooklynnode/DeployBlueprintTest.java       |   15 +-
 .../rest/testing/BrooklynRestApiTest.java       |   13 +-
 .../rest/testing/BrooklynRestResourceTest.java  |    4 +-
 .../rest/testing/mocks/CapitalizePolicy.java    |    4 +-
 .../rest/testing/mocks/EverythingGroup.java     |    2 +-
 .../rest/testing/mocks/EverythingGroupImpl.java |    2 +-
 .../rest/testing/mocks/NameMatcherGroup.java    |    5 +-
 .../testing/mocks/NameMatcherGroupImpl.java     |    5 +-
 .../rest/testing/mocks/RestMockApp.java         |    2 +-
 .../rest/testing/mocks/RestMockAppBuilder.java  |    7 +-
 .../testing/mocks/RestMockSimpleEntity.java     |   24 +-
 .../testing/mocks/RestMockSimplePolicy.java     |    7 +-
 .../util/BrooklynRestResourceUtilsTest.java     |   20 +-
 .../rest/util/EntityLocationUtilsTest.java      |   14 +-
 .../json/BrooklynJacksonSerializerTest.java     |   18 +-
 .../apache/brooklyn/test/EntityTestUtils.java   |   10 +-
 .../org/apache/brooklyn/test/TestUtils.groovy   |   47 +-
 .../util/jmx/jmxmp/JmxmpAgentSslTest.java       |    4 +-
 .../brooklyn/util/jmx/jmxmp/JmxmpClient.java    |    2 +-
 .../test/osgi/entities/SimpleApplication.java   |    5 +-
 .../osgi/entities/SimpleApplicationImpl.java    |    4 +-
 .../test/osgi/entities/SimpleEntity.java        |    2 +-
 .../test/osgi/entities/SimpleEntityImpl.java    |    2 +-
 .../test/osgi/entities/SimpleLocation.java      |    7 +-
 .../test/osgi/entities/SimplePolicy.java        |    7 +-
 .../test/osgi/entities/more/MoreEntity.java     |    8 +-
 .../test/osgi/entities/more/MoreEntityImpl.java |    8 +-
 .../test/osgi/entities/more/MoreLocation.java   |    3 +-
 .../test/osgi/entities/more/MorePolicy.java     |    4 +-
 .../test/osgi/entities/more/MoreTemplate.java   |    9 +-
 .../test/osgi/entities/more/MoreEntity.java     |    6 +-
 .../test/osgi/entities/more/MoreEntityImpl.java |    7 +-
 .../test/osgi/entities/more/MoreEntity.java     |    6 +-
 .../test/osgi/entities/more/MoreEntityImpl.java |    7 +-
 .../test/osgi/entities/more/MoreLocation.java   |    2 +-
 .../test/osgi/entities/more/MorePolicy.java     |    2 +-
 .../test/osgi/entities/more/MoreTemplate.java   |    7 +-
 2848 files changed, 170373 insertions(+), 171430 deletions(-)
----------------------------------------------------------------------



Mime
View raw message