You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/07/11 06:14:14 UTC

[07/10] git commit: Merge remote-tracking branch 'upstream/master' into feature/jsgui-catalog

Merge remote-tracking branch 'upstream/master' into feature/jsgui-catalog

Conflicts:
	usage/jsgui/src/main/webapp/assets/js/view/catalog-details-location.js
	usage/jsgui/src/main/webapp/assets/tpl/catalog/details-location.html
	usage/jsgui/src/main/webapp/assets/tpl/catalog/nav-entry.html


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

Branch: refs/heads/master
Commit: 1a8427dc5745c87bb88990231676948ff5c689d8
Parents: 6dc52f5 2ebc307
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Jul 9 16:16:09 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Jul 9 16:16:09 2014 +0100

----------------------------------------------------------------------
 README.md                                       |  30 +++--
 api/pom.xml                                     |  19 +++
 .../java/brooklyn/catalog/BrooklynCatalog.java  |  18 +++
 api/src/main/java/brooklyn/catalog/Catalog.java |  18 +++
 .../java/brooklyn/catalog/CatalogConfig.java    |  18 +++
 .../main/java/brooklyn/catalog/CatalogItem.java |  18 +++
 .../main/java/brooklyn/entity/Application.java  |  18 +++
 api/src/main/java/brooklyn/entity/Effector.java |  18 +++
 api/src/main/java/brooklyn/entity/Entity.java   |  18 +++
 .../main/java/brooklyn/entity/EntityType.java   |  18 +++
 api/src/main/java/brooklyn/entity/Group.java    |  18 +++
 .../java/brooklyn/entity/ParameterType.java     |  18 +++
 .../java/brooklyn/entity/basic/EntityLocal.java |  18 +++
 .../entity/drivers/DriverDependentEntity.java   |  18 +++
 .../brooklyn/entity/drivers/EntityDriver.java   |  18 +++
 .../entity/drivers/EntityDriverManager.java     |  18 +++
 .../drivers/downloads/DownloadResolver.java     |  18 +++
 .../downloads/DownloadResolverManager.java      |  18 +++
 .../entity/proxying/EntityInitializer.java      |  18 +++
 .../brooklyn/entity/proxying/EntitySpec.java    |  18 +++
 .../entity/proxying/EntityTypeRegistry.java     |  18 +++
 .../brooklyn/entity/proxying/ImplementedBy.java |  18 +++
 .../brooklyn/entity/rebind/ChangeListener.java  |  18 +++
 .../rebind/PersistenceExceptionHandler.java     |  18 +++
 .../brooklyn/entity/rebind/RebindContext.java   |  18 +++
 .../entity/rebind/RebindExceptionHandler.java   |  18 +++
 .../brooklyn/entity/rebind/RebindManager.java   |  18 +++
 .../brooklyn/entity/rebind/RebindSupport.java   |  18 +++
 .../java/brooklyn/entity/rebind/Rebindable.java |  18 +++
 .../brooklyn/entity/trait/Configurable.java     |  18 +++
 .../brooklyn/entity/trait/HasShortName.java     |  18 +++
 .../brooklyn/entity/trait/Identifiable.java     |  18 +++
 .../java/brooklyn/event/AttributeSensor.java    |  18 +++
 api/src/main/java/brooklyn/event/Sensor.java    |  18 +++
 .../main/java/brooklyn/event/SensorEvent.java   |  18 +++
 .../brooklyn/event/SensorEventListener.java     |  18 +++
 .../brooklyn/location/AddressableLocation.java  |  18 +++
 .../java/brooklyn/location/HardwareDetails.java |  18 +++
 .../main/java/brooklyn/location/Location.java   |  18 +++
 .../brooklyn/location/LocationDefinition.java   |  18 +++
 .../brooklyn/location/LocationRegistry.java     |  18 +++
 .../brooklyn/location/LocationResolver.java     |  18 +++
 .../java/brooklyn/location/LocationSpec.java    |  18 +++
 .../java/brooklyn/location/MachineDetails.java  |  18 +++
 .../java/brooklyn/location/MachineLocation.java |  18 +++
 .../location/MachineManagementMixins.java       |  18 +++
 .../location/MachineProvisioningLocation.java   |  18 +++
 .../location/NoMachinesAvailableException.java  |  18 +++
 .../main/java/brooklyn/location/OsDetails.java  |  18 +++
 .../main/java/brooklyn/location/PortRange.java  |  18 +++
 .../java/brooklyn/location/PortSupplier.java    |  18 +++
 .../brooklyn/management/AccessController.java   |  18 +++
 .../java/brooklyn/management/EntityManager.java |  18 +++
 .../brooklyn/management/ExecutionContext.java   |  18 +++
 .../brooklyn/management/ExecutionManager.java   |  18 +++
 .../brooklyn/management/HasTaskChildren.java    |  18 +++
 .../brooklyn/management/LocationManager.java    |  18 +++
 .../brooklyn/management/ManagementContext.java  |  18 +++
 .../management/SubscriptionContext.java         |  18 +++
 .../brooklyn/management/SubscriptionHandle.java |  18 +++
 .../management/SubscriptionManager.java         |  18 +++
 api/src/main/java/brooklyn/management/Task.java |  18 +++
 .../java/brooklyn/management/TaskAdaptable.java |  18 +++
 .../java/brooklyn/management/TaskFactory.java   |  18 +++
 .../management/TaskQueueingContext.java         |  18 +++
 .../java/brooklyn/management/TaskWrapper.java   |  18 +++
 .../entitlement/EntitlementClass.java           |  18 +++
 .../entitlement/EntitlementContext.java         |  18 +++
 .../entitlement/EntitlementManager.java         |  18 +++
 .../management/ha/HighAvailabilityManager.java  |  18 +++
 .../management/ha/HighAvailabilityMode.java     |  18 +++
 .../management/ha/ManagementNodeState.java      |  18 +++
 .../management/ha/ManagementNodeSyncRecord.java |  18 +++
 .../ha/ManagementPlaneSyncRecord.java           |  18 +++
 .../ha/ManagementPlaneSyncRecordPersister.java  |  18 +++
 .../java/brooklyn/mementos/BrooklynMemento.java |  18 +++
 .../mementos/BrooklynMementoManifest.java       |  18 +++
 .../mementos/BrooklynMementoPersister.java      |  18 +++
 .../java/brooklyn/mementos/EnricherMemento.java |  18 +++
 .../java/brooklyn/mementos/EntityMemento.java   |  18 +++
 .../java/brooklyn/mementos/LocationMemento.java |  18 +++
 .../main/java/brooklyn/mementos/Memento.java    |  18 +++
 .../java/brooklyn/mementos/PolicyMemento.java   |  18 +++
 .../main/java/brooklyn/mementos/TreeNode.java   |  18 +++
 api/src/main/java/brooklyn/policy/Enricher.java |  18 +++
 .../main/java/brooklyn/policy/EnricherSpec.java |  18 +++
 .../main/java/brooklyn/policy/EnricherType.java |  18 +++
 .../java/brooklyn/policy/EntityAdjunct.java     |  18 +++
 api/src/main/java/brooklyn/policy/Policy.java   |  18 +++
 .../main/java/brooklyn/policy/PolicySpec.java   |  18 +++
 .../main/java/brooklyn/policy/PolicyType.java   |  18 +++
 camp/camp-base/pom.xml                          |   6 +-
 .../brooklyn/camp/AggregatingCampPlatform.java  |  18 +++
 .../io/brooklyn/camp/BasicCampPlatform.java     |  18 +++
 .../java/io/brooklyn/camp/CampPlatform.java     |  18 +++
 .../camp/commontypes/RepresentationSkew.java    |  18 +++
 .../io/brooklyn/camp/spi/AbstractResource.java  |  18 +++
 .../brooklyn/camp/spi/ApplicationComponent.java |  18 +++
 .../camp/spi/ApplicationComponentTemplate.java  |  18 +++
 .../java/io/brooklyn/camp/spi/Assembly.java     |  18 +++
 .../io/brooklyn/camp/spi/AssemblyTemplate.java  |  18 +++
 .../main/java/io/brooklyn/camp/spi/Link.java    |  18 +++
 .../io/brooklyn/camp/spi/PlatformComponent.java |  18 +++
 .../camp/spi/PlatformComponentTemplate.java     |  18 +++
 .../brooklyn/camp/spi/PlatformRootSummary.java  |  18 +++
 .../brooklyn/camp/spi/PlatformTransaction.java  |  18 +++
 .../spi/collection/AbstractResourceLookup.java  |  18 +++
 .../collection/AggregatingResourceLookup.java   |  18 +++
 .../spi/collection/BasicResourceLookup.java     |  18 +++
 .../camp/spi/collection/ResolvableLink.java     |  18 +++
 .../camp/spi/collection/ResourceLookup.java     |  18 +++
 .../AssemblyTemplateInstantiator.java           |  18 +++
 .../BasicAssemblyTemplateInstantiator.java      |  18 +++
 .../java/io/brooklyn/camp/spi/pdp/Artifact.java |  18 +++
 .../brooklyn/camp/spi/pdp/ArtifactContent.java  |  18 +++
 .../camp/spi/pdp/ArtifactRequirement.java       |  18 +++
 .../spi/pdp/AssemblyTemplateConstructor.java    |  18 +++
 .../brooklyn/camp/spi/pdp/DeploymentPlan.java   |  18 +++
 .../java/io/brooklyn/camp/spi/pdp/Service.java  |  18 +++
 .../camp/spi/pdp/ServiceCharacteristic.java     |  18 +++
 .../brooklyn/camp/spi/resolve/PdpMatcher.java   |  18 +++
 .../brooklyn/camp/spi/resolve/PdpProcessor.java |  18 +++
 .../camp/spi/resolve/PlanInterpreter.java       |  18 +++
 .../interpret/PlanInterpretationContext.java    |  18 +++
 .../interpret/PlanInterpretationNode.java       |  18 +++
 .../main/java/io/brooklyn/util/yaml/Yamls.java  |  18 +++
 .../pdp/DeploymentPlanToyInterpreterTest.java   |  18 +++
 .../io/brooklyn/camp/spi/pdp/PdpYamlTest.java   |  18 +++
 .../web/MockAssemblyTemplateInstantiator.java   |  18 +++
 .../camp/test/mock/web/MockWebPlatform.java     |  18 +++
 .../test/platform/BasicCampPlatformTest.java    |  18 +++
 camp/camp-server/pom.xml                        |  18 ++-
 .../io/brooklyn/camp/CampRestResources.java     |  18 +++
 .../main/java/io/brooklyn/camp/CampServer.java  |  18 +++
 .../java/io/brooklyn/camp/dto/ApiErrorDto.java  |  18 +++
 .../camp/dto/ApplicationComponentDto.java       |  18 +++
 .../dto/ApplicationComponentTemplateDto.java    |  18 +++
 .../java/io/brooklyn/camp/dto/AssemblyDto.java  |  18 +++
 .../brooklyn/camp/dto/AssemblyTemplateDto.java  |  18 +++
 .../main/java/io/brooklyn/camp/dto/DtoBase.java |  18 +++
 .../brooklyn/camp/dto/DtoCustomAttributes.java  |  18 +++
 .../main/java/io/brooklyn/camp/dto/LinkDto.java |  18 +++
 .../brooklyn/camp/dto/PlatformComponentDto.java |  18 +++
 .../camp/dto/PlatformComponentTemplateDto.java  |  18 +++
 .../java/io/brooklyn/camp/dto/PlatformDto.java  |  18 +++
 .../java/io/brooklyn/camp/dto/ResourceDto.java  |  18 +++
 .../rest/resource/AbstractCampRestResource.java |  18 +++
 .../camp/rest/resource/ApidocRestResource.java  |  18 +++
 .../ApplicationComponentRestResource.java       |  18 +++
 ...pplicationComponentTemplateRestResource.java |  18 +++
 .../rest/resource/AssemblyRestResource.java     |  18 +++
 .../resource/AssemblyTemplateRestResource.java  |  18 +++
 .../resource/PlatformComponentRestResource.java |  18 +++
 .../PlatformComponentTemplateRestResource.java  |  18 +++
 .../rest/resource/PlatformRestResource.java     |  18 +++
 .../io/brooklyn/camp/rest/util/CampJsons.java   |  18 +++
 .../camp/rest/util/CampRestContext.java         |  18 +++
 .../brooklyn/camp/rest/util/CampRestGuavas.java |  18 +++
 .../io/brooklyn/camp/rest/util/DtoFactory.java  |  18 +++
 .../camp/rest/util/WebResourceUtils.java        |  18 +++
 .../ApplicationCompomentTemplateDtoTest.java    |  20 ++-
 .../java/io/brooklyn/camp/dto/BasicDtoTest.java |  18 +++
 .../java/io/brooklyn/camp/dto/LinkDtoTest.java  |  18 +++
 .../dto/PlatformCompomentTemplateDtoTest.java   |  20 ++-
 .../io/brooklyn/camp/dto/ResourceDtoTest.java   |  18 +++
 .../rest/resource/PlatformRestResourceTest.java |  18 +++
 .../test/fixture/AbstractRestResourceTest.java  |  20 ++-
 .../camp/test/fixture/InMemoryCamp.java         |  18 +++
 core/pom.xml                                    |  21 ++-
 .../GeoIPJava-1.2.8/ASNumLookupTest.java        |  18 +++
 .../GeoIPJava-1.2.8/ASNumLookupTestV6.java      |  18 +++
 .../maxmind/GeoIPJava-1.2.8/BenchmarkGeoIP.java |  18 +++
 .../maxmind/GeoIPJava-1.2.8/CityLookupTest.java |  18 +++
 .../GeoIPJava-1.2.8/CityLookupTestV6.java       |  18 +++
 .../GeoIPJava-1.2.8/CountryLookupTest.java      |  18 +++
 .../GeoIPJava-1.2.8/CountryLookupTestV6.java    |  18 +++
 .../GeoIPJava-1.2.8/DistributedServiceTest.java |  18 +++
 .../GeoIPJava-1.2.8/NetSpeedCellLookupTest.java |  18 +++
 .../GeoIPJava-1.2.8/NetspeedLookupTest.java     |  18 +++
 .../maxmind/GeoIPJava-1.2.8/OrgLookupTest.java  |  18 +++
 .../GeoIPJava-1.2.8/RegionLookupTest.java       |  18 +++
 .../src/main/java/brooklyn/BrooklynVersion.java |  18 +++
 .../api/AssemblyTemplateSpecInstantiator.java   |  18 +++
 .../api/HasBrooklynManagementContext.java       |  18 +++
 .../brooklyn/catalog/CatalogPredicates.java     |  18 +++
 .../catalog/internal/BasicBrooklynCatalog.java  |  18 +++
 .../catalog/internal/CatalogClasspathDo.java    |  18 +++
 .../catalog/internal/CatalogClasspathDto.java   |  18 +++
 .../internal/CatalogConfigurationDto.java       |  18 +++
 .../brooklyn/catalog/internal/CatalogDo.java    |  18 +++
 .../brooklyn/catalog/internal/CatalogDto.java   |  18 +++
 .../catalog/internal/CatalogDtoUtils.java       |  70 ++++++++++
 .../catalog/internal/CatalogEntityItemDto.java  |  18 +++
 .../catalog/internal/CatalogItemDo.java         |  18 +++
 .../internal/CatalogItemDtoAbstract.java        |  18 +++
 .../brooklyn/catalog/internal/CatalogItems.java |  18 +++
 .../catalog/internal/CatalogLibrariesDo.java    |  18 +++
 .../catalog/internal/CatalogLibrariesDto.java   |  18 +++
 .../catalog/internal/CatalogPolicyItemDto.java  |  18 +++
 .../internal/CatalogTemplateItemDto.java        |  18 +++
 .../catalog/internal/CatalogXmlSerializer.java  |  18 +++
 .../java/brooklyn/config/BrooklynLogging.java   |  18 +++
 .../brooklyn/config/BrooklynProperties.java     |  18 +++
 .../brooklyn/config/BrooklynServerConfig.java   |  18 +++
 .../config/BrooklynServiceAttributes.java       |  18 +++
 .../java/brooklyn/config/ConfigPredicates.java  |  18 +++
 .../main/java/brooklyn/config/ConfigUtils.java  |  18 +++
 .../java/brooklyn/config/WrappedConfigKey.java  |  18 +++
 .../brooklyn/config/render/RendererHints.java   |  25 ++--
 .../enricher/CustomAggregatingEnricher.java     |  18 +++
 .../main/java/brooklyn/enricher/Enrichers.java  |  18 +++
 .../basic/AbstractAggregatingEnricher.java      |  18 +++
 .../enricher/basic/AbstractEnricher.java        |  18 +++
 .../basic/AbstractTransformingEnricher.java     |  18 +++
 .../basic/AbstractTypeTransformingEnricher.java |  18 +++
 .../brooklyn/enricher/basic/AddingEnricher.java |  18 +++
 .../brooklyn/enricher/basic/Aggregator.java     |  18 +++
 .../java/brooklyn/enricher/basic/Combiner.java  |  18 +++
 .../brooklyn/enricher/basic/Propagator.java     |  18 +++
 .../basic/SensorPropagatingEnricher.java        |  18 +++
 .../basic/SensorTransformingEnricher.java       |  18 +++
 .../brooklyn/enricher/basic/Transformer.java    |  18 +++
 .../brooklyn/entity/annotation/Effector.java    |  18 +++
 .../entity/annotation/EffectorParam.java        |  18 +++
 .../entity/basic/AbstractApplication.java       |  18 +++
 .../AbstractConfigurableEntityFactory.java      |  18 +++
 .../brooklyn/entity/basic/AbstractEffector.java |  18 +++
 .../brooklyn/entity/basic/AbstractEntity.java   |  18 +++
 .../brooklyn/entity/basic/AbstractGroup.java    |  18 +++
 .../entity/basic/AbstractGroupImpl.java         |  18 +++
 .../entity/basic/ApplicationBuilder.java        |  18 +++
 .../java/brooklyn/entity/basic/Attributes.java  |  18 +++
 .../brooklyn/entity/basic/BasicApplication.java |  18 +++
 .../entity/basic/BasicApplicationImpl.java      |  18 +++
 .../basic/BasicConfigurableEntityFactory.java   |  18 +++
 .../java/brooklyn/entity/basic/BasicEntity.java |  18 +++
 .../brooklyn/entity/basic/BasicEntityImpl.java  |  18 +++
 .../java/brooklyn/entity/basic/BasicGroup.java  |  18 +++
 .../brooklyn/entity/basic/BasicGroupImpl.java   |  18 +++
 .../entity/basic/BasicParameterType.java        |  18 +++
 .../brooklyn/entity/basic/BasicStartable.java   |  18 +++
 .../entity/basic/BasicStartableImpl.java        |  18 +++
 .../entity/basic/BrooklynConfigKeys.java        |  27 +++-
 .../entity/basic/BrooklynShutdownHooks.java     |  18 +++
 .../brooklyn/entity/basic/BrooklynTaskTags.java |  18 +++
 .../brooklyn/entity/basic/BrooklynTasks.java    |  18 +++
 .../entity/basic/ClosureEntityFactory.java      |  18 +++
 .../java/brooklyn/entity/basic/ConfigKeys.java  |  18 +++
 .../basic/ConfigMapViewWithStringKeys.java      |  18 +++
 .../entity/basic/ConfigurableEntityFactory.java |  18 +++
 ...figurableEntityFactoryFromEntityFactory.java |  18 +++
 .../java/brooklyn/entity/basic/DataEntity.java  |  25 ++--
 .../brooklyn/entity/basic/DataEntityImpl.java   |  25 ++--
 .../brooklyn/entity/basic/DelegateEntity.java   |  18 +++
 .../entity/basic/DelegateEntityImpl.java        |  18 +++
 .../brooklyn/entity/basic/DynamicGroup.java     |  25 ++--
 .../brooklyn/entity/basic/DynamicGroupImpl.java |  25 ++--
 .../entity/basic/EffectorStartableImpl.java     |  18 +++
 .../java/brooklyn/entity/basic/Entities.java    |  18 +++
 .../entity/basic/EntityAndAttribute.java        |  18 +++
 .../brooklyn/entity/basic/EntityConfigMap.java  |  18 +++
 .../entity/basic/EntityDynamicType.java         |  18 +++
 .../brooklyn/entity/basic/EntityFactory.java    |  18 +++
 .../entity/basic/EntityFactoryForLocation.java  |  18 +++
 .../brooklyn/entity/basic/EntityFunctions.java  |  18 +++
 .../brooklyn/entity/basic/EntityInternal.java   |  18 +++
 .../brooklyn/entity/basic/EntityPredicates.java |  18 +++
 .../entity/basic/EntityTypeSnapshot.java        |  18 +++
 .../java/brooklyn/entity/basic/EntityTypes.java |  18 +++
 .../brooklyn/entity/basic/ExplicitEffector.java |  18 +++
 .../java/brooklyn/entity/basic/Lifecycle.java   |  18 +++
 .../brooklyn/entity/basic/MethodEffector.java   |  18 +++
 .../brooklyn/entity/basic/PolicyDescriptor.java |  18 +++
 .../entity/basic/StartableApplication.java      |  18 +++
 .../drivers/BasicEntityDriverManager.java       |  18 +++
 .../drivers/ReflectiveEntityDriverFactory.java  |  18 +++
 .../drivers/RegistryEntityDriverFactory.java    |  18 +++
 .../downloads/BasicDownloadRequirement.java     |  18 +++
 .../downloads/BasicDownloadResolver.java        |  18 +++
 .../drivers/downloads/BasicDownloadTargets.java |  18 +++
 .../downloads/BasicDownloadsManager.java        |  18 +++
 .../DownloadProducerFromCloudsoftRepo.java      |  18 +++
 .../DownloadProducerFromLocalRepo.java          |  18 +++
 .../DownloadProducerFromProperties.java         |  18 +++
 .../DownloadProducerFromUrlAttribute.java       |  18 +++
 .../drivers/downloads/DownloadSubstituters.java |  18 +++
 .../drivers/downloads/FilenameProducers.java    |  18 +++
 .../brooklyn/entity/effector/AddEffector.java   |  18 +++
 .../brooklyn/entity/effector/AddSensor.java     |  18 +++
 .../entity/effector/EffectorAndBody.java        |  18 +++
 .../brooklyn/entity/effector/EffectorBase.java  |  18 +++
 .../brooklyn/entity/effector/EffectorBody.java  |  18 +++
 .../brooklyn/entity/effector/EffectorTasks.java |  18 +++
 .../entity/effector/EffectorWithBody.java       |  18 +++
 .../brooklyn/entity/effector/Effectors.java     |  18 +++
 .../group/AbstractMembershipTrackingPolicy.java |  18 +++
 .../java/brooklyn/entity/group/Cluster.java     |  18 +++
 .../brooklyn/entity/group/DynamicCluster.java   |  18 +++
 .../entity/group/DynamicClusterImpl.java        |  18 +++
 .../brooklyn/entity/group/DynamicFabric.java    |  18 +++
 .../entity/group/DynamicFabricImpl.java         |  18 +++
 .../entity/group/DynamicMultiGroup.java         |  25 ++--
 .../entity/group/DynamicMultiGroupImpl.java     |  25 ++--
 .../entity/group/DynamicRegionsFabric.java      |  18 +++
 .../entity/group/DynamicRegionsFabricImpl.java  |  18 +++
 .../main/java/brooklyn/entity/group/Fabric.java |  18 +++
 .../brooklyn/entity/group/QuarantineGroup.java  |  18 +++
 .../entity/group/QuarantineGroupImpl.java       |  18 +++
 .../group/StopFailedRuntimeException.java       |  18 +++
 .../main/java/brooklyn/entity/group/Tier.java   |  18 +++
 .../zoneaware/AbstractZoneFailureDetector.java  |  18 +++
 .../BalancingNodePlacementStrategy.java         |  18 +++
 .../zoneaware/CombiningZoneFailureDetector.java |  18 +++
 .../CriticalCauseZoneFailureDetector.java       |  18 +++
 .../ProportionalZoneFailureDetector.java        |  18 +++
 .../proxying/BasicEntityTypeRegistry.java       |  18 +++
 .../brooklyn/entity/proxying/EntityProxy.java   |  18 +++
 .../entity/proxying/EntityProxyImpl.java        |  18 +++
 .../entity/proxying/InternalEntityFactory.java  |  18 +++
 .../proxying/InternalLocationFactory.java       |  18 +++
 .../entity/proxying/InternalPolicyFactory.java  |  18 +++
 .../rebind/BasicEnricherRebindSupport.java      |  18 +++
 .../entity/rebind/BasicEntityRebindSupport.java |  18 +++
 .../rebind/BasicLocationRebindSupport.java      |  18 +++
 .../entity/rebind/BasicPolicyRebindSupport.java |  18 +++
 .../rebind/ImmediateDeltaChangeListener.java    |  18 +++
 .../rebind/PeriodicDeltaChangeListener.java     |  18 +++
 .../rebind/PersistenceExceptionHandlerImpl.java |  18 +++
 .../entity/rebind/PersisterDeltaImpl.java       |  18 +++
 .../entity/rebind/RebindContextImpl.java        |  18 +++
 .../rebind/RebindContextLookupContext.java      |  18 +++
 .../rebind/RebindExceptionHandlerImpl.java      |  18 +++
 .../entity/rebind/RebindManagerImpl.java        |  18 +++
 .../java/brooklyn/entity/rebind/TreeUtils.java  |  18 +++
 .../entity/rebind/dto/AbstractMemento.java      |  18 +++
 .../rebind/dto/AbstractTreeNodeMemento.java     |  18 +++
 .../entity/rebind/dto/BasicEnricherMemento.java |  18 +++
 .../entity/rebind/dto/BasicEntityMemento.java   |  18 +++
 .../entity/rebind/dto/BasicLocationMemento.java |  18 +++
 .../entity/rebind/dto/BasicPolicyMemento.java   |  18 +++
 .../entity/rebind/dto/BrooklynMementoImpl.java  |  18 +++
 .../rebind/dto/BrooklynMementoManifestImpl.java |  18 +++
 .../entity/rebind/dto/MementoValidators.java    |  18 +++
 .../entity/rebind/dto/MementosGenerators.java   |  18 +++
 .../rebind/dto/MutableBrooklynMemento.java      |  18 +++
 .../AbstractBrooklynMementoPersister.java       |  18 +++
 .../BrooklynMementoPersisterInMemory.java       |  18 +++
 .../BrooklynMementoPersisterToFile.java         |  18 +++
 .../BrooklynMementoPersisterToMultiFile.java    |  18 +++
 .../BrooklynMementoPersisterToObjectStore.java  |  18 +++
 .../rebind/persister/FileBasedObjectStore.java  |  18 +++
 .../persister/FileBasedStoreObjectAccessor.java |  18 +++
 .../rebind/persister/MementoFileWriter.java     |  18 +++
 .../rebind/persister/MementoFileWriterSync.java |  18 +++
 .../rebind/persister/MementoSerializer.java     |  18 +++
 .../entity/rebind/persister/PersistMode.java    |  18 +++
 .../persister/PersistenceObjectStore.java       |  18 +++
 .../persister/RetryingMementoSerializer.java    |  18 +++
 .../persister/StoreObjectAccessorLocking.java   |  18 +++
 .../rebind/persister/XmlMementoSerializer.java  |  18 +++
 .../dto/BasicManagementNodeSyncRecord.java      |  18 +++
 .../dto/ManagementPlaneSyncRecordImpl.java      |  18 +++
 .../java/brooklyn/entity/trait/Changeable.java  |  18 +++
 .../entity/trait/MemberReplaceable.java         |  18 +++
 .../java/brooklyn/entity/trait/Resizable.java   |  18 +++
 .../java/brooklyn/entity/trait/Startable.java   |  18 +++
 .../brooklyn/entity/trait/StartableMethods.java |  18 +++
 .../basic/AbstractCollectionConfigKey.java      |  18 +++
 .../basic/AbstractStructuredConfigKey.java      |  18 +++
 .../java/brooklyn/event/basic/AttributeMap.java |  18 +++
 .../basic/AttributeSensorAndConfigKey.java      |  18 +++
 .../event/basic/BasicAttributeSensor.java       |  18 +++
 .../basic/BasicAttributeSensorAndConfigKey.java |  18 +++
 .../brooklyn/event/basic/BasicConfigKey.java    |  18 +++
 .../event/basic/BasicNotificationSensor.java    |  18 +++
 .../java/brooklyn/event/basic/BasicSensor.java  |  18 +++
 .../brooklyn/event/basic/BasicSensorEvent.java  |  18 +++
 .../event/basic/DependentConfiguration.java     |  18 +++
 .../brooklyn/event/basic/ListConfigKey.java     |  18 +++
 .../java/brooklyn/event/basic/MapConfigKey.java |  18 +++
 .../basic/PortAttributeSensorAndConfigKey.java  |  18 +++
 .../main/java/brooklyn/event/basic/Sensors.java |  18 +++
 .../java/brooklyn/event/basic/SetConfigKey.java |  18 +++
 .../event/basic/StructuredConfigKey.java        |  18 +++
 .../event/basic/SubElementConfigKey.java        |  18 +++
 ...platedStringAttributeSensorAndConfigKey.java |  18 +++
 .../java/brooklyn/event/feed/AbstractFeed.java  |  18 +++
 .../event/feed/AttributePollHandler.java        |  18 +++
 .../brooklyn/event/feed/ConfigToAttributes.java |  18 +++
 .../event/feed/DelegatingPollHandler.java       |  18 +++
 .../java/brooklyn/event/feed/FeedConfig.java    |  18 +++
 .../java/brooklyn/event/feed/PollConfig.java    |  18 +++
 .../java/brooklyn/event/feed/PollHandler.java   |  18 +++
 .../main/java/brooklyn/event/feed/Poller.java   |  18 +++
 .../event/feed/function/FunctionFeed.java       |  18 +++
 .../event/feed/function/FunctionPollConfig.java |  18 +++
 .../java/brooklyn/event/feed/http/HttpFeed.java |  18 +++
 .../event/feed/http/HttpPollConfig.java         |  18 +++
 .../brooklyn/event/feed/http/HttpPollValue.java |  18 +++
 .../brooklyn/event/feed/http/HttpPolls.java     |  18 +++
 .../event/feed/http/HttpValueFunctions.java     |  18 +++
 .../brooklyn/event/feed/http/JsonFunctions.java |  18 +++
 .../brooklyn/event/feed/shell/ShellFeed.java    |  18 +++
 .../event/feed/shell/ShellPollConfig.java       |  18 +++
 .../java/brooklyn/event/feed/ssh/SshFeed.java   |  18 +++
 .../brooklyn/event/feed/ssh/SshPollConfig.java  |  18 +++
 .../brooklyn/event/feed/ssh/SshPollValue.java   |  18 +++
 .../event/feed/ssh/SshValueFunctions.java       |  18 +++
 .../windows/WindowsPerformanceCounterFeed.java  |  18 +++
 .../internal/BrooklynFeatureEnablement.java     |  26 ++++
 .../internal/storage/BrooklynStorage.java       |  18 +++
 .../brooklyn/internal/storage/DataGrid.java     |  18 +++
 .../internal/storage/DataGridFactory.java       |  18 +++
 .../brooklyn/internal/storage/Reference.java    |  18 +++
 .../internal/storage/impl/BackedReference.java  |  18 +++
 .../internal/storage/impl/BasicReference.java   |  18 +++
 .../storage/impl/BrooklynStorageImpl.java       |  18 +++
 .../impl/ConcurrentMapAcceptingNullVals.java    |  18 +++
 .../impl/inmemory/InMemoryDataGridFactory.java  |  18 +++
 .../storage/impl/inmemory/InmemoryDatagrid.java |  18 +++
 .../location/access/BrooklynAccessUtils.java    |  18 +++
 .../location/access/PortForwardManager.java     |  18 +++
 .../access/PortForwardManagerAuthority.java     |  18 +++
 .../access/PortForwardManagerClient.java        |  18 +++
 .../brooklyn/location/access/PortMapping.java   |  18 +++
 .../location/basic/AbstractLocation.java        |  18 +++
 .../AggregatingMachineProvisioningLocation.java |  18 +++
 .../location/basic/BasicHardwareDetails.java    |  18 +++
 .../location/basic/BasicLocationDefinition.java |  18 +++
 .../location/basic/BasicLocationRegistry.java   |  18 +++
 .../location/basic/BasicMachineDetails.java     |  28 +++-
 .../location/basic/BasicMachineMetadata.java    |  18 +++
 .../brooklyn/location/basic/BasicOsDetails.java |  18 +++
 .../location/basic/ByonLocationResolver.java    |  18 +++
 .../basic/DefinedLocationByIdResolver.java      |  18 +++
 .../basic/DeprecatedKeysMappingBuilder.java     |  18 +++
 .../FixedListMachineProvisioningLocation.java   |  18 +++
 .../location/basic/HasSubnetHostname.java       |  18 +++
 .../location/basic/HostLocationResolver.java    |  18 +++
 .../LocalhostMachineProvisioningLocation.java   |  18 +++
 ...calhostPropertiesFromBrooklynProperties.java |  18 +++
 .../location/basic/LocalhostResolver.java       |  18 +++
 .../location/basic/LocationConfigKeys.java      |  18 +++
 .../location/basic/LocationConfigUtils.java     |  18 +++
 .../location/basic/LocationInternal.java        |  18 +++
 .../location/basic/LocationPredicates.java      |  18 +++
 ...ocationPropertiesFromBrooklynProperties.java |  18 +++
 .../java/brooklyn/location/basic/Locations.java |  18 +++
 .../java/brooklyn/location/basic/Machines.java  |  18 +++
 .../brooklyn/location/basic/MultiLocation.java  |  18 +++
 .../location/basic/MultiLocationResolver.java   |  18 +++
 .../location/basic/NamedLocationResolver.java   |  18 +++
 .../brooklyn/location/basic/PortRanges.java     |  18 +++
 .../basic/RegistryLocationResolver.java         |  18 +++
 .../location/basic/SimulatedLocation.java       |  18 +++
 .../basic/SingleMachineLocationResolver.java    |  18 +++
 .../SingleMachineProvisioningLocation.java      |  18 +++
 .../location/basic/SshMachineLocation.java      |  18 +++
 .../location/basic/SupportsPortForwarding.java  |  18 +++
 .../AbstractAvailabilityZoneExtension.java      |  18 +++
 ...bstractCloudMachineProvisioningLocation.java |  18 +++
 .../cloud/AvailabilityZoneExtension.java        |  18 +++
 .../location/cloud/CloudLocationConfig.java     |  18 +++
 .../location/cloud/CloudMachineNamer.java       |  18 +++
 .../location/cloud/CustomMachineNamer.java      |  18 +++
 .../location/dynamic/DynamicLocation.java       |  25 ++--
 .../location/dynamic/LocationOwner.java         |  25 ++--
 .../location/geo/GeoBytesHostGeoLookup.java     |  18 +++
 .../brooklyn/location/geo/HasHostGeoInfo.java   |  18 +++
 .../java/brooklyn/location/geo/HostGeoInfo.java |  18 +++
 .../brooklyn/location/geo/HostGeoLookup.java    |  18 +++
 .../location/geo/LocalhostExternalIpLoader.java |  18 +++
 .../location/geo/MaxMindHostGeoLookup.java      |  18 +++
 .../location/geo/UtraceHostGeoLookup.java       |  18 +++
 .../BasicEntitlementClassDefinition.java        |  18 +++
 .../entitlement/EntitlementManagerAdapter.java  |  18 +++
 .../entitlement/EntitlementPredicates.java      |  18 +++
 .../management/entitlement/Entitlements.java    |  25 ++--
 .../entitlement/NotEntitledException.java       |  18 +++
 .../PerUserEntitlementManagerWithDefault.java   |  18 +++
 .../entitlement/WebEntitlementContext.java      |  18 +++
 .../management/ha/BasicMasterChooser.java       |  18 +++
 .../ha/HighAvailabilityManagerImpl.java         |  18 +++
 .../ha/ManagementPlaneSyncRecordDeltaImpl.java  |  18 +++
 ...mentPlaneSyncRecordPersisterToMultiFile.java |  18 +++
 ...ntPlaneSyncRecordPersisterToObjectStore.java |  18 +++
 .../brooklyn/management/ha/MasterChooser.java   |  18 +++
 .../brooklyn/management/ha/OsgiManager.java     |  18 +++
 .../internal/AbstractManagementContext.java     |  18 +++
 .../internal/AbstractSubscriptionManager.java   |  18 +++
 .../management/internal/AccessManager.java      |  18 +++
 .../internal/AsyncCollectionChangeAdapter.java  |  18 +++
 .../internal/BasicSubscriptionContext.java      |  18 +++
 .../internal/BrooklynGarbageCollector.java      |  18 +++
 .../internal/CollectionChangeListener.java      |  18 +++
 .../management/internal/EffectorUtils.java      |  18 +++
 .../internal/EntityChangeListener.java          |  18 +++
 .../internal/EntityManagementSupport.java       |  18 +++
 .../internal/EntityManagerInternal.java         |  18 +++
 ...PropertyChangeToCollectionChangeAdapter.java |  18 +++
 .../management/internal/LocalAccessManager.java |  18 +++
 .../management/internal/LocalEntityManager.java |  18 +++
 .../internal/LocalLocationManager.java          |  18 +++
 .../internal/LocalManagementContext.java        |  18 +++
 .../internal/LocalSubscriptionManager.java      |  18 +++
 .../management/internal/LocalUsageManager.java  |  18 +++
 .../internal/ManagementContextInternal.java     |  18 +++
 .../internal/ManagementTransitionInfo.java      |  18 +++
 .../internal/NonDeploymentAccessManager.java    |  18 +++
 .../internal/NonDeploymentEntityManager.java    |  18 +++
 .../internal/NonDeploymentLocationManager.java  |  18 +++
 .../NonDeploymentManagementContext.java         |  18 +++
 .../internal/NonDeploymentUsageManager.java     |  18 +++
 .../internal/QueueingSubscriptionManager.java   |  18 +++
 .../management/internal/Subscription.java       |  18 +++
 .../internal/SubscriptionTracker.java           |  18 +++
 .../management/internal/UsageManager.java       |  18 +++
 .../management/usage/ApplicationUsage.java      |  18 +++
 .../management/usage/LocationUsage.java         |  18 +++
 .../policy/basic/AbstractEntityAdjunct.java     |  18 +++
 .../brooklyn/policy/basic/AbstractPolicy.java   |  18 +++
 .../java/brooklyn/policy/basic/AdjunctType.java |  18 +++
 .../brooklyn/policy/basic/ConfigMapImpl.java    |  18 +++
 .../brooklyn/policy/basic/EnricherTypeImpl.java |  18 +++
 .../policy/basic/GeneralPurposePolicy.java      |  18 +++
 .../java/brooklyn/policy/basic/Policies.java    |  18 +++
 .../brooklyn/policy/basic/PolicyTypeImpl.java   |  18 +++
 .../util/BrooklynLanguageExtensions.java        |  18 +++
 .../brooklyn/util/BrooklynMavenArtifacts.java   |  18 +++
 .../brooklyn/util/BrooklynNetworkUtils.java     |  18 +++
 .../main/java/brooklyn/util/ResourceUtils.java  |  18 +++
 .../java/brooklyn/util/config/ConfigBag.java    |  18 +++
 .../brooklyn/util/crypto/FluentKeySigner.java   |  18 +++
 .../java/brooklyn/util/crypto/SecureKeys.java   |  18 +++
 .../java/brooklyn/util/file/ArchiveBuilder.java |  25 ++--
 .../java/brooklyn/util/file/ArchiveTasks.java   |  18 +++
 .../java/brooklyn/util/file/ArchiveUtils.java   |  25 ++--
 .../util/flags/ClassCoercionException.java      |  18 +++
 .../java/brooklyn/util/flags/FlagUtils.java     |  18 +++
 .../java/brooklyn/util/flags/SetFromFlag.java   |  18 +++
 .../java/brooklyn/util/flags/TypeCoercions.java |  18 +++
 .../main/java/brooklyn/util/http/HttpTool.java  |  18 +++
 .../brooklyn/util/http/HttpToolResponse.java    |  18 +++
 .../util/internal/ConfigKeySelfExtracting.java  |  18 +++
 .../java/brooklyn/util/internal/Repeater.java   |  18 +++
 .../ssh/BackoffLimitedRetryHandler.java         |  18 +++
 .../util/internal/ssh/ShellAbstractTool.java    |  18 +++
 .../brooklyn/util/internal/ssh/ShellTool.java   |  18 +++
 .../util/internal/ssh/SshAbstractTool.java      |  18 +++
 .../util/internal/ssh/SshException.java         |  18 +++
 .../brooklyn/util/internal/ssh/SshTool.java     |  18 +++
 .../util/internal/ssh/cli/SshCliTool.java       |  18 +++
 .../util/internal/ssh/process/ProcessTool.java  |  18 +++
 .../internal/ssh/sshj/SshjClientConnection.java |  18 +++
 .../util/internal/ssh/sshj/SshjTool.java        |  18 +++
 .../util/javalang/ReflectionScanner.java        |  18 +++
 .../brooklyn/util/javalang/UrlClassLoader.java  |  18 +++
 .../java/brooklyn/util/mutex/MutexSupport.java  |  18 +++
 .../brooklyn/util/mutex/SemaphoreForTasks.java  |  18 +++
 .../util/mutex/SemaphoreWithOwners.java         |  18 +++
 .../java/brooklyn/util/mutex/WithMutexes.java   |  18 +++
 .../src/main/java/brooklyn/util/osgi/Osgis.java |  18 +++
 .../util/task/AbstractExecutionContext.java     |  18 +++
 .../util/task/BasicExecutionContext.java        |  18 +++
 .../util/task/BasicExecutionManager.java        |  18 +++
 .../main/java/brooklyn/util/task/BasicTask.java |  18 +++
 .../java/brooklyn/util/task/CanSetName.java     |  18 +++
 .../java/brooklyn/util/task/CompoundTask.java   |  18 +++
 .../brooklyn/util/task/DeferredSupplier.java    |  18 +++
 .../util/task/DynamicSequentialTask.java        |  18 +++
 .../java/brooklyn/util/task/DynamicTasks.java   |  18 +++
 .../brooklyn/util/task/ExecutionListener.java   |  18 +++
 .../java/brooklyn/util/task/ExecutionUtils.java |  18 +++
 .../java/brooklyn/util/task/ForwardingTask.java |  18 +++
 .../util/task/ListenableForwardingFuture.java   |  18 +++
 .../java/brooklyn/util/task/ParallelTask.java   |  18 +++
 .../java/brooklyn/util/task/ScheduledTask.java  |  18 +++
 .../java/brooklyn/util/task/SequentialTask.java |  18 +++
 .../util/task/SingleThreadedScheduler.java      |  18 +++
 .../java/brooklyn/util/task/TaskBuilder.java    |  18 +++
 .../java/brooklyn/util/task/TaskInternal.java   |  18 +++
 .../java/brooklyn/util/task/TaskScheduler.java  |  18 +++
 .../main/java/brooklyn/util/task/TaskTags.java  |  18 +++
 .../src/main/java/brooklyn/util/task/Tasks.java |  18 +++
 .../util/task/ssh/SshFetchTaskFactory.java      |  18 +++
 .../util/task/ssh/SshFetchTaskWrapper.java      |  18 +++
 .../util/task/ssh/SshPutTaskFactory.java        |  18 +++
 .../brooklyn/util/task/ssh/SshPutTaskStub.java  |  18 +++
 .../util/task/ssh/SshPutTaskWrapper.java        |  18 +++
 .../java/brooklyn/util/task/ssh/SshTasks.java   |  18 +++
 .../internal/AbstractSshExecTaskFactory.java    |  18 +++
 .../ssh/internal/PlainSshExecTaskFactory.java   |  18 +++
 .../util/task/system/ProcessTaskFactory.java    |  18 +++
 .../util/task/system/ProcessTaskStub.java       |  18 +++
 .../util/task/system/ProcessTaskWrapper.java    |  18 +++
 .../brooklyn/util/task/system/SystemTasks.java  |  18 +++
 .../internal/AbstractProcessTaskFactory.java    |  18 +++
 .../system/internal/ExecWithLoggingHelpers.java |  18 +++
 .../internal/SystemProcessTaskFactory.java      |  18 +++
 .../brooklyn/util/text/DataUriSchemeParser.java |  18 +++
 .../brooklyn/util/text/TemplateProcessor.java   |  25 ++--
 .../xstream/EnumCaseForgivingConverter.java     |  18 +++
 .../EnumCaseForgivingSingleValueConverter.java  |  18 +++
 .../util/xstream/ImmutableListConverter.java    |  18 +++
 .../util/xstream/ImmutableMapConverter.java     |  18 +++
 .../util/xstream/ImmutableSetConverter.java     |  18 +++
 .../util/xstream/Inet4AddressConverter.java     |  18 +++
 .../brooklyn/util/xstream/MapConverter.java     |  18 +++
 .../util/xstream/MutableSetConverter.java       |  18 +++
 .../util/xstream/StringKeyMapConverter.java     |  18 +++
 .../brooklyn/util/xstream/XmlSerializer.java    |  18 +++
 .../java/brooklyn/util/xstream/XmlUtil.java     |  18 +++
 .../main/resources/brooklyn-catalog-empty.xml   |  19 +++
 .../brooklyn/location/basic/os-details.sh       |  18 +++
 .../test/java/brooklyn/BrooklynVersionTest.java |  18 +++
 .../lite/CampPlatformWithJustBrooklynMgmt.java  |  18 +++
 .../brooklyn/camp/lite/CampYamlLiteTest.java    |  18 +++
 .../brooklyn/camp/lite/TestAppAssembly.java     |  18 +++
 .../camp/lite/TestAppAssemblyInstantiator.java  |  18 +++
 .../catalog/internal/CatalogDtoTest.java        |  18 +++
 .../catalog/internal/CatalogLoadTest.java       |  18 +++
 .../catalog/internal/CatalogScanTest.java       |  18 +++
 .../catalog/internal/MyCatalogItems.java        |  18 +++
 .../config/BrooklynPropertiesBuilderTest.java   |  18 +++
 .../BrooklynPropertiesFromGroovyTest.groovy     |  18 +++
 .../brooklyn/config/BrooklynPropertiesTest.java |  18 +++
 .../java/brooklyn/config/ConfigUtilsTest.java   |  18 +++
 ...stomAggregatingEnricherDeprecatedTest.groovy |  18 +++
 .../enricher/CustomAggregatingEnricherTest.java |  18 +++
 .../java/brooklyn/enricher/EnrichersTest.java   |  22 +++-
 ...SensorPropagatingEnricherDeprecatedTest.java |  18 +++
 .../enricher/SensorPropagatingEnricherTest.java |  18 +++
 .../TransformingEnricherDeprecatedTest.groovy   |  18 +++
 .../enricher/TransformingEnricherTest.java      |  18 +++
 .../entity/BrooklynAppLiveTestSupport.java      |  18 +++
 .../entity/BrooklynAppUnitTestSupport.java      |  18 +++
 .../brooklyn/entity/EffectorMetadataTest.java   |  18 +++
 .../entity/EffectorSayHiGroovyTest.groovy       |  18 +++
 .../java/brooklyn/entity/EffectorSayHiTest.java |  18 +++
 .../entity/EntityPreManagementTest.java         |  18 +++
 .../java/brooklyn/entity/SetFromFlagTest.groovy |  18 +++
 .../basic/AbstractApplicationLegacyTest.java    |  18 +++
 .../entity/basic/AbstractEntityLegacyTest.java  |  18 +++
 .../brooklyn/entity/basic/AttributeMapTest.java |  18 +++
 .../brooklyn/entity/basic/AttributeTest.java    |  18 +++
 .../entity/basic/BasicStartableTest.java        |  18 +++
 .../entity/basic/BrooklynShutdownHooksTest.java |  18 +++
 .../basic/ConfigEntityInheritanceTest.java      |  18 +++
 .../brooklyn/entity/basic/ConfigKeysTest.java   |  18 +++
 .../entity/basic/ConfigMapGroovyTest.groovy     |  18 +++
 .../brooklyn/entity/basic/ConfigMapTest.java    |  18 +++
 .../brooklyn/entity/basic/DataEntityTest.java   |  18 +++
 .../basic/DependentConfigurationTest.java       |  18 +++
 .../entity/basic/DynamicEntityTest.java         |  18 +++
 .../brooklyn/entity/basic/DynamicGroupTest.java |  18 +++
 .../brooklyn/entity/basic/EntitiesTest.java     |  21 ++-
 .../basic/EntityConfigMapUsageLegacyTest.java   |  18 +++
 .../entity/basic/EntityConfigMapUsageTest.java  |  18 +++
 .../brooklyn/entity/basic/EntityConfigTest.java |  18 +++
 .../entity/basic/EntityFunctionsTest.java       |  18 +++
 .../entity/basic/EntityLocationsTest.java       |  18 +++
 .../entity/basic/EntityPredicatesTest.java      |  18 +++
 .../entity/basic/EntityRegistrationTest.java    |  18 +++
 .../brooklyn/entity/basic/EntitySpecTest.java   |  18 +++
 .../entity/basic/EntitySubscriptionTest.groovy  |  18 +++
 .../brooklyn/entity/basic/EntityTypeTest.java   |  18 +++
 .../basic/MapConfigKeyAndFriendsMoreTest.java   |  18 +++
 ...apListAndOtherStructuredConfigKeyTest.groovy |  18 +++
 .../entity/basic/OwnedChildrenTest.groovy       |  18 +++
 .../entity/basic/PolicyRegistrationTest.java    |  18 +++
 .../drivers/BasicEntityDriverManagerTest.java   |  18 +++
 .../drivers/EntityDriverRegistryTest.java       |  18 +++
 .../ReflectiveEntityDriverFactoryTest.java      |  18 +++
 .../RegistryEntityDriverFactoryTest.java        |  18 +++
 .../downloads/BasicDownloadsRegistryTest.java   |  18 +++
 .../DownloadProducerFromLocalRepoTest.java      |  18 +++
 .../DownloadProducerFromPropertiesTest.java     |  18 +++
 .../downloads/DownloadSubstitutersTest.java     |  18 +++
 .../downloads/FilenameProducersTest.java        |  18 +++
 .../drivers/downloads/MyEntityDriver.java       |  18 +++
 .../entity/effector/EffectorBasicTest.java      |  20 ++-
 .../effector/EffectorConcatenateTest.java       |  18 +++
 .../entity/effector/EffectorTaskTest.java       |  18 +++
 .../entity/group/DynamicClusterTest.java        |  18 +++
 ...DynamicClusterWithAvailabilityZonesTest.java |  18 +++
 .../entity/group/DynamicFabricTest.java         |  18 +++
 .../entity/group/DynamicMultiGroupTest.java     |  18 +++
 .../entity/group/DynamicRegionsFabricTest.java  |  18 +++
 .../entity/group/GroupPickUpEntitiesTest.java   |  18 +++
 .../java/brooklyn/entity/group/GroupTest.java   |  18 +++
 .../group/MembershipTrackingPolicyTest.java     |  18 +++
 .../entity/group/QuarantineGroupTest.java       |  18 +++
 .../BalancingNodePlacementStrategyTest.java     |  18 +++
 .../ProportionalZoneFailureDetectorTest.java    |  18 +++
 .../java/brooklyn/entity/hello/HelloEntity.java |  18 +++
 .../brooklyn/entity/hello/HelloEntityImpl.java  |  18 +++
 .../entity/hello/LocalEntitiesTest.java         |  18 +++
 .../ApplicationBuilderOverridingTest.java       |  18 +++
 .../proxying/BasicEntityTypeRegistryTest.java   |  18 +++
 .../entity/proxying/EntityManagerTest.java      |  18 +++
 .../entity/proxying/EntityProxyTest.java        |  18 +++
 .../proxying/InternalEntityFactoryTest.java     |  18 +++
 .../entity/rebind/CheckpointEntityTest.java     |  18 +++
 .../java/brooklyn/entity/rebind/Dumpers.java    |  18 +++
 .../entity/rebind/RebindCatalogEntityTest.java  |  18 +++
 .../entity/rebind/RebindDynamicGroupTest.java   |  18 +++
 .../entity/rebind/RebindEnricherTest.java       |  18 +++
 .../rebind/RebindEntityDynamicTypeInfoTest.java |  18 +++
 .../entity/rebind/RebindEntityTest.java         |  21 ++-
 .../entity/rebind/RebindFailuresTest.java       |  18 +++
 .../brooklyn/entity/rebind/RebindGroupTest.java |  18 +++
 .../rebind/RebindLocalhostLocationTest.java     |  18 +++
 .../entity/rebind/RebindLocationTest.java       |  18 +++
 .../entity/rebind/RebindManagerSorterTest.java  |  18 +++
 .../entity/rebind/RebindManagerTest.java        |  18 +++
 .../entity/rebind/RebindPolicyTest.java         |  18 +++
 .../rebind/RebindSshMachineLocationTest.java    |  18 +++
 .../entity/rebind/RebindTestFixture.java        |  18 +++
 .../entity/rebind/RebindTestFixtureWithApp.java |  18 +++
 .../brooklyn/entity/rebind/RebindTestUtils.java |  18 +++
 .../rebind/RecordingRebindExceptionHandler.java |  18 +++
 .../BrooklynMementoPersisterFileBasedTest.java  |  18 +++
 ...ntoPersisterInMemorySizeIntegrationTest.java |  18 +++
 .../BrooklynMementoPersisterInMemoryTest.java   |  18 +++
 .../BrooklynMementoPersisterTestFixture.java    |  18 +++
 ...BrooklynMementoPersisterToMultiFileTest.java |  18 +++
 .../FileBasedStoreObjectAccessorWriterTest.java |  18 +++
 .../rebind/persister/InMemoryObjectStore.java   |  18 +++
 .../InMemoryStoreObjectAccessorWriterTest.java  |  18 +++
 .../rebind/persister/ListeningObjectStore.java  |  18 +++
 .../persister/MementoFileWriterSyncTest.java    |  18 +++
 .../rebind/persister/MementoFileWriterTest.java |  18 +++
 ...nceStoreObjectAccessorWriterTestFixture.java |  18 +++
 .../persister/XmlMementoSerializerTest.java     |  18 +++
 .../brooklyn/entity/trait/FailingEntity.java    |  18 +++
 .../entity/trait/FailingEntityImpl.java         |  18 +++
 .../entity/trait/StartableMethodsTest.java      |  18 +++
 .../event/feed/ConfigToAttributesTest.java      |  18 +++
 .../java/brooklyn/event/feed/PollerTest.java    |  18 +++
 .../event/feed/function/FunctionFeedTest.java   |  18 +++
 .../feed/http/HttpFeedIntegrationTest.java      |  18 +++
 .../brooklyn/event/feed/http/HttpFeedTest.java  |  18 +++
 .../event/feed/http/JsonFunctionsTest.java      |  18 +++
 .../feed/shell/ShellFeedIntegrationTest.java    |  18 +++
 .../event/feed/ssh/SshFeedIntegrationTest.java  |  18 +++
 .../WindowsPerformanceCounterFeedLiveTest.java  |  18 +++
 .../WindowsPerformanceCounterFeedTest.java      |  18 +++
 .../internal/BrooklynFeatureEnablementTest.java |  18 +++
 .../storage/impl/BrooklynStorageImplTest.java   |  18 +++
 .../ConcurrentMapAcceptingNullValsTest.java     |  18 +++
 .../access/PortForwardManagerRebindTest.java    |  18 +++
 .../location/basic/AbstractLocationTest.java    |  18 +++
 ...regatingMachineProvisioningLocationTest.java |  18 +++
 .../basic/ByonLocationResolverTest.java         |  21 ++-
 ...stMachineProvisioningLocationRebindTest.java |  18 +++
 ...ixedListMachineProvisioningLocationTest.java |  18 +++
 .../basic/HostLocationResolverTest.java         |  18 +++
 .../basic/LegacyAbstractLocationTest.java       |  18 +++
 .../basic/LocalhostLocationResolverTest.java    |  18 +++
 ...ocalhostMachineProvisioningLocationTest.java |  18 +++
 .../LocalhostProvisioningAndAccessTest.java     |  18 +++
 .../location/basic/LocationConfigTest.java      |  18 +++
 .../location/basic/LocationConfigUtilsTest.java |  18 +++
 .../location/basic/LocationExtensionsTest.java  |  18 +++
 .../location/basic/LocationManagementTest.java  |  18 +++
 .../location/basic/LocationPredicatesTest.java  |  18 +++
 ...ionPropertiesFromBrooklynPropertiesTest.java |  18 +++
 .../location/basic/LocationRegistryTest.java    |  18 +++
 .../location/basic/MachineDetailsTest.java      |  18 +++
 .../location/basic/MultiLocationRebindTest.java |  18 +++
 .../basic/MultiLocationResolverTest.java        |  18 +++
 .../location/basic/MultiLocationTest.java       |  18 +++
 .../brooklyn/location/basic/PortRangesTest.java |  18 +++
 .../SingleMachineLocationResolverTest.java      |  18 +++
 .../SingleMachineProvisioningLocationTest.java  |  18 +++
 .../SshMachineLocationIntegrationTest.java      |  18 +++
 .../SshMachineLocationPerformanceTest.java      |  18 +++
 .../SshMachineLocationReuseIntegrationTest.java |  18 +++
 .../location/basic/SshMachineLocationTest.java  | 127 ++++++++++++++++++-
 .../basic/TestPortSupplierLocation.groovy       |  18 +++
 .../location/cloud/CloudMachineNamerTest.java   |  18 +++
 .../location/cloud/CustomMachineNamerTest.java  |  18 +++
 .../location/geo/HostGeoInfoTest.groovy         |  18 +++
 .../geo/HostGeoLookupIntegrationTest.java       |  18 +++
 ...ocalhostExternalIpLoaderIntegrationTest.java |  18 +++
 .../entitlement/AcmeEntitlementManager.java     |  18 +++
 .../entitlement/AcmeEntitlementManagerTest.java |  18 +++
 .../entitlement/EntitlementsTest.java           |  25 ++--
 .../entitlement/EntityEntitlementTest.java      |  25 ++--
 .../HighAvailabilityManagerFileBasedTest.java   |  18 +++
 ...ilabilityManagerInMemoryIntegrationTest.java |  18 +++
 .../ha/HighAvailabilityManagerInMemoryTest.java |  18 +++
 .../HighAvailabilityManagerSplitBrainTest.java  |  18 +++
 .../ha/HighAvailabilityManagerTestFixture.java  |  18 +++
 .../ha/ImmutableManagementPlaneSyncRecord.java  |  18 +++
 ...agementPlaneSyncRecordPersisterInMemory.java |  18 +++
 .../management/ha/MasterChooserTest.java        |  18 +++
 .../ha/MutableManagementPlaneSyncRecord.java    |  18 +++
 .../management/internal/AccessManagerTest.java  |  18 +++
 .../internal/EntityExecutionManagerTest.java    |  18 +++
 .../LocalManagementContextInstancesTest.java    |  18 +++
 .../internal/LocalManagementContextTest.java    |  18 +++
 .../internal/LocalSubscriptionManagerTest.java  |  18 +++
 .../management/osgi/OsgiStandaloneTest.java     |  18 +++
 .../policy/basic/EnricherConfigTest.java        |  18 +++
 .../brooklyn/policy/basic/EnricherTypeTest.java |  18 +++
 .../policy/basic/PolicyConfigMapUsageTest.java  |  18 +++
 .../policy/basic/PolicySubscriptionTest.groovy  |  18 +++
 .../brooklyn/policy/basic/PolicyTypeTest.java   |  18 +++
 .../longevity/EntityCleanupLongevityTest.java   |  18 +++
 .../EntityCleanupLongevityTestFixture.java      |  18 +++
 .../qa/longevity/EntityCleanupTest.java         |  18 +++
 .../qa/performance/AbstractPerformanceTest.java |  18 +++
 .../EntityPerformanceLongevityTest.java         |  18 +++
 .../qa/performance/EntityPerformanceTest.java   |  18 +++
 .../EntityPersistencePerformanceTest.java       |  18 +++
 .../FilePersistencePerformanceTest.java         |  18 +++
 .../GroovyYardStickPerformanceTest.groovy       |  18 +++
 .../JavaYardStickPerformanceTest.java           |  18 +++
 .../qa/performance/PerformanceTestUtils.java    |  18 +++
 .../SubscriptionPerformanceTest.java            |  18 +++
 .../qa/performance/TaskPerformanceTest.java     |  18 +++
 .../test/java/brooklyn/test/HttpService.java    |  18 +++
 .../brooklyn/test/entity/BlockingEntity.java    |  18 +++
 .../test/entity/BlockingEntityImpl.java         |  18 +++
 .../entity/LocalManagementContextForTests.java  |  18 +++
 .../brooklyn/test/entity/NoopStartable.java     |  18 +++
 .../brooklyn/test/entity/TestApplication.java   |  18 +++
 .../test/entity/TestApplicationImpl.java        |  18 +++
 .../java/brooklyn/test/entity/TestCluster.java  |  18 +++
 .../brooklyn/test/entity/TestClusterImpl.java   |  18 +++
 .../java/brooklyn/test/entity/TestEntity.java   |  18 +++
 .../brooklyn/test/entity/TestEntityImpl.java    |  18 +++
 .../java/brooklyn/test/policy/TestEnricher.java |  18 +++
 .../java/brooklyn/test/policy/TestPolicy.java   |  18 +++
 .../util/BrooklynMavenArtifactsTest.java        |  18 +++
 .../java/brooklyn/util/ResourceUtilsTest.java   |  18 +++
 .../util/crypto/SecureKeysAndSignerTest.java    |  18 +++
 .../brooklyn/util/file/ArchiveBuilderTest.java  |  18 +++
 .../brooklyn/util/http/BetterMockWebServer.java |  18 +++
 .../util/http/HttpToolIntegrationTest.java      |  18 +++
 .../brooklyn/util/internal/FlagUtilsTest.java   |  18 +++
 .../brooklyn/util/internal/RepeaterTest.groovy  |  18 +++
 .../util/internal/TypeCoercionsTest.java        |  18 +++
 .../util/internal/ssh/RecordingSshTool.java     |  76 +++++++++++
 .../internal/ssh/ShellToolAbstractTest.java     |  18 +++
 .../ssh/SshToolAbstractIntegrationTest.java     |  21 ++-
 .../ssh/SshToolAbstractPerformanceTest.java     |  18 +++
 .../ssh/cli/SshCliToolIntegrationTest.java      |  18 +++
 .../ssh/cli/SshCliToolPerformanceTest.java      |  18 +++
 .../ssh/process/ProcessToolIntegrationTest.java |  18 +++
 .../ssh/process/ProcessToolStaticsTest.java     |  18 +++
 .../ssh/sshj/SshjToolIntegrationTest.java       |  18 +++
 .../ssh/sshj/SshjToolPerformanceTest.java       |  18 +++
 .../brooklyn/util/mutex/WithMutexesTest.java    |  18 +++
 .../util/ssh/BashCommandsIntegrationTest.java   |  18 +++
 .../task/BasicTaskExecutionPerformanceTest.java |  18 +++
 .../util/task/BasicTaskExecutionTest.groovy     |  18 +++
 .../util/task/BasicTasksFutureTest.java         |  18 +++
 .../util/task/CompoundTaskExecutionTest.java    |  18 +++
 .../util/task/DynamicSequentialTaskTest.java    |  18 +++
 .../util/task/NonBasicTaskExecutionTest.java    |  18 +++
 .../util/task/ScheduledExecutionTest.groovy     |  18 +++
 .../task/SingleThreadedSchedulerTest.groovy     |  18 +++
 .../util/task/TaskFinalizationTest.java         |  18 +++
 .../test/java/brooklyn/util/task/TasksTest.java |  18 +++
 .../brooklyn/util/task/ssh/SshTasksTest.java    |  18 +++
 .../util/task/system/SystemTasksTest.java       |  18 +++
 .../util/text/DataUriSchemeParserTest.java      |  18 +++
 .../util/xstream/ConverterTestFixture.java      |  18 +++
 .../xstream/EnumCaseForgivingConverterTest.java |  18 +++
 .../xstream/ImmutableListConverterTest.java     |  18 +++
 .../util/xstream/InetAddressConverterTest.java  |  18 +++
 .../util/xstream/StringKeyMapConverterTest.java |  18 +++
 .../java/brooklyn/util/xstream/XmlUtilTest.java |  18 +++
 .../io.brooklyn/brooklyn-core/pom.properties    |  18 +++
 .../brooklyn/config/more-sample.properties      |  18 +++
 .../resources/brooklyn/config/sample.properties |  18 +++
 .../resources/brooklyn/config/tricky.properties |  18 +++
 docs/Gemfile                                    |  19 +++
 docs/_config.yml                                |  18 +++
 docs/_includes/breadcrumbs.html                 |  20 +++
 docs/_includes/sidebar.html                     |  20 +++
 docs/_includes/topbar.html                      |  20 +++
 docs/_javadoc/make-javadoc.sh                   |   1 +
 docs/_javadoc/quick-make-few-javadoc.sh         |   1 +
 docs/_layouts/page.html                         |  20 +++
 docs/_plugins/json.rb                           |  18 +++
 docs/_plugins/jsonball.rb                       |  20 ++-
 docs/_plugins/read.rb                           |  19 +++
 docs/_plugins/trim.rb                           |  18 +++
 docs/_scripts/build.sh                          |   1 +
 docs/_scripts/help.txt                          |  18 +++
 docs/_scripts/jekyll-debug.sh                   |   2 +-
 docs/dev/build/developers-catalog.xml           |  19 +++
 docs/style/docs/code.css                        |  18 +++
 .../smoothness/jquery-ui-1.8.18.custom.css      |   2 +-
 docs/style/style.css                            |  18 +++
 docs/style/toc.css                              |  18 +++
 .../example_files/tomcat_multi-location.java    |  18 +++
 .../example_files/tomcat_nginx.java             |  18 +++
 .../example_files/tomcat_simple.java            |  18 +++
 .../appserver-clustered-w-db-concise.yaml       |  18 +++
 .../example_yaml/appserver-clustered-w-db.yaml  |  18 +++
 .../appserver-configured-in-config.yaml         |  18 +++
 .../example_yaml/appserver-configured.yaml      |  18 +++
 .../appserver-w-db-other-flavor.yaml            |  18 +++
 .../example_yaml/appserver-w-db.yaml            |  18 +++
 .../example_yaml/appserver-w-policy.yaml        |  18 +++
 .../example_yaml/cluster-vm.yaml                |  18 +++
 .../example_yaml/mysql-chef-1.yaml              |  18 +++
 .../example_yaml/mysql-chef-2.yaml              |  18 +++
 .../simple-appserver-with-location-byon.yaml    |  18 +++
 .../simple-appserver-with-location.yaml         |  18 +++
 .../example_yaml/simple-appserver.yaml          |  18 +++
 .../example_yaml/simple-vm.yaml                 |  18 +++
 .../example_yaml/vanilla-bash-netcat-file.yaml  |  18 +++
 .../vanilla-bash-netcat-restarter.yaml          |  18 +++
 .../vanilla-bash-netcat-w-client.yaml           |  18 +++
 .../example_yaml/vanilla-bash-netcat.yaml       |  18 +++
 docs/use/guide/quickstart/brooklyn.properties   |  18 +++
 docs/use/guide/quickstart/catalog.xml           |  19 +++
 docs/use/guide/quickstart/my-web-cluster.yaml   |  18 +++
 examples/global-web-fabric/README.txt           |  20 ++-
 examples/global-web-fabric/pom.xml              |  19 +++
 .../resources/vmc-delete-all.sh                 |  18 +++
 .../brooklyn/demo/GlobalWebFabricExample.java   |  18 +++
 .../src/main/java/brooklyn/demo/ReadMe.java     |  18 +++
 examples/hadoop-and-whirr/README.txt            |  18 +++
 examples/hadoop-and-whirr/pom.xml               |  19 +++
 .../main/java/brooklyn/extras/whirr/ReadMe.java |  18 +++
 .../whirr/WebClusterWithHadoopExample.java      |  18 +++
 .../whirr/WebFabricWithHadoopExample.java       |  18 +++
 .../brooklyn/extras/whirr/WhirrExample.java     |  18 +++
 .../extras/whirr/WhirrHadoopExample.java        |  18 +++
 examples/pom.xml                                |  18 +++
 examples/simple-messaging-pubsub/README.txt     |  18 +++
 examples/simple-messaging-pubsub/pom.xml        |  27 +++-
 .../java/brooklyn/demo/KafkaClusterExample.java |  18 +++
 .../src/main/java/brooklyn/demo/Publish.java    |  18 +++
 .../demo/StandaloneQpidBrokerExample.java       |  18 +++
 .../src/main/java/brooklyn/demo/Subscribe.java  |  18 +++
 .../src/main/resources/custom-config.xml        |  18 +++
 examples/simple-nosql-cluster/README.md         |  18 +++
 examples/simple-nosql-cluster/pom.xml           |  19 +++
 .../src/main/assembly/assembly.xml              |  19 +++
 .../src/main/assembly/files/conf/logback.xml    |  19 +++
 .../src/main/assembly/scripts/start.sh          |  18 +++
 .../brooklyn/demo/CumulusRDFApplication.java    |  25 ++--
 .../demo/HighAvailabilityCassandraCluster.java  |  25 ++--
 .../java/brooklyn/demo/ResilientMongoDbApp.java |  18 +++
 .../java/brooklyn/demo/RiakClusterExample.java  |  18 +++
 .../brooklyn/demo/SimpleCassandraCluster.java   |  25 ++--
 .../brooklyn/demo/SimpleCouchDBCluster.java     |  25 ++--
 .../brooklyn/demo/SimpleMongoDBReplicaSet.java  |  18 +++
 .../java/brooklyn/demo/SimpleRedisCluster.java  |  25 ++--
 .../main/java/brooklyn/demo/StormSampleApp.java |  18 +++
 .../brooklyn/demo/WideAreaCassandraCluster.java |  25 ++--
 .../src/main/resources/cumulus.yaml             |  20 ++-
 .../src/main/resources/mongodb.conf             |  19 +++
 examples/simple-open-loop-policy/README.txt     |  17 +++
 .../org.marre.smsj/maven-metadata-local.xml     |  18 +++
 examples/simple-open-loop-policy/pom.xml        |  21 ++-
 .../resources/jmeter-test-plan.jmx              |  18 +++
 .../src/main/java/brooklyn/demo/Sms.java        |  18 +++
 .../demo/WebClusterDatabaseOpenLoopExample.java |  18 +++
 .../main/resources/visitors-creation-script.sql |  18 +++
 .../src/test/java/brooklyn/demo/SmsTest.java    |  18 +++
 examples/simple-web-cluster/README.txt          |  17 +++
 examples/simple-web-cluster/pom.xml             |  30 +++++
 .../resources/jmeter-test-plan.jmx              |  18 +++
 .../src/main/assembly/assembly.xml              |  19 +++
 .../src/main/assembly/files/README.txt          |  18 +++
 .../src/main/assembly/scripts/start.sh          |  18 +++
 .../brooklyn/demo/SingleWebServerExample.java   |  18 +++
 .../demo/WebClusterDatabaseExample.java         |  18 +++
 .../demo/WebClusterDatabaseExampleApp.java      |  18 +++
 .../demo/WebClusterDatabaseExampleGroovy.groovy |  18 +++
 .../java/brooklyn/demo/WebClusterExample.java   |  18 +++
 .../src/main/resources/logback-custom.xml       |  19 +++
 .../main/resources/visitors-creation-script.sql |  18 +++
 ...lusterDatabaseExampleAppIntegrationTest.java |  18 +++
 examples/webapps/hello-world-hadoop-jar/pom.xml |  22 +++-
 .../brooklyn/demo/webapp/hello/DemoUtils.java   |  18 +++
 .../demo/webapp/hello/HadoopWordCount.java      |  18 +++
 examples/webapps/hello-world-hadoop/pom.xml     |  25 +++-
 .../hello/SerializeHelloWorldHadoopJar.java     |  18 +++
 .../src/main/webapp/WEB-INF/web.xml             |  19 +++
 .../src/main/webapp/available.jsp               |  18 +++
 .../src/main/webapp/configure.jsp               |  18 +++
 .../hello-world-hadoop/src/main/webapp/db.jsp   |  18 +++
 .../src/main/webapp/hadoop-chat.jsp             |  18 +++
 .../src/main/webapp/hadoop-wordcount.jsp        |  18 +++
 .../src/main/webapp/index.html                  |  20 +++
 examples/webapps/hello-world-sql/pom.xml        |  23 +++-
 .../src/main/webapp/WEB-INF/web.xml             |  19 +++
 .../src/main/webapp/available.jsp               |  18 +++
 .../hello-world-sql/src/main/webapp/db.jsp      |  18 +++
 .../src/main/webapp/hadoop-chat.jsp             |  18 +++
 .../src/main/webapp/hadoop-wordcount.jsp        |  18 +++
 .../hello-world-sql/src/main/webapp/index.html  |  20 +++
 .../hello-world-sql/src/main/webapp/mongo.jsp   |  18 +++
 examples/webapps/hello-world-webapp/pom.xml     |  19 +++
 .../src/main/webapp/WEB-INF/web.xml             |  19 +++
 .../src/main/webapp/available.jsp               |  18 +++
 .../hello-world-webapp/src/main/webapp/db.jsp   |  18 +++
 .../src/main/webapp/hadoop-chat.jsp             |  18 +++
 .../src/main/webapp/hadoop-wordcount.jsp        |  18 +++
 .../src/main/webapp/index.html                  |  20 +++
 .../src/main/webapp/primes.jsp                  |  18 +++
 examples/webapps/pom.xml                        |  18 +++
 locations/jclouds/pom.xml                       |  19 +++
 .../JcloudsBlobStoreBasedObjectStore.java       |  18 +++
 .../jclouds/JcloudsStoreObjectAccessor.java     |  18 +++
 ...AbstractJcloudsSubnetSshMachineLocation.java |  18 +++
 .../jclouds/BasicJcloudsLocationCustomizer.java |  18 +++
 .../location/jclouds/BrooklynImageChooser.java  |  18 +++
 .../location/jclouds/BrooklynMachinePool.java   |  18 +++
 .../jclouds/JcloudsByonLocationResolver.java    |  18 +++
 .../location/jclouds/JcloudsLocation.java       |  25 +++-
 .../location/jclouds/JcloudsLocationConfig.java |  18 +++
 .../jclouds/JcloudsLocationCustomizer.java      |  18 +++
 .../location/jclouds/JcloudsMachineNamer.java   |  18 +++
 .../location/jclouds/JcloudsPredicates.java     |  18 +++
 ...JcloudsPropertiesFromBrooklynProperties.java |  18 +++
 .../location/jclouds/JcloudsResolver.java       |  18 +++
 .../jclouds/JcloudsSshMachineLocation.java      |  32 ++++-
 .../brooklyn/location/jclouds/JcloudsUtil.java  |  18 +++
 .../jclouds/config/AlwaysRetryOnRenew.java      |  18 +++
 .../BrooklynStandardJcloudsGuiceModule.java     |  18 +++
 .../JcloudsLocationSecurityGroupCustomizer.java |  18 +++
 .../JcloudsPortForwarderExtension.java          |  18 +++
 .../networking/SecurityGroupDefinition.java     |  18 +++
 .../jclouds/networking/SecurityGroupTool.java   |  18 +++
 .../location/jclouds/pool/MachinePool.java      |  18 +++
 .../jclouds/pool/MachinePoolPredicates.java     |  18 +++
 .../location/jclouds/pool/MachineSet.java       |  18 +++
 .../jclouds/pool/ReusableMachineTemplate.java   |  18 +++
 .../AbstractPortableTemplateBuilder.java        |  18 +++
 .../templates/PortableTemplateBuilder.java      |  18 +++
 .../zone/AwsAvailabilityZoneExtension.java      |  18 +++
 .../GoogleComputeEngineHttpApiModule.java       |  36 +++---
 .../brooklyn/location-metadata.properties       |  18 +++
 .../resources/sample/script/setup-server.sh     |  21 ++-
 .../persister/jclouds/BlobStoreCleaner.java     |  18 +++
 .../persister/jclouds/BlobStoreExpiryTest.java  |  20 ++-
 .../rebind/persister/jclouds/BlobStoreTest.java |  20 ++-
 ...nMementoPersisterJcloudsObjectStoreTest.java |  18 +++
 ...ailabilityManagerJcloudsObjectStoreTest.java |  18 +++
 .../JcloudsObjectStoreAccessorWriterTest.java   |  18 +++
 .../location/jclouds/AbstractJcloudsTest.java   |  18 +++
 .../jclouds/BrooklynMachinePoolLiveTest.java    |  18 +++
 .../JcloudsByonLocationResolverTest.java        |  18 +++
 .../jclouds/JcloudsLocationMetadataTest.java    |  18 +++
 .../JcloudsLocationRebindMachineLiveTest.java   |  18 +++
 .../jclouds/JcloudsLocationResolverTest.java    |  18 +++
 .../location/jclouds/JcloudsLocationTest.java   |  18 +++
 .../location/jclouds/JcloudsLoginLiveTest.java  |  18 +++
 .../jclouds/JcloudsMachineNamerTest.java        |  18 +++
 .../location/jclouds/JcloudsMinRamLiveTest.java |  18 +++
 ...udsPropertiesFromBrooklynPropertiesTest.java |  18 +++
 .../location/jclouds/LiveTestEntity.java        |  18 +++
 .../jclouds/RebindJcloudsLocationLiveTest.java  |  18 +++
 .../jclouds/RebindJcloudsLocationTest.java      |  18 +++
 ...loudsLocationUserLoginAndConfigLiveTest.java |  18 +++
 ...hineProvisioningLocationJcloudsLiveTest.java |  18 +++
 .../jclouds/StandaloneJcloudsLiveTest.java      |  18 +++
 ...oudsLocationSecurityGroupCustomizerTest.java |  18 +++
 .../JcloudsPortForwardingLiveTest.java          |  18 +++
 .../networking/SecurityGroupLiveTest.java       |  18 +++
 .../pool/JcloudsMachinePoolLiveTest.java        |  18 +++
 .../provider/AbstractJcloudsLocationTest.java   |  18 +++
 .../provider/AwsEc2LocationLiveTest.java        |  18 +++
 .../AwsEc2LocationWindowsLiveTest.groovy        |  18 +++
 .../provider/CarrenzaLocationLiveTest.groovy    |  18 +++
 .../provider/GoGridLocationLiveTest.groovy      |  18 +++
 .../GreenhouseDataLocationLiveTest.groovy       |  18 +++
 .../provider/RackspaceLocationLiveTest.java     |  18 +++
 .../zone/AwsAvailabilityZoneExtensionTest.java  |  18 +++
 policy/pom.xml                                  |  19 +++
 .../java/brooklyn/enricher/DeltaEnricher.java   |  18 +++
 .../brooklyn/enricher/HttpLatencyDetector.java  |  18 +++
 .../brooklyn/enricher/RollingMeanEnricher.java  |  18 +++
 .../enricher/RollingTimeWindowMeanEnricher.java |  18 +++
 .../enricher/TimeFractionDeltaEnricher.java     |  18 +++
 .../enricher/TimeWeightedDeltaEnricher.java     |  18 +++
 .../entity/brooklyn/BrooklynMetrics.java        |  18 +++
 .../entity/brooklyn/BrooklynMetricsImpl.java    |  18 +++
 .../policy/autoscaling/AutoScalerPolicy.java    |  18 +++
 .../autoscaling/MaxPoolSizeReachedEvent.java    |  18 +++
 .../policy/autoscaling/ResizeOperator.java      |  18 +++
 .../policy/autoscaling/SizeHistory.java         |  18 +++
 .../followthesun/DefaultFollowTheSunModel.java  |  18 +++
 .../policy/followthesun/FollowTheSunModel.java  |  18 +++
 .../followthesun/FollowTheSunParameters.java    |  18 +++
 .../policy/followthesun/FollowTheSunPolicy.java |  18 +++
 .../policy/followthesun/FollowTheSunPool.java   |  18 +++
 .../followthesun/FollowTheSunPoolImpl.java      |  18 +++
 .../followthesun/FollowTheSunStrategy.java      |  18 +++
 .../policy/followthesun/WeightedObject.java     |  18 +++
 .../policy/ha/ConnectionFailureDetector.java    |  18 +++
 .../main/java/brooklyn/policy/ha/HASensors.java |  18 +++
 .../policy/ha/MemberFailureDetectionPolicy.java |  18 +++
 .../policy/ha/ServiceFailureDetector.java       |  18 +++
 .../brooklyn/policy/ha/ServiceReplacer.java     |  18 +++
 .../brooklyn/policy/ha/ServiceRestarter.java    |  18 +++
 .../loadbalancing/BalanceableContainer.java     |  18 +++
 .../loadbalancing/BalanceablePoolModel.java     |  18 +++
 .../loadbalancing/BalanceableWorkerPool.java    |  18 +++
 .../BalanceableWorkerPoolImpl.java              |  18 +++
 .../policy/loadbalancing/BalancingStrategy.java |  18 +++
 .../DefaultBalanceablePoolModel.java            |  18 +++
 .../loadbalancing/ItemsInContainersGroup.java   |  18 +++
 .../ItemsInContainersGroupImpl.java             |  18 +++
 .../loadbalancing/LoadBalancingPolicy.java      |  18 +++
 .../loadbalancing/LocationConstraint.java       |  18 +++
 .../brooklyn/policy/loadbalancing/Movable.java  |  18 +++
 .../policy/loadbalancing/PolicyUtilForPool.java |  18 +++
 .../enricher/DeltaEnrichersTests.groovy         |  18 +++
 .../enricher/HttpLatencyDetectorTest.java       |  18 +++
 .../brooklyn/enricher/RebindEnricherTest.java   |  18 +++
 .../enricher/RollingMeanEnricherTest.groovy     |  18 +++
 .../RollingTimeWindowMeanEnricherTest.groovy    |  18 +++
 .../enricher/TimeFractionDeltaEnricherTest.java |  18 +++
 .../entity/brooklyn/BrooklynMetricsTest.java    |  18 +++
 .../autoscaling/AutoScalerPolicyMetricTest.java |  18 +++
 .../autoscaling/AutoScalerPolicyRebindTest.java |  18 +++
 .../AutoScalerPolicyReconfigurationTest.java    |  18 +++
 .../autoscaling/AutoScalerPolicyTest.java       |  18 +++
 .../autoscaling/LocallyResizableEntity.java     |  18 +++
 .../AbstractFollowTheSunPolicyTest.java         |  18 +++
 .../followthesun/FollowTheSunModelTest.java     |  18 +++
 .../FollowTheSunPolicySoakTest.java             |  18 +++
 .../followthesun/FollowTheSunPolicyTest.java    |  18 +++
 .../ha/ConnectionFailureDetectorTest.java       |  18 +++
 .../brooklyn/policy/ha/HaPolicyRebindTest.java  |  18 +++
 .../ha/MemberFailureDetectionPolicyTest.java    |  18 +++
 ...ServiceFailureDetectorStabilizationTest.java |  18 +++
 .../policy/ha/ServiceFailureDetectorTest.java   |  18 +++
 .../brooklyn/policy/ha/ServiceReplacerTest.java |  18 +++
 .../policy/ha/ServiceRestarterTest.java         |  18 +++
 .../AbstractLoadBalancingPolicyTest.java        |  18 +++
 .../BalanceableWorkerPoolTest.java              |  18 +++
 .../ItemsInContainersGroupTest.java             |  18 +++
 .../loadbalancing/LoadBalancingModelTest.java   |  18 +++
 .../LoadBalancingPolicyConcurrencyTest.java     |  18 +++
 .../LoadBalancingPolicySoakTest.java            |  18 +++
 .../loadbalancing/LoadBalancingPolicyTest.java  |  18 +++
 .../loadbalancing/MockContainerEntity.java      |  18 +++
 .../loadbalancing/MockContainerEntityImpl.java  |  18 +++
 .../policy/loadbalancing/MockItemEntity.java    |  18 +++
 .../loadbalancing/MockItemEntityImpl.java       |  18 +++
 pom.xml                                         |  53 ++++++++
 sandbox/cassandra-multicloud-snitch/pom.xml     |  19 +++
 .../customsnitch/MultiCloudSnitch.java          |  11 +-
 sandbox/database/pom.xml                        |  19 +++
 .../brooklyn/entity/database/Database.groovy    |  18 +++
 .../entity/database/derby/DerbyDatabase.java    |  18 +++
 .../database/derby/DerbyDatabaseDriver.java     |  18 +++
 .../database/derby/DerbyDatabaseSshDriver.java  |  18 +++
 .../entity/database/derby/DerbySchema.java      |  18 +++
 .../entity/database/PlaceholderTest.java        |  18 +++
 sandbox/dropwizard/README.txt                   |  18 +++
 sandbox/dropwizard/brooklyn                     |  19 +++
 sandbox/dropwizard/brooklynd                    |  19 +++
 sandbox/dropwizard/config.sample.yml            |  19 +++
 sandbox/dropwizard/pom.xml                      |  19 +++
 .../AppByType_WebClusterDatabaseExample.sh      |  19 +++
 .../samples/WebClusterWithMySQLDatabase.groovy  |  18 +++
 .../src/main/java/brooklyn/cli/Client.java      |  18 +++
 .../brooklyn/cli/commands/BrooklynCommand.java  |  18 +++
 .../cli/commands/CatalogEntitiesCommand.java    |  18 +++
 .../cli/commands/CatalogPoliciesCommand.java    |  18 +++
 .../cli/commands/CommandExecutionException.java |  18 +++
 .../brooklyn/cli/commands/DeployCommand.java    |  18 +++
 .../java/brooklyn/cli/commands/HelpCommand.java |  18 +++
 .../cli/commands/ListApplicationsCommand.java   |  18 +++
 .../brooklyn/cli/commands/UndeployCommand.java  |  18 +++
 .../brooklyn/cli/commands/VersionCommand.java   |  18 +++
 .../brooklyn/rest/BrooklynConfiguration.java    |  18 +++
 .../java/brooklyn/rest/BrooklynService.java     |  18 +++
 .../brooklyn/rest/ExecutorConfiguration.java    |  18 +++
 .../brooklyn/rest/auth/BasicAuthFilter.java     |  18 +++
 .../rest/auth/ConfigBasedAuthenticator.java     |  18 +++
 .../src/main/java/brooklyn/rest/auth/User.java  |  18 +++
 .../brooklyn/rest/commands/BrooklynCommand.java |  18 +++
 .../applications/DeleteApplicationCommand.java  |  18 +++
 .../applications/InvokeEffectorCommand.java     |  18 +++
 .../applications/ListApplicationsCommand.java   |  18 +++
 .../applications/ListEffectorsCommand.java      |  18 +++
 .../applications/QuerySensorsCommand.java       |  18 +++
 .../applications/StartApplicationCommand.java   |  18 +++
 .../catalog/CatalogEntityDetailsCommand.java    |  18 +++
 .../catalog/ListCatalogEntitiesCommand.java     |  18 +++
 .../catalog/ListCatalogPoliciesCommand.java     |  18 +++
 .../rest/commands/catalog/LoadClassCommand.java |  18 +++
 .../commands/locations/AddLocationCommand.java  |  18 +++
 .../locations/ListLocationsCommand.java         |  18 +++
 .../rest/health/GeneralHealthCheck.java         |  18 +++
 .../brooklyn/rest/views/SwaggerUiResource.java  |  18 +++
 .../java/brooklyn/rest/views/SwaggerUiView.java |  18 +++
 .../brooklyn/rest/views/WebClientResource.java  |  18 +++
 .../dropwizard/logging/AsyncAppender.java       |  18 +++
 .../brooklyn/rest/views/swagger-ui.ftl          |  20 +++
 .../java/brooklyn/cli/ClientNoAuthTest.java     |  18 +++
 .../src/test/java/brooklyn/cli/ClientTest.java  |  18 +++
 .../java/brooklyn/cli/ClientWithAuthTest.java   |  18 +++
 .../src/test/java/brooklyn/cli/ExampleApp.java  |  18 +++
 .../cli/commands/DeployCommandTest.java         |  18 +++
 .../ApplicationCommandsIntegrationTest.java     |  18 +++
 .../rest/commands/ApplicationCommandsTest.java  |  18 +++
 .../rest/commands/BrooklynCommandTest.java      |  18 +++
 .../rest/commands/CatalogCommandsTest.java      |  18 +++
 .../rest/commands/LocationCommandsTest.java     |  18 +++
 .../brooklyn/rest/views/SwaggerUiViewTest.java  |  18 +++
 .../resources/config/test-config-with-auth.yml  |  19 +++
 .../src/test/resources/config/test-config.yml   |  19 +++
 .../demo/todo/CustomLocationInfo.groovy         |  18 +++
 .../brooklyn/demo/todo/GemfireExample.groovy    |  18 +++
 .../brooklyn/demo/todo/PreBuiltImages.groovy    |  18 +++
 .../demo/todo/WebAppFabricExample.groovy        |  18 +++
 .../demo/todo/WebAppWideAreaExample.groovy      |  18 +++
 .../todo/WebClusterExampleNewDsl.groovyMock     |  19 +++
 .../demo/tomcat/todo/TomcatClusterApp.groovy    |  18 +++
 .../todo/TomcatClusterWithNginxApp.groovy       |  18 +++
 .../demo/tomcat/todo/TomcatFabricApp.groovy     |  18 +++
 .../demo/tomcat/todo/TomcatServerApp.groovy     |  18 +++
 .../brooklyn/earlythoughts/BigAppBixby.groovy   |  18 +++
 .../earlythoughts/BigAppBrooklyn.groovy         |  18 +++
 .../earlythoughts/PretendLocations.groovy       |  18 +++
 .../src/main/resources/gemfire/server-conf.xml  |  20 ++-
 .../src/main/scripts/create-all-instances.sh    |  20 ++-
 .../src/main/scripts/create-instance.sh         |  18 +++
 .../src/main/scripts/run-at-instances.sh        |  20 ++-
 .../examples/src/main/scripts/stop-instances.sh |  20 ++-
 sandbox/extra/pom.xml                           |  19 +++
 .../postgresql/PostgreSqlNodeSaltImpl.java      |  18 +++
 .../brooklyn/entity/salt/SaltBashCommands.java  |  25 ++--
 .../java/brooklyn/entity/salt/SaltConfig.java   |  25 ++--
 .../java/brooklyn/entity/salt/SaltConfigs.java  |  25 ++--
 .../entity/salt/SaltLifecycleEffectorTasks.java |  25 ++--
 .../brooklyn/entity/salt/SaltStackMaster.java   |  25 ++--
 .../entity/salt/SaltStackMasterDriver.java      |  25 ++--
 .../entity/salt/SaltStackMasterImpl.java        |  25 ++--
 .../entity/salt/SaltStackMasterSshDriver.java   |  25 ++--
 .../java/brooklyn/entity/salt/SaltTasks.java    |  25 ++--
 .../main/resources/brooklyn/entity/salt/master  |  27 ++--
 .../resources/brooklyn/entity/salt/masterless   |  26 ++--
 .../main/resources/brooklyn/entity/salt/minion  |  27 ++--
 .../postgresql/PostgreSqlSaltLiveTest.java      |  18 +++
 .../brooklyn/entity/salt/SaltConfigsTest.java   |  25 ++--
 .../entity/salt/SaltLiveTestSupport.java        |  25 ++--
 sandbox/monitoring/pom.xml                      |  19 +++
 .../entity/monitoring/zabbix/ZabbixFeed.java    |  18 +++
 .../monitoring/zabbix/ZabbixMonitored.java      |  18 +++
 .../monitoring/zabbix/ZabbixPollConfig.java     |  18 +++
 .../entity/monitoring/zabbix/ZabbixServer.java  |  18 +++
 .../monitoring/zabbix/ZabbixServerImpl.java     |  18 +++
 sandbox/nosql/README.md                         |  18 +++
 sandbox/nosql/pom.xml                           |  19 +++
 .../nosql/infinispan/Infinispan5Driver.java     |  18 +++
 .../nosql/infinispan/Infinispan5Server.java     |  18 +++
 .../nosql/infinispan/Infinispan5SshDriver.java  |  18 +++
 .../Infinispan5ServerIntegrationTest.groovy     |  18 +++
 software/base/pom.xml                           |  19 +++
 .../basic/AbstractSoftwareProcessDriver.java    |  34 +++++
 .../basic/AbstractSoftwareProcessSshDriver.java |  28 ++++
 .../entity/basic/EmptySoftwareProcess.java      |  18 +++
 .../basic/EmptySoftwareProcessDriver.java       |  18 +++
 .../entity/basic/EmptySoftwareProcessImpl.java  |  18 +++
 .../basic/EmptySoftwareProcessSshDriver.java    |  18 +++
 .../SameServerDriverLifecycleEffectorTasks.java |  18 +++
 .../brooklyn/entity/basic/SameServerEntity.java |  18 +++
 .../entity/basic/SameServerEntityImpl.java      |  18 +++
 .../brooklyn/entity/basic/SoftwareProcess.java  |  24 ++++
 .../entity/basic/SoftwareProcessDriver.java     |  18 +++
 ...wareProcessDriverLifecycleEffectorTasks.java |  18 +++
 .../entity/basic/SoftwareProcessImpl.java       |  18 +++
 .../entity/basic/VanillaSoftwareProcess.java    |  18 +++
 .../basic/VanillaSoftwareProcessDriver.java     |  18 +++
 .../basic/VanillaSoftwareProcessImpl.java       |  18 +++
 .../basic/VanillaSoftwareProcessSshDriver.java  |  18 +++
 .../basic/lifecycle/NaiveScriptRunner.java      |  18 +++
 .../entity/basic/lifecycle/ScriptHelper.java    |  18 +++
 .../entity/basic/lifecycle/ScriptPart.java      |  18 +++
 .../entity/brooklynnode/BrooklynNode.java       |  18 +++
 .../entity/brooklynnode/BrooklynNodeDriver.java |  18 +++
 .../entity/brooklynnode/BrooklynNodeImpl.java   |  18 +++
 .../brooklynnode/BrooklynNodeSshDriver.java     |  18 +++
 .../brooklyn/entity/chef/ChefAttributeFeed.java |  18 +++
 .../brooklyn/entity/chef/ChefBashCommands.java  |  18 +++
 .../java/brooklyn/entity/chef/ChefConfig.java   |  18 +++
 .../java/brooklyn/entity/chef/ChefConfigs.java  |  18 +++
 .../java/brooklyn/entity/chef/ChefEntity.java   |  18 +++
 .../brooklyn/entity/chef/ChefEntityImpl.java    |  18 +++
 .../entity/chef/ChefLifecycleEffectorTasks.java |  18 +++
 .../brooklyn/entity/chef/ChefServerTasks.java   |  18 +++
 .../brooklyn/entity/chef/ChefSoloDriver.java    |  18 +++
 .../brooklyn/entity/chef/ChefSoloTasks.java     |  18 +++
 .../java/brooklyn/entity/chef/ChefTasks.java    |  18 +++
 .../entity/chef/KnifeConvergeTaskFactory.java   |  18 +++
 .../brooklyn/entity/chef/KnifeTaskFactory.java  |  18 +++
 .../java/brooklyn/entity/java/JavaAppUtils.java |  18 +++
 .../brooklyn/entity/java/JavaEntityMethods.java |  18 +++
 .../entity/java/JavaSoftwareProcessDriver.java  |  18 +++
 .../java/JavaSoftwareProcessSshDriver.java      |  18 +++
 .../java/brooklyn/entity/java/JmxSupport.java   |  18 +++
 .../brooklyn/entity/java/JmxmpSslSupport.java   |  18 +++
 .../java/brooklyn/entity/java/UsesJava.java     |  18 +++
 .../brooklyn/entity/java/UsesJavaMXBeans.java   |  18 +++
 .../main/java/brooklyn/entity/java/UsesJmx.java |  18 +++
 .../brooklyn/entity/java/VanillaJavaApp.java    |  18 +++
 .../entity/java/VanillaJavaAppDriver.java       |  18 +++
 .../entity/java/VanillaJavaAppImpl.java         |  18 +++
 .../entity/java/VanillaJavaAppSshDriver.java    |  18 +++
 .../entity/machine/MachineAttributes.java       |  25 ++--
 .../brooklyn/entity/machine/MachineEntity.java  |  25 ++--
 .../entity/machine/MachineEntityImpl.java       |  25 ++--
 .../java/brooklyn/entity/pool/ServerPool.java   |  25 ++--
 .../brooklyn/entity/pool/ServerPoolImpl.java    |  25 ++--
 .../entity/pool/ServerPoolLocation.java         |  25 ++--
 .../entity/pool/ServerPoolLocationResolver.java |  25 ++--
 .../software/MachineLifecycleEffectorTasks.java |  18 +++
 .../software/ProvidesProvisioningFlags.java     |  18 +++
 .../entity/software/SshEffectorTasks.java       |  18 +++
 .../entity/software/ssh/SshCommandEffector.java |  18 +++
 .../entity/software/ssh/SshCommandSensor.java   |  18 +++
 .../event/feed/jmx/JmxAttributePollConfig.java  |  18 +++
 .../java/brooklyn/event/feed/jmx/JmxFeed.java   |  18 +++
 .../java/brooklyn/event/feed/jmx/JmxHelper.java |  18 +++
 .../event/feed/jmx/JmxNotificationFilters.java  |  18 +++
 .../jmx/JmxNotificationSubscriptionConfig.java  |  18 +++
 .../event/feed/jmx/JmxOperationPollConfig.java  |  18 +++
 .../event/feed/jmx/JmxValueFunctions.java       |  18 +++
 .../brooklyn/entity/AbstractEc2LiveTest.java    |  18 +++
 .../entity/AbstractGoogleComputeLiveTest.java   |  18 +++
 .../entity/AbstractSoftlayerLiveTest.java       |  18 +++
 .../entity/basic/SameServerEntityTest.java      |  18 +++
 .../basic/SoftwareProcessEntityRebindTest.java  |  18 +++
 .../entity/basic/SoftwareProcessEntityTest.java |  18 +++
 ...SoftwareProcessSshDriverIntegrationTest.java |  36 ++++++
 .../basic/SoftwareProcessSubclassTest.java      |  18 +++
 ...ftwareProcessAndChildrenIntegrationTest.java |  18 +++
 .../entity/basic/lifecycle/MyEntity.java        |  18 +++
 .../entity/basic/lifecycle/MyEntityApp.java     |  18 +++
 .../entity/basic/lifecycle/MyEntityImpl.java    |  18 +++
 .../basic/lifecycle/NaiveScriptRunnerTest.java  |  18 +++
 .../basic/lifecycle/ScriptHelperTest.java       |  18 +++
 .../lifecycle/StartStopSshDriverTest.groovy     |  18 +++
 .../BrooklynNodeIntegrationTest.java            |  18 +++
 .../entity/brooklynnode/BrooklynNodeTest.java   |  18 +++
 .../brooklyn/entity/chef/ChefConfigsTest.java   |  18 +++
 .../entity/chef/ChefLiveTestSupport.java        |  18 +++
 .../chef/ChefServerTasksIntegrationTest.java    |  18 +++
 .../AbstractChefToyMySqlEntityLiveTest.java     |  18 +++
 .../ChefSoloDriverMySqlEntityLiveTest.java      |  18 +++
 .../mysql/ChefSoloDriverToyMySqlEntity.java     |  18 +++
 ...micChefAutodetectToyMySqlEntityLiveTest.java |  18 +++
 ...DynamicChefServerToyMySqlEntityLiveTest.java |  18 +++
 .../DynamicChefSoloToyMySqlEntityLiveTest.java  |  18 +++
 .../chef/mysql/DynamicToyMySqlEntityChef.java   |  18 +++
 .../chef/mysql/TypedToyMySqlEntityChef.java     |  18 +++
 .../brooklyn/entity/driver/MockSshDriver.java   |  18 +++
 .../brooklyn/entity/java/EntityPollingTest.java |  18 +++
 .../entity/java/ExampleVanillaMain.java         |  18 +++
 .../java/ExampleVanillaMainCpuHungry.java       |  18 +++
 .../java/brooklyn/entity/java/JavaOptsTest.java |  89 +++----------
 ...SoftwareProcessSshDriverIntegrationTest.java |  18 +++
 .../brooklyn/entity/java/JmxSupportTest.java    |  18 +++
 .../brooklyn/entity/java/SslKeyConfigTest.java  |  18 +++
 .../entity/java/VanillaJavaAppRebindTest.java   |  18 +++
 .../entity/java/VanillaJavaAppTest.java         |  18 +++
 .../entity/pool/AbstractServerPoolTest.java     |  18 +++
 .../entity/pool/ServerPoolLiveTest.java         |  18 +++
 .../pool/ServerPoolLocationResolverTest.java    |  18 +++
 .../entity/pool/ServerPoolRebindTest.java       |  18 +++
 .../brooklyn/entity/pool/ServerPoolTest.java    |  18 +++
 .../entity/software/AbstractDockerLiveTest.java |  18 +++
 .../entity/software/SoftwareEffectorTest.java   |  18 +++
 .../entity/software/SshEffectorTasksTest.java   |  18 +++
 .../mysql/AbstractToyMySqlEntityTest.java       |  18 +++
 .../mysql/DynamicToyMySqlEntityBuilder.java     |  18 +++
 .../mysql/DynamicToyMySqlEntityTest.java        |  18 +++
 .../software/ssh/SshCommandIntegrationTest.java |  18 +++
 .../PortAttributeSensorAndConfigKeyTest.java    |  18 +++
 .../brooklyn/event/feed/jmx/JmxFeedTest.java    |  18 +++
 .../brooklyn/event/feed/jmx/JmxHelperTest.java  |  18 +++
 .../basic/MachineDetailsEc2LiveTest.java        |  18 +++
 .../MachineDetailsGoogleComputeLiveTest.java    |  18 +++
 .../usage/LocationUsageTrackingTest.java        |  18 +++
 .../brooklyn/test/GeneralisedDynamicMBean.java  |  18 +++
 .../src/test/java/brooklyn/test/JmxService.java |  18 +++
 .../hosted-chef-brooklyn-credentials/knife.rb   |  19 +++
 software/database/pom.xml                       |  23 +++-
 .../brooklyn/entity/database/DatabaseNode.java  |  18 +++
 .../entity/database/DatastoreMixins.java        |  18 +++
 .../entity/database/mariadb/MariaDbDriver.java  |  18 +++
 .../entity/database/mariadb/MariaDbNode.java    |  18 +++
 .../database/mariadb/MariaDbNodeImpl.java       |  18 +++
 .../database/mariadb/MariaDbSshDriver.java      |  18 +++
 .../entity/database/mysql/MySqlDriver.java      |  18 +++
 .../entity/database/mysql/MySqlNode.java        |  18 +++
 .../entity/database/mysql/MySqlNodeImpl.java    |  18 +++
 .../entity/database/mysql/MySqlSshDriver.java   |  18 +++
 .../database/postgresql/PostgreSqlDriver.java   |  18 +++
 .../database/postgresql/PostgreSqlNode.java     |  25 ++--
 .../PostgreSqlNodeChefImplFromScratch.java      |  18 +++
 .../database/postgresql/PostgreSqlNodeImpl.java |  18 +++
 .../database/postgresql/PostgreSqlSpecs.java    |  18 +++
 .../postgresql/PostgreSqlSshDriver.java         |  25 ++--
 .../entity/database/rubyrep/RubyRepDriver.java  |  18 +++
 .../entity/database/rubyrep/RubyRepNode.java    |  18 +++
 .../database/rubyrep/RubyRepNodeImpl.java       |  18 +++
 .../database/rubyrep/RubyRepSshDriver.java      |  18 +++
 .../brooklyn/entity/database/mariadb/my.cnf     |  19 +++
 .../brooklyn/entity/database/mysql/mysql.conf   |  19 +++
 .../entity/database/postgresql/postgresql.conf  |  19 +++
 .../entity/database/rubyrep/rubyrep.conf        |  18 +++
 .../entity/database/VogellaExampleAccess.java   |  18 +++
 .../mariadb/MariaDbIntegrationTest.java         |  18 +++
 .../database/mariadb/MariaDbLiveEc2Test.java    |  18 +++
 .../mariadb/MariaDbLiveRackspaceTest.java       |  18 +++
 .../database/mysql/MySqlIntegrationTest.groovy  |  18 +++
 .../entity/database/mysql/MySqlLiveEc2Test.java |  18 +++
 .../entity/database/mysql/MySqlLiveGceTest.java |  18 +++
 .../database/mysql/MySqlLiveRackspaceTest.java  |  18 +++
 .../database/mysql/MysqlDockerLiveTest.java     |  18 +++
 .../postgresql/PostgreSqDockerLiveTest.java     |  18 +++
 .../database/postgresql/PostgreSqlChefTest.java |  18 +++
 .../postgresql/PostgreSqlEc2LiveTest.java       |  18 +++
 .../postgresql/PostgreSqlGceLiveTest.java       |  18 +++
 .../postgresql/PostgreSqlIntegrationTest.java   |  18 +++
 .../postgresql/PostgreSqlRackspaceLiveTest.java |  18 +++
 .../database/rubyrep/RubyRepEc2LiveTest.java    |  18 +++
 .../rubyrep/RubyRepIntegrationTest.java         |  18 +++
 .../rubyrep/RubyRepRackspaceLiveTest.java       |  18 +++
 software/messaging/pom.xml                      |  31 ++++-
 .../entity/messaging/MessageBroker.java         |  18 +++
 .../java/brooklyn/entity/messaging/Queue.java   |  18 +++
 .../java/brooklyn/entity/messaging/Topic.java   |  18 +++
 .../messaging/activemq/ActiveMQBroker.java      |  18 +++
 .../messaging/activemq/ActiveMQBrokerImpl.java  |  18 +++
 .../messaging/activemq/ActiveMQDestination.java |  18 +++
 .../activemq/ActiveMQDestinationImpl.java       |  18 +++
 .../messaging/activemq/ActiveMQDriver.java      |  18 +++
 .../messaging/activemq/ActiveMQQueue.java       |  18 +++
 .../messaging/activemq/ActiveMQQueueImpl.java   |  18 +++
 .../messaging/activemq/ActiveMQSpecs.java       |  18 +++
 .../messaging/activemq/ActiveMQSshDriver.java   |  25 ++--
 .../messaging/activemq/ActiveMQTopic.java       |  18 +++
 .../messaging/activemq/ActiveMQTopicImpl.java   |  18 +++
 .../entity/messaging/amqp/AmqpExchange.java     |  18 +++
 .../entity/messaging/amqp/AmqpServer.java       |  18 +++
 .../entity/messaging/jms/JMSBroker.java         |  18 +++
 .../entity/messaging/jms/JMSBrokerImpl.java     |  18 +++
 .../entity/messaging/jms/JMSDestination.java    |  18 +++
 .../messaging/jms/JMSDestinationImpl.java       |  18 +++
 .../kafka/AbstractfKafkaSshDriver.java          |  25 ++--
 .../brooklyn/entity/messaging/kafka/Kafka.java  |  25 ++--
 .../entity/messaging/kafka/KafkaBroker.java     |  25 ++--
 .../messaging/kafka/KafkaBrokerDriver.java      |  25 ++--
 .../entity/messaging/kafka/KafkaBrokerImpl.java |  25 ++--
 .../messaging/kafka/KafkaBrokerSshDriver.java   |  25 ++--
 .../entity/messaging/kafka/KafkaCluster.java    |  25 ++--
 .../messaging/kafka/KafkaClusterImpl.java       |  25 ++--
 .../entity/messaging/kafka/KafkaTopic.java      |  25 ++--
 .../entity/messaging/kafka/KafkaZooKeeper.java  |  25 ++--
 .../messaging/kafka/KafkaZooKeeperDriver.java   |  25 ++--
 .../messaging/kafka/KafkaZooKeeperImpl.java     |  25 ++--
 .../kafka/KafkaZooKeeperSshDriver.java          |  25 ++--
 .../entity/messaging/qpid/QpidBroker.java       |  18 +++
 .../entity/messaging/qpid/QpidBrokerImpl.java   |  18 +++
 .../entity/messaging/qpid/QpidDestination.java  |  18 +++
 .../messaging/qpid/QpidDestinationImpl.java     |  18 +++
 .../entity/messaging/qpid/QpidDriver.java       |  18 +++
 .../entity/messaging/qpid/QpidQueue.java        |  18 +++
 .../entity/messaging/qpid/QpidQueueImpl.java    |  18 +++
 .../entity/messaging/qpid/QpidSshDriver.java    |  25 ++--
 .../entity/messaging/qpid/QpidTopic.java        |  18 +++
 .../entity/messaging/qpid/QpidTopicImpl.java    |  18 +++
 .../entity/messaging/rabbit/RabbitBroker.java   |  18 +++
 .../messaging/rabbit/RabbitBrokerImpl.java      |  18 +++
 .../messaging/rabbit/RabbitDestination.java     |  18 +++
 .../entity/messaging/rabbit/RabbitDriver.java   |  18 +++
 .../entity/messaging/rabbit/RabbitQueue.java    |  18 +++
 .../messaging/rabbit/RabbitSshDriver.java       |  25 ++--
 .../brooklyn/entity/messaging/storm/Storm.java  |  17 ++-
 .../entity/messaging/storm/StormDeployment.java |  18 +++
 .../messaging/storm/StormDeploymentImpl.java    |  18 +++
 .../entity/messaging/storm/StormDriver.java     |  18 +++
 .../entity/messaging/storm/StormImpl.java       |  18 +++
 .../entity/messaging/storm/StormSshDriver.java  |  18 +++
 .../entity/zookeeper/AbstractZooKeeperImpl.java |  25 ++--
 .../entity/zookeeper/ZooKeeperDriver.java       |  25 ++--
 .../entity/zookeeper/ZooKeeperEnsemble.java     |  18 +++
 .../entity/zookeeper/ZooKeeperEnsembleImpl.java |  18 +++
 .../entity/zookeeper/ZooKeeperNode.java         |  25 ++--
 .../entity/zookeeper/ZooKeeperNodeImpl.java     |  25 ++--
 .../entity/zookeeper/ZooKeeperSshDriver.java    |  25 ++--
 .../entity/messaging/activemq/activemq.xml      |  33 ++---
 .../entity/messaging/kafka/server.properties    |  26 ++--
 .../entity/messaging/kafka/zookeeper.properties |  25 ++--
 .../brooklyn/entity/messaging/storm/storm.yaml  |  18 +++
 .../brooklyn/entity/messaging/zookeeper/zoo.cfg |  25 ++--
 .../messaging/activemq/ActiveMQEc2LiveTest.java |  18 +++
 .../activemq/ActiveMQGoogleComputeLiveTest.java |  18 +++
 .../activemq/ActiveMQIntegrationTest.java       |  18 +++
 .../messaging/kafka/KafkaIntegrationTest.java   |  25 ++--
 .../entity/messaging/kafka/KafkaLiveTest.java   |  25 ++--
 .../entity/messaging/kafka/KafkaSupport.java    |  25 ++--
 .../entity/messaging/qpid/QpidEc2LiveTest.java  |  18 +++
 .../messaging/qpid/QpidIntegrationTest.groovy   |  18 +++
 .../messaging/rabbit/RabbitEc2LiveTest.java     |  18 +++
 .../messaging/rabbit/RabbitIntegrationTest.java |  18 +++
 .../messaging/storm/LocalhostLiveTest.java      |  18 +++
 .../messaging/storm/SoftLayerLiveTest.java      |  18 +++
 .../storm/StormAbstractCloudLiveTest.java       |  18 +++
 .../messaging/storm/StormEc2LiveTest.java       |  18 +++
 .../messaging/storm/StormGceLiveTest.java       |  18 +++
 .../storm/topologies/ExclamationBolt.java       |  18 +++
 .../zookeeper/ZooKeeperEc2LiveTest.java         |  18 +++
 .../zookeeper/ZooKeeperEnsembleLiveTest.java    |  17 ++-
 .../src/test/resources/qpid-test-config.xml     |  18 +++
 software/monitoring/pom.xml                     |  19 +++
 .../entity/monitoring/monit/MonitDriver.java    |  18 +++
 .../entity/monitoring/monit/MonitNode.java      |  18 +++
 .../entity/monitoring/monit/MonitNodeImpl.java  |  18 +++
 .../entity/monitoring/monit/MonitSshDriver.java |  18 +++
 .../monitoring/monit/MonitIntegrationTest.java  |  18 +++
 .../entity/monitoring/monit/monit.monitrc       |  18 +++
 .../entity/monitoring/monit/monitmysql.monitrc  |  19 +++
 .../monit/monitmysqlwithrestart.monitrc         |  19 +++
 software/network/pom.xml                        |  19 +++
 .../entity/network/bind/BindDnsServer.java      |  25 ++--
 .../network/bind/BindDnsServerDriver.java       |  25 ++--
 .../entity/network/bind/BindDnsServerImpl.java  |  25 ++--
 .../network/bind/BindDnsServerSshDriver.java    |  25 ++--
 .../brooklyn/entity/network/bind/domain.zone    |  19 ++-
 .../brooklyn/entity/network/bind/ifcfg          |  20 ++-
 .../brooklyn/entity/network/bind/named.conf     |  19 ++-
 .../brooklyn/entity/network/bind/resolv.conf    |  19 ++-
 .../brooklyn/entity/network/bind/reverse.zone   |  20 ++-
 .../network/bind/BindDnsServerLiveTest.java     |  25 ++--
 .../entity/network/bind/BindDnsServerTest.java  |  25 ++--
 software/nosql/pom.xml                          |  33 +++--
 .../nosql/cassandra/CassandraCluster.java       |  18 +++
 .../nosql/cassandra/CassandraClusterImpl.java   |  18 +++
 .../nosql/cassandra/CassandraDatacenter.java    |  17 ++-
 .../cassandra/CassandraDatacenterImpl.java      |  17 ++-
 .../entity/nosql/cassandra/CassandraFabric.java |  17 ++-
 .../nosql/cassandra/CassandraFabricImpl.java    |  17 ++-
 .../entity/nosql/cassandra/CassandraNode.java   |  17 ++-
 .../nosql/cassandra/CassandraNodeDriver.java    |  17 ++-
 .../nosql/cassandra/CassandraNodeImpl.java      |  17 ++-
 .../nosql/cassandra/CassandraNodeSshDriver.java |  25 ++--
 .../entity/nosql/cassandra/TokenGenerator.java  |  18 +++
 .../entity/nosql/cassandra/TokenGenerators.java |  18 +++
 .../nosql/couchbase/CouchbaseCluster.java       |  18 +++
 .../nosql/couchbase/CouchbaseClusterImpl.java   |  18 +++
 .../nosql/couchbase/CouchbaseLoadGenerator.java |  18 +++
 .../couchbase/CouchbaseLoadGeneratorDriver.java |  18 +++
 .../couchbase/CouchbaseLoadGeneratorImpl.java   |  18 +++
 .../CouchbaseLoadGeneratorSshDriver.java        |  18 +++
 .../entity/nosql/couchbase/CouchbaseNode.java   |  18 +++
 .../nosql/couchbase/CouchbaseNodeDriver.java    |  18 +++
 .../nosql/couchbase/CouchbaseNodeImpl.java      |  18 +++
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |  18 +++
 .../entity/nosql/couchdb/CouchDBCluster.java    |  25 ++--
 .../nosql/couchdb/CouchDBClusterImpl.java       |  25 ++--
 .../entity/nosql/couchdb/CouchDBNode.java       |  25 ++--
 .../entity/nosql/couchdb/CouchDBNodeDriver.java |  25 ++--
 .../entity/nosql/couchdb/CouchDBNodeImpl.java   |  25 ++--
 .../nosql/couchdb/CouchDBNodeSshDriver.java     |  25 ++--
 .../elasticsearch/ElasticSearchCluster.java     |  18 +++
 .../elasticsearch/ElasticSearchClusterImpl.java |  37 ++++++
 .../nosql/elasticsearch/ElasticSearchNode.java  |  66 ++++++++++
 .../elasticsearch/ElasticSearchNodeDriver.java  |   7 +
 .../elasticsearch/ElasticSearchNodeImpl.java    |  92 ++++++++++++++
 .../ElasticSearchNodeSshDriver.java             | 119 +++++++++++++++++
 .../nosql/mongodb/AbstractMongoDBServer.java    |  18 +++
 .../nosql/mongodb/AbstractMongoDBSshDriver.java |  18 +++
 .../entity/nosql/mongodb/MongoDBClient.java     |  18 +++
 .../nosql/mongodb/MongoDBClientDriver.java      |  18 +++
 .../entity/nosql/mongodb/MongoDBClientImpl.java |  18 +++
 .../nosql/mongodb/MongoDBClientSshDriver.java   |  18 +++
 .../nosql/mongodb/MongoDBClientSupport.java     |  18 +++
 .../entity/nosql/mongodb/MongoDBDriver.java     |  18 +++
 .../entity/nosql/mongodb/MongoDBReplicaSet.java |  18 +++
 .../nosql/mongodb/MongoDBReplicaSetImpl.java    |  18 +++
 .../entity/nosql/mongodb/MongoDBServer.java     |  18 +++
 .../entity/nosql/mongodb/MongoDBServerImpl.java |  18 +++
 .../entity/nosql/mongodb/MongoDBSshDriver.java  |  18 +++
 .../entity/nosql/mongodb/ReplicaSetConfig.java  |  18 +++
 .../nosql/mongodb/ReplicaSetMemberStatus.java   |  18 +++
 .../sharding/CoLocatedMongoDBRouter.java        |  18 +++
 .../sharding/CoLocatedMongoDBRouterImpl.java    |  18 +++
 .../mongodb/sharding/MongoDBConfigServer.java   |  18 +++
 .../sharding/MongoDBConfigServerCluster.java    |  18 +++
 .../MongoDBConfigServerClusterImpl.java         |  18 +++
 .../sharding/MongoDBConfigServerDriver.java     |  18 +++
 .../sharding/MongoDBConfigServerImpl.java       |  18 +++
 .../sharding/MongoDBConfigServerSshDriver.java  |  18 +++
 .../nosql/mongodb/sharding/MongoDBRouter.java   |  18 +++
 .../mongodb/sharding/MongoDBRouterCluster.java  |  18 +++
 .../sharding/MongoDBRouterClusterImpl.java      |  18 +++
 .../mongodb/sharding/MongoDBRouterDriver.java   |  18 +++
 .../mongodb/sharding/MongoDBRouterImpl.java     |  18 +++
 .../sharding/MongoDBRouterSshDriver.java        |  18 +++
 .../mongodb/sharding/MongoDBShardCluster.java   |  18 +++
 .../sharding/MongoDBShardClusterImpl.java       |  18 +++
 .../sharding/MongoDBShardedDeployment.java      |  18 +++
 .../sharding/MongoDBShardedDeploymentImpl.java  |  18 +++
 .../entity/nosql/redis/RedisCluster.java        |  18 +++
 .../entity/nosql/redis/RedisClusterImpl.java    |  18 +++
 .../brooklyn/entity/nosql/redis/RedisShard.java |  18 +++
 .../entity/nosql/redis/RedisShardImpl.java      |  18 +++
 .../brooklyn/entity/nosql/redis/RedisSlave.java |  18 +++
 .../entity/nosql/redis/RedisSlaveImpl.java      |  18 +++
 .../brooklyn/entity/nosql/redis/RedisStore.java |  18 +++
 .../entity/nosql/redis/RedisStoreDriver.java    |  18 +++
 .../entity/nosql/redis/RedisStoreImpl.java      |  18 +++
 .../entity/nosql/redis/RedisStoreSshDriver.java |  18 +++
 .../brooklyn/entity/nosql/riak/RiakCluster.java |  18 +++
 .../entity/nosql/riak/RiakClusterImpl.java      |  18 +++
 .../brooklyn/entity/nosql/riak/RiakNode.java    |  18 +++
 .../entity/nosql/riak/RiakNodeDriver.java       |  18 +++
 .../entity/nosql/riak/RiakNodeImpl.java         |  18 +++
 .../entity/nosql/riak/RiakNodeSshDriver.java    |  18 +++
 .../brooklyn/entity/nosql/solr/SolrServer.java  |  17 ++-
 .../entity/nosql/solr/SolrServerDriver.java     |  17 ++-
 .../entity/nosql/solr/SolrServerImpl.java       |  17 ++-
 .../entity/nosql/solr/SolrServerSshDriver.java  |  17 ++-
 .../nosql/cassandra/cassandra-rackdc.properties |  18 +++
 .../entity/nosql/cassandra/cassandra.yaml       |  18 +++
 .../brooklyn/entity/nosql/couchdb/couch.ini     |  18 +++
 .../entity/nosql/mongodb/default-mongodb.conf   |  19 +++
 .../brooklyn/entity/nosql/redis/redis.conf      |  19 +++
 .../brooklyn/entity/nosql/redis/slave.conf      |  19 +++
 .../brooklyn/entity/nosql/riak/app.config       |  19 +++
 .../brooklyn/entity/nosql/solr/solr.xml         |  22 +++-
 .../cassandra/AbstractCassandraNodeTest.java    |  17 ++-
 .../entity/nosql/cassandra/AstyanaxSupport.java |  17 ++-
 .../CassandraDatacenterIntegrationTest.java     |  17 ++-
 .../cassandra/CassandraDatacenterLiveTest.java  |  17 ++-
 ...assandraDatacenterRebindIntegrationTest.java |  18 +++
 .../cassandra/CassandraDatacenterTest.java      |  18 +++
 .../nosql/cassandra/CassandraFabricTest.java    |  18 +++
 .../cassandra/CassandraNodeEc2LiveTest.java     |  18 +++
 .../cassandra/CassandraNodeIntegrationTest.java |  17 ++-
 .../nosql/cassandra/CassandraNodeLiveTest.java  |  17 ++-
 .../cassandra/NonNegTokenGeneratorTest.java     |  18 +++
 .../cassandra/PosNegTokenGeneratorTest.java     |  18 +++
 .../nosql/couchdb/AbstractCouchDBNodeTest.java  |  25 ++--
 .../nosql/couchdb/CouchDBClusterLiveTest.java   |  25 ++--
 .../nosql/couchdb/CouchDBNodeEc2LiveTest.java   |  25 ++--
 .../couchdb/CouchDBNodeIntegrationTest.java     |  25 ++--
 .../nosql/couchdb/CouchDBNodeLiveTest.java      |  25 ++--
 .../entity/nosql/couchdb/JcouchdbSupport.java   |  25 ++--
 .../ElasticSearchClusterIntegrationTest.java    | 102 +++++++++++++++
 .../ElasticSearchNodeIntegrationTest.java       |  94 ++++++++++++++
 .../nosql/mongodb/MongoDBEc2LiveTest.java       |  18 +++
 .../nosql/mongodb/MongoDBIntegrationTest.java   |  18 +++
 .../mongodb/MongoDBReplicaSetEc2LiveTest.java   |  17 ++-
 .../MongoDBReplicaSetIntegrationTest.java       |  18 +++
 .../nosql/mongodb/MongoDBSoftLayerLiveTest.java |  18 +++
 .../entity/nosql/mongodb/MongoDBTestHelper.java |  18 +++
 .../nosql/mongodb/ReplicaSetConfigTest.java     |  18 +++
 .../MongoDBConfigServerIntegrationTest.java     |  18 +++
 .../MongoDBShardedDeploymentEc2LiveTest.java    |  18 +++
 ...MongoDBShardedDeploymentIntegrationTest.java |  18 +++
 .../entity/nosql/redis/JedisSupport.java        |  17 ++-
 .../redis/RedisClusterIntegrationTest.java      |  18 +++
 .../entity/nosql/redis/RedisEc2LiveTest.java    |  18 +++
 .../nosql/redis/RedisIntegrationTest.java       |  18 +++
 .../nosql/riak/RiakClusterEc2LiveTest.java      |  18 +++
 .../entity/nosql/riak/RiakNodeEc2LiveTest.java  |  18 +++
 .../riak/RiakNodeGoogleComputeLiveTest.java     |  18 +++
 .../nosql/riak/RiakNodeIntegrationTest.java     |  18 +++
 .../nosql/solr/AbstractSolrServerTest.java      |  17 ++-
 .../entity/nosql/solr/SolrJSupport.java         |  17 ++-
 .../nosql/solr/SolrServerEc2LiveTest.java       |  17 ++-
 .../nosql/solr/SolrServerIntegrationTest.java   |  17 ++-
 .../entity/nosql/solr/SolrServerLiveTest.java   |  17 ++-
 .../test/resources/solr/example/conf/schema.xml |  22 +++-
 .../resources/solr/example/conf/solrconfig.xml  |  31 ++---
 .../test/resources/solr/example/core.properties |  18 +++
 .../nosql/src/test/resources/test-mongodb.conf  |  19 +++
 software/osgi/pom.xml                           |  21 ++-
 .../entity/osgi/karaf/KarafContainer.java       |  18 +++
 .../entity/osgi/karaf/KarafContainerImpl.java   |  18 +++
 .../brooklyn/entity/osgi/karaf/KarafDriver.java |  18 +++
 .../entity/osgi/karaf/KarafSshDriver.java       |  25 ++--
 .../osgi/src/main/java/org/osgi/jmx/Item.java   |  18 +++
 .../main/java/org/osgi/jmx/JmxConstants.java    |  18 +++
 .../osgi/karaf/KarafContainerEc2LiveTest.java   |  18 +++
 .../entity/osgi/karaf/KarafContainerTest.groovy |  18 +++
 software/webapp/pom.xml                         |  23 +++-
 .../entity/dns/AbstractGeoDnsService.java       |  18 +++
 .../entity/dns/AbstractGeoDnsServiceImpl.java   |  18 +++
 .../dns/geoscaling/GeoscalingDnsService.java    |  18 +++
 .../geoscaling/GeoscalingDnsServiceImpl.java    |  18 +++
 .../geoscaling/GeoscalingScriptGenerator.java   |  18 +++
 .../dns/geoscaling/GeoscalingWebClient.java     |  18 +++
 .../entity/proxy/AbstractController.java        |  18 +++
 .../entity/proxy/AbstractControllerImpl.java    |  18 +++
 .../proxy/AbstractNonProvisionedController.java |  18 +++
 .../AbstractNonProvisionedControllerImpl.java   |  18 +++
 .../brooklyn/entity/proxy/LoadBalancer.java     |  18 +++
 .../entity/proxy/LoadBalancerCluster.java       |  18 +++
 .../entity/proxy/LoadBalancerClusterImpl.java   |  18 +++
 .../brooklyn/entity/proxy/ProxySslConfig.java   |  18 +++
 .../proxy/nginx/NginxConfigFileGenerator.java   |  25 ++--
 .../entity/proxy/nginx/NginxConfigTemplate.java |  25 ++--
 .../entity/proxy/nginx/NginxController.java     |  25 ++--
 .../entity/proxy/nginx/NginxControllerImpl.java |  25 ++--
 .../entity/proxy/nginx/NginxDriver.java         |  25 ++--
 .../entity/proxy/nginx/NginxSshDriver.java      |  25 ++--
 .../brooklyn/entity/proxy/nginx/UrlMapping.java |  25 ++--
 .../entity/proxy/nginx/UrlMappingImpl.java      |  25 ++--
 .../entity/proxy/nginx/UrlRewriteRule.java      |  18 +++
 .../webapp/ControlledDynamicWebAppCluster.java  |  18 +++
 .../ControlledDynamicWebAppClusterImpl.java     |  18 +++
 .../entity/webapp/DynamicWebAppCluster.java     |  18 +++
 .../entity/webapp/DynamicWebAppClusterImpl.java |  18 +++
 .../entity/webapp/DynamicWebAppFabric.java      |  18 +++
 .../entity/webapp/DynamicWebAppFabricImpl.java  |  18 +++
 .../entity/webapp/ElasticJavaWebAppService.java |  18 +++
 .../webapp/FilenameToWebContextMapper.java      |  18 +++
 .../brooklyn/entity/webapp/HttpsSslConfig.java  |  18 +++
 .../entity/webapp/JavaWebAppDriver.java         |  18 +++
 .../entity/webapp/JavaWebAppService.java        |  18 +++
 .../webapp/JavaWebAppSoftwareProcess.java       |  18 +++
 .../webapp/JavaWebAppSoftwareProcessImpl.java   |  18 +++
 .../entity/webapp/JavaWebAppSshDriver.java      |  18 +++
 .../brooklyn/entity/webapp/WebAppService.java   |  18 +++
 .../entity/webapp/WebAppServiceConstants.java   |  18 +++
 .../entity/webapp/WebAppServiceMethods.java     |  18 +++
 .../entity/webapp/jboss/JBoss6Driver.java       |  18 +++
 .../entity/webapp/jboss/JBoss6Server.java       |  18 +++
 .../entity/webapp/jboss/JBoss6ServerImpl.java   |  18 +++
 .../entity/webapp/jboss/JBoss6SshDriver.java    |  25 ++--
 .../entity/webapp/jboss/JBoss7Driver.java       |  18 +++
 .../entity/webapp/jboss/JBoss7Server.java       |  18 +++
 .../entity/webapp/jboss/JBoss7ServerImpl.java   |  18 +++
 .../entity/webapp/jboss/JBoss7SshDriver.java    |  18 +++
 .../entity/webapp/jetty/Jetty6Driver.java       |  25 ++--
 .../entity/webapp/jetty/Jetty6Server.java       |  25 ++--
 .../entity/webapp/jetty/Jetty6ServerImpl.java   |  25 ++--
 .../entity/webapp/jetty/Jetty6SshDriver.java    |  25 ++--
 .../entity/webapp/tomcat/Tomcat7Driver.java     |  18 +++
 .../entity/webapp/tomcat/Tomcat7SshDriver.java  |  25 ++--
 .../entity/webapp/tomcat/TomcatServer.java      |  18 +++
 .../entity/webapp/tomcat/TomcatServerImpl.java  |  18 +++
 .../brooklyn/entity/dns/geoscaling/template.php |  18 +++
 .../brooklyn/entity/proxy/nginx/server.conf     |  18 +++
 .../entity/webapp/jboss/jboss7-standalone.xml   |  23 +++-
 .../entity/webapp/jetty/jetty-brooklyn.xml      |  34 ++---
 .../entity/dns/AbstractGeoDnsServiceTest.java   |  18 +++
 .../geoscaling/GeoscalingIntegrationTest.java   |  18 +++
 .../GeoscalingScriptGeneratorTest.java          |  18 +++
 .../geoscaling/GeoscalingWebClientTest.groovy   |  18 +++
 .../entity/proxy/AbstractControllerTest.java    |  18 +++
 .../brooklyn/entity/proxy/StubAppServer.java    |  18 +++
 .../proxy/TrackingAbstractController.java       |  18 +++
 .../proxy/TrackingAbstractControllerImpl.java   |  18 +++
 .../brooklyn/entity/proxy/UrlMappingTest.java   |  18 +++
 .../nginx/NginxClusterIntegrationTest.java      |  18 +++
 .../entity/proxy/nginx/NginxEc2LiveTest.java    |  18 +++
 .../nginx/NginxHttpsSslIntegrationTest.groovy   |  18 +++
 .../proxy/nginx/NginxIntegrationTest.groovy     |  18 +++
 .../proxy/nginx/NginxLightIntegrationTest.java  |  18 +++
 .../proxy/nginx/NginxRebindIntegrationTest.java |  18 +++
 .../nginx/NginxUrlMappingIntegrationTest.groovy |  18 +++
 .../nginx/NginxWebClusterEc2LiveTest.groovy     |  18 +++
 .../AbstractWebAppFixtureIntegrationTest.java   |  20 ++-
 .../ControlledDynamicWebAppClusterTest.java     |  18 +++
 .../entity/webapp/DynamicWebAppClusterTest.java |  18 +++
 .../entity/webapp/DynamicWebAppFabricTest.java  |  18 +++
 .../webapp/ElasticCustomLocationTest.java       |  18 +++
 ...ElasticJavaWebAppServiceIntegrationTest.java |  18 +++
 .../webapp/FilenameToWebContextMapperTest.java  |  18 +++
 .../brooklyn/entity/webapp/JBossExample.groovy  |  18 +++
 .../webapp/TomcatAutoScalerPolicyTest.java      |  18 +++
 .../webapp/WebAppLiveIntegrationTest.groovy     |  18 +++
 ...namicWebAppClusterRebindIntegrationTest.java |  18 +++
 ...namicWebAppClusterRebindIntegrationTest.java |  18 +++
 .../webapp/jboss/JBoss7PasswordHashingTest.java |  18 +++
 .../webapp/jboss/Jboss6ServerEc2LiveTest.java   |  18 +++
 .../jboss/Jboss6ServerIntegrationTest.java      |  18 +++
 .../webapp/jboss/Jboss7DockerLiveTest.java      |  18 +++
 .../webapp/jboss/Jboss7ServerEc2LiveTest.java   |  18 +++
 .../Jboss7ServerGoogleComputeLiveTest.java      |  18 +++
 .../jboss/Jboss7ServerIntegrationTest.java      |  18 +++
 .../Jboss7ServerRebindIntegrationTest.java      |  18 +++
 ...JbossServerWebAppFixtureIntegrationTest.java |  18 +++
 .../JettyWebAppFixtureIntegrationTest.java      |  18 +++
 .../webapp/tomcat/TomcatServerEc2LiveTest.java  |  18 +++
 .../TomcatServerSimpleIntegrationTest.java      |  18 +++
 .../tomcat/TomcatServerSoftlayerLiveTest.java   |  18 +++
 ...omcatServerWebAppFixtureIntegrationTest.java |  18 +++
 .../test/entity/TestJavaWebAppEntity.groovy     |  18 +++
 .../entity/dns/geoscaling/expectedScript.php    |  18 +++
 storage/hazelcast/pom.xml                       |  19 +++
 .../storage/impl/hazelcast/EntityId.java        |  18 +++
 .../impl/hazelcast/EntityStreamSerializer.java  |  18 +++
 .../impl/hazelcast/HazelcastDataGrid.java       |  18 +++
 .../hazelcast/HazelcastDataGridFactory.java     |  18 +++
 .../impl/hazelcast/HazelcastStorageTest.java    |  18 +++
 systems/whirr/base/pom.xml                      |  19 +++
 .../extras/whirr/core/WhirrCluster.java         |  18 +++
 .../extras/whirr/core/WhirrClusterImpl.java     |  18 +++
 .../extras/whirr/core/WhirrInstance.java        |  18 +++
 .../extras/whirr/core/WhirrInstanceImpl.java    |  18 +++
 .../brooklyn/extras/whirr/core/WhirrRole.java   |  18 +++
 .../extras/whirr/core/WhirrRoleImpl.java        |  18 +++
 .../extras/whirr/core/WhirrClusterTest.java     |  18 +++
 systems/whirr/hadoop/pom.xml                    |  19 +++
 .../extras/whirr/hadoop/WhirrHadoopCluster.java |  18 +++
 .../whirr/hadoop/WhirrHadoopClusterImpl.java    |  18 +++
 .../hadoop/WhirrHadoopClusterLiveTest.java      |  18 +++
 .../whirr/hadoop/WhirrHadoopClusterTest.java    |  18 +++
 usage/all/pom.xml                               |  19 +++
 usage/all/start-mgmt-web.sh                     |  18 +++
 usage/archetypes/quickstart/pom.xml             |  19 +++
 .../quickstart/src/brooklyn-sample/README.md    |  10 +-
 .../quickstart/src/brooklyn-sample/pom.xml      |  19 +++
 .../src/main/assembly/assembly.xml              |  19 +++
 .../src/main/assembly/files/README.txt          |   1 +
 .../src/main/assembly/files/conf/logback.xml    |  19 +++
 .../src/main/assembly/scripts/start.sh          |  18 +++
 .../com/acme/sample/brooklyn/SampleMain.java    |  18 +++
 .../app/ClusterWebServerDatabaseSample.java     |  18 +++
 .../sample/app/SingleWebServerSample.java       |  18 +++
 .../src/main/resources/logback-custom.xml       |  19 +++
 .../main/resources/visitors-creation-script.sql |  18 +++
 .../app/SampleLocalhostIntegrationTest.java     |  18 +++
 .../brooklyn/sample/app/SampleUnitTest.java     |  18 +++
 .../META-INF/maven/archetype-metadata.xml       |  19 +++
 .../integration-test-1/archetype.properties     |  18 +++
 usage/camp/pom.xml                              |  31 ++++-
 .../camp/brooklyn/BrooklynCampConstants.java    |  18 +++
 .../camp/brooklyn/BrooklynCampPlatform.java     |  18 +++
 .../BrooklynCampPlatformLauncherAbstract.java   |  18 +++
 .../BrooklynCampPlatformLauncherNoServer.java   |  18 +++
 .../camp/brooklyn/YamlLauncherAbstract.java     |  18 +++
 .../camp/brooklyn/YamlLauncherNoServer.java     |  18 +++
 .../BrooklynAssemblyTemplateInstantiator.java   |  18 +++
 .../BrooklynComponentTemplateResolver.java      |  18 +++
 .../creation/BrooklynEntityClassResolver.java   |  18 +++
 .../BrooklynEntityDecorationResolver.java       |  18 +++
 .../spi/creation/BrooklynEntityMatcher.java     |  18 +++
 .../creation/BrooklynYamlLocationResolver.java  |  18 +++
 .../spi/creation/BrooklynYamlTypeLoader.java    |  18 +++
 .../creation/ChefComponentTemplateResolver.java |  18 +++
 .../spi/creation/EntitySpecConfiguration.java   |  18 +++
 .../spi/dsl/BrooklynDslDeferredSupplier.java    |  18 +++
 .../spi/dsl/BrooklynDslInterpreter.java         |  18 +++
 .../camp/brooklyn/spi/dsl/DslUtils.java         |  18 +++
 .../spi/dsl/methods/BrooklynDslCommon.java      |  18 +++
 .../brooklyn/spi/dsl/methods/DslComponent.java  |  18 +++
 .../camp/brooklyn/spi/dsl/parse/DslParser.java  |  18 +++
 .../spi/dsl/parse/FunctionWithArgs.java         |  18 +++
 .../brooklyn/spi/dsl/parse/QuotedString.java    |  18 +++
 .../lookup/AbstractBrooklynResourceLookup.java  |  18 +++
 .../lookup/AbstractTemplateBrooklynLookup.java  |  18 +++
 .../spi/lookup/AssemblyBrooklynLookup.java      |  18 +++
 .../lookup/AssemblyTemplateBrooklynLookup.java  |  18 +++
 .../brooklyn/spi/lookup/BrooklynUrlLookup.java  |  18 +++
 .../lookup/PlatformComponentBrooklynLookup.java |  18 +++
 ...PlatformComponentTemplateBrooklynLookup.java |  18 +++
 .../platform/BrooklynImmutableCampPlatform.java |  18 +++
 .../camp/brooklyn/AbstractYamlTest.java         |  18 +++
 .../brooklyn/BrooklynYamlTypeLoaderTest.java    |  18 +++
 .../camp/brooklyn/DslAndRebindYamlTest.java     |  18 +++
 .../brooklyn/EmptySoftwareProcessYamlTest.java  |  18 +++
 .../camp/brooklyn/EnrichersYamlTest.java        |  18 +++
 .../brooklyn/EntitiesYamlIntegrationTest.java   |  18 +++
 .../camp/brooklyn/EntitiesYamlTest.java         |  18 +++
 ...aWebAppWithDslYamlRebindIntegrationTest.java |  18 +++
 .../brooklyn/JavaWebAppsIntegrationTest.java    |  18 +++
 .../camp/brooklyn/JavaWebAppsMatchingTest.java  |  18 +++
 .../camp/brooklyn/LocationsYamlTest.java        |  20 ++-
 .../camp/brooklyn/PoliciesYamlTest.java         |  18 +++
 .../brooklyn/ReferencingYamlTestEntity.java     |  18 +++
 .../brooklyn/ReferencingYamlTestEntityImpl.java |  18 +++
 .../brooklyn/ReloadBrooklynPropertiesTest.java  |  18 +++
 .../camp/brooklyn/TestEntityWithInitConfig.java |  18 +++
 .../brooklyn/TestEntityWithInitConfigImpl.java  |  18 +++
 .../camp/brooklyn/TestReferencingEnricher.java  |  18 +++
 .../camp/brooklyn/TestReferencingPolicy.java    |  18 +++
 .../TestSensorAndEffectorInitializer.java       |  18 +++
 .../brooklyn/VanillaBashNetcatYamlTest.java     |  18 +++
 .../io/brooklyn/camp/brooklyn/WrapAppTest.java  |  18 +++
 .../camp/brooklyn/spi/dsl/DslParseTest.java     |  18 +++
 .../test/resources/example-with-function.yaml   |  18 +++
 .../java-web-app-and-db-with-function-2.yaml    |  18 +++
 .../java-web-app-and-db-with-function.yaml      |  18 +++
 .../java-web-app-and-db-with-policy.yaml        |  18 +++
 .../src/test/resources/java-web-app-simple.yaml |  18 +++
 usage/camp/src/test/resources/mysql-chef.yaml   |  18 +++
 .../src/test/resources/postgresql-chef.yaml     |  18 +++
 .../test/resources/same-server-entity-test.yaml |  18 +++
 .../test/resources/test-app-with-enricher.yaml  |  18 +++
 .../test/resources/test-app-with-policy.yaml    |  18 +++
 .../test-cluster-with-member-spec.yaml          |  18 +++
 .../resources/test-entity-basic-template.yaml   |  20 ++-
 .../resources/test-entity-with-enricher.yaml    |  18 +++
 .../resources/test-entity-with-init-config.yaml |  18 +++
 .../test/resources/test-entity-with-policy.yaml |  18 +++
 ...-java-web-app-spec-and-db-with-function.yaml |  18 +++
 .../resources/test-propagating-enricher.yaml    |  18 +++
 .../resources/test-referencing-enrichers.yaml   |  18 +++
 .../resources/test-referencing-entities.yaml    |  18 +++
 .../resources/test-referencing-policies.yaml    |  18 +++
 .../src/test/resources/test-tomcat-cluster.yaml |  18 +++
 .../resources/vanilla-bash-netcat-w-client.yaml |  18 +++
 .../test/resources/visitors-creation-script.sql |  18 +++
 usage/cli/README.md                             |  18 +++
 usage/cli/pom.xml                               |  19 +++
 usage/cli/src/main/java/brooklyn/cli/Main.java  |  24 +++-
 .../cli/src/test/java/brooklyn/cli/CliTest.java |  18 +++
 .../src/test/resources/ExampleAppInFile.groovy  |  18 +++
 .../resources/example-app-app-location.yaml     |  18 +++
 .../resources/example-app-entity-location.yaml  |  18 +++
 .../test/resources/example-app-no-location.yaml |  18 +++
 usage/dist/pom.xml                              |  21 ++-
 .../main/config/build-distribution-archive.xml  |  18 +++
 .../src/main/config/build-distribution-dir.xml  |  18 +++
 usage/dist/src/main/dist/bin/brooklyn           |  19 ++-
 usage/dist/src/main/dist/bin/brooklyn.ps1       |  19 ++-
 usage/dist/src/main/dist/conf/catalog.xml       |  19 +++
 usage/dist/src/main/dist/conf/logback.xml       |  19 +++
 .../brooklyn/cli/BaseCliIntegrationTest.java    |  18 +++
 .../java/brooklyn/cli/CliIntegrationTest.java   |  18 +++
 usage/jsgui/pom.xml                             |  32 +++--
 usage/jsgui/src/main/webapp/WEB-INF/web.xml     |  19 ++-
 usage/jsgui/src/main/webapp/assets/css/base.css |  18 +++
 .../src/main/webapp/assets/css/bootstrap.css    |  18 +++
 .../src/main/webapp/assets/css/brooklyn.css     |  18 +++
 .../webapp/assets/css/jquery.dataTables.css     |  18 +++
 .../jsgui/src/main/webapp/assets/css/styles.css |  18 +++
 .../src/main/webapp/assets/css/swagger.css      |  18 +++
 usage/jsgui/src/main/webapp/assets/js/config.js |  18 +++
 .../src/main/webapp/assets/js/model/app-tree.js |  18 +++
 .../main/webapp/assets/js/model/application.js  |  18 +++
 .../assets/js/model/catalog-item-summary.js     |  18 +++
 .../webapp/assets/js/model/config-summary.js    |  18 +++
 .../webapp/assets/js/model/effector-param.js    |  18 +++
 .../webapp/assets/js/model/effector-summary.js  |  18 +++
 .../webapp/assets/js/model/entity-summary.js    |  18 +++
 .../src/main/webapp/assets/js/model/entity.js   |  18 +++
 .../jsgui/src/main/webapp/assets/js/model/ha.js |  18 +++
 .../src/main/webapp/assets/js/model/location.js |  18 +++
 .../assets/js/model/policy-config-summary.js    |  18 +++
 .../webapp/assets/js/model/policy-summary.js    |  18 +++
 .../webapp/assets/js/model/sensor-summary.js    |  18 +++
 .../main/webapp/assets/js/model/task-summary.js |  18 +++
 usage/jsgui/src/main/webapp/assets/js/router.js |  18 +++
 .../webapp/assets/js/view/activity-details.js   |  18 +++
 .../src/main/webapp/assets/js/view/apidoc.js    |  18 +++
 .../assets/js/view/application-add-wizard.js    |  18 +++
 .../assets/js/view/application-explorer.js      |  18 +++
 .../webapp/assets/js/view/application-tree.js   |  18 +++
 .../js/view/catalog-add-location-modal.js       |  18 +++
 .../src/main/webapp/assets/js/view/catalog.js   |  18 +++
 .../webapp/assets/js/view/effector-invoke.js    |  18 +++
 .../webapp/assets/js/view/entity-activities.js  |  18 +++
 .../main/webapp/assets/js/view/entity-config.js |  18 +++
 .../webapp/assets/js/view/entity-details.js     |  18 +++
 .../webapp/assets/js/view/entity-effectors.js   |  18 +++
 .../webapp/assets/js/view/entity-lifecycle.js   |  18 +++
 .../webapp/assets/js/view/entity-policies.js    |  18 +++
 .../webapp/assets/js/view/entity-sensors.js     |  18 +++
 .../webapp/assets/js/view/entity-summary.js     |  18 +++
 .../webapp/assets/js/view/expunge-invoke.js     |  18 +++
 .../main/webapp/assets/js/view/googlemaps.js    |  18 +++
 .../main/webapp/assets/js/view/ha-summary.js    |  18 +++
 .../src/main/webapp/assets/js/view/home.js      |  18 +++
 .../assets/js/view/policy-config-invoke.js      |  18 +++
 .../main/webapp/assets/js/view/script-groovy.js |  18 +++
 .../src/main/webapp/assets/js/view/viewutils.js |  18 +++
 .../tpl/app-add-wizard/create-entity-entry.html |  20 +++
 .../create-step-template-entry.html             |  20 +++
 .../assets/tpl/app-add-wizard/create.html       |  20 +++
 .../app-add-wizard/deploy-location-option.html  |  20 +++
 .../tpl/app-add-wizard/deploy-location-row.html |  20 +++
 .../assets/tpl/app-add-wizard/deploy.html       |  20 +++
 .../tpl/app-add-wizard/edit-config-entry.html   |  20 +++
 .../assets/tpl/app-add-wizard/modal-wizard.html |  20 +++
 .../assets/tpl/app-add-wizard/preview.html      |  20 +++
 .../app-add-wizard/required-config-entry.html   |  20 +++
 .../main/webapp/assets/tpl/apps/activities.html |  20 +++
 .../assets/tpl/apps/activity-details.html       |  20 +++
 .../assets/tpl/apps/activity-full-details.html  |  20 +++
 .../tpl/apps/activity-row-details-main.html     |  20 +++
 .../assets/tpl/apps/activity-row-details.html   |  20 +++
 .../webapp/assets/tpl/apps/activity-table.html  |  20 +++
 .../src/main/webapp/assets/tpl/apps/config.html |  20 +++
 .../main/webapp/assets/tpl/apps/details.html    |  20 +++
 .../webapp/assets/tpl/apps/effector-modal.html  |  20 +++
 .../webapp/assets/tpl/apps/effector-row.html    |  20 +++
 .../main/webapp/assets/tpl/apps/effector.html   |  20 +++
 .../assets/tpl/apps/entity-not-found.html       |  20 +++
 .../webapp/assets/tpl/apps/expunge-modal.html   |  20 +++
 .../main/webapp/assets/tpl/apps/lifecycle.html  |  20 +++
 .../src/main/webapp/assets/tpl/apps/page.html   |  20 +++
 .../main/webapp/assets/tpl/apps/param-list.html |  20 +++
 .../src/main/webapp/assets/tpl/apps/param.html  |  20 +++
 .../assets/tpl/apps/policy-config-modal.html    |  20 +++
 .../assets/tpl/apps/policy-config-row.html      |  20 +++
 .../main/webapp/assets/tpl/apps/policy-row.html |  20 +++
 .../src/main/webapp/assets/tpl/apps/policy.html |  20 +++
 .../webapp/assets/tpl/apps/sensor-name.html     |  20 +++
 .../main/webapp/assets/tpl/apps/sensors.html    |  20 +++
 .../main/webapp/assets/tpl/apps/summary.html    |  20 +++
 .../main/webapp/assets/tpl/apps/tree-empty.html |  20 +++
 .../main/webapp/assets/tpl/apps/tree-item.html  |  20 +++
 .../assets/tpl/catalog/add-location-modal.html  |  20 +++
 .../assets/tpl/catalog/details-generic.html     |  20 +++
 .../assets/tpl/catalog/details-location.html    |  18 +++
 .../assets/tpl/catalog/location-config.html     |  20 +++
 .../webapp/assets/tpl/catalog/nav-entry.html    |  18 +++
 .../main/webapp/assets/tpl/catalog/page.html    |  20 +++
 .../src/main/webapp/assets/tpl/help/page.html   |  20 +++
 .../main/webapp/assets/tpl/home/app-entry.html  |  20 +++
 .../webapp/assets/tpl/home/applications.html    |  20 +++
 .../main/webapp/assets/tpl/home/ha-summary.html |  20 +++
 .../assets/tpl/home/server-not-ha-master.html   |  20 +++
 .../main/webapp/assets/tpl/home/summaries.html  |  20 +++
 .../src/main/webapp/assets/tpl/labs/page.html   |  20 +++
 .../main/webapp/assets/tpl/script/groovy.html   |  20 +++
 .../main/webapp/assets/tpl/script/swagger.html  |  20 +++
 usage/jsgui/src/main/webapp/index.html          |  20 +++
 .../jsgui/BrooklynJavascriptGuiLauncher.java    |  18 +++
 .../BrooklynJavascriptGuiLauncherTest.java      |  18 +++
 .../javascript/specs/brooklyn-utils-spec.js     |  18 +++
 .../src/test/javascript/specs/home-spec.js      |  18 +++
 .../src/test/javascript/specs/library-spec.js   |  18 +++
 .../javascript/specs/model/app-tree-spec.js     |  18 +++
 .../javascript/specs/model/application-spec.js  |  18 +++
 .../javascript/specs/model/effector-spec.js     |  18 +++
 .../test/javascript/specs/model/entity-spec.js  |  18 +++
 .../specs/model/entity-summary-spec.js          |  18 +++
 .../src/test/javascript/specs/model/ha-spec.js  |  18 +++
 .../javascript/specs/model/location-spec.js     |  18 +++
 .../specs/model/sensor-summary-spec.js          |  18 +++
 .../javascript/specs/model/task-summary-spec.js |  18 +++
 .../src/test/javascript/specs/router-spec.js    |  18 +++
 .../specs/view/application-add-wizard-spec.js   |  18 +++
 .../specs/view/application-explorer-spec.js     |  18 +++
 .../specs/view/application-tree-spec.js         |  18 +++
 .../specs/view/effector-invoke-spec.js          |  18 +++
 .../specs/view/entity-activities-spec.js        |  18 +++
 .../specs/view/entity-details-spec.js           |  18 +++
 .../specs/view/entity-effector-view-spec.js     |  18 +++
 .../specs/view/entity-sensors-spec.js           |  18 +++
 usage/launcher/pom.xml                          |  30 +++--
 .../main/java/brooklyn/launcher/Activator.java  |  18 +++
 .../brooklyn/launcher/BrooklynLauncher.java     |  18 +++
 .../launcher/BrooklynServerDetails.java         |  18 +++
 .../brooklyn/launcher/BrooklynWebServer.java    |  18 +++
 .../camp/BrooklynCampPlatformLauncher.java      |  18 +++
 .../launcher/camp/SimpleYamlLauncher.java       |  18 +++
 .../config/BrooklynDevelopmentModes.java        |  18 +++
 .../launcher/config/BrooklynGlobalConfig.java   |  18 +++
 .../launcher/config/CustomResourceLocator.java  |  18 +++
 .../config/StopWhichAppsOnShutdown.java         |  18 +++
 .../ContextHandlerCollectionHotSwappable.java   |  18 +++
 .../entity/basic/VanillaSoftwareYamlTest.java   |  18 +++
 .../BrooklynLauncherHighAvailabilityTest.java   |  18 +++
 .../BrooklynLauncherRebindTestFixture.java      |  18 +++
 .../BrooklynLauncherRebindTestToFiles.java      |  18 +++
 ...lynLauncherRebindToCloudObjectStoreTest.java |  18 +++
 .../brooklyn/launcher/BrooklynLauncherTest.java |  18 +++
 .../launcher/BrooklynWebServerTest.java         |  18 +++
 .../brooklyn/launcher/WebAppRunnerTest.groovy   |  18 +++
 .../java/brooklyn/launcher/YamlLauncher.java    |  18 +++
 .../resources/basic-empy-app-blueprint.yaml     |  18 +++
 .../src/test/resources/cassandra-blueprint.yaml |  18 +++
 .../launcher/src/test/resources/couchbase.yaml  |  18 +++
 .../java-web-app-and-db-with-function.yaml      |  18 +++
 .../src/test/resources/mongo-blueprint.yaml     |  18 +++
 .../resources/mongo-client-single-server.yaml   |  18 +++
 .../src/test/resources/mongo-product-delete.js  |  18 +++
 .../src/test/resources/mongo-product-insert.js  |  18 +++
 .../src/test/resources/mongo-product-update.js  |  18 +++
 .../src/test/resources/mongo-scripts.yaml       |  18 +++
 .../src/test/resources/mongo-sharded.yaml       |  18 +++
 .../mongo-single-server-blueprint.yaml          |  18 +++
 .../src/test/resources/opengamma-cluster.yaml   |  18 +++
 usage/launcher/src/test/resources/playing.yaml  |  18 +++
 .../test/resources/postgres-gce-blueprint.yaml  |  18 +++
 .../src/test/resources/storm-blueprint.yaml     |  18 +++
 .../resources/vanilla-software-blueprint.yaml   |  18 +++
 .../vanilla-software-with-child-blueprint.yaml  |  18 +++
 .../test/resources/visitors-creation-script.sql |  18 +++
 usage/launcher/src/test/resources/web.yaml      |  18 +++
 usage/logback-includes/pom.xml                  |  19 +++
 .../brooklyn/logback-appender-file.xml          |  19 +++
 .../brooklyn/logback-appender-jclouds.xml       |  19 +++
 .../brooklyn/logback-appender-stdout.xml        |  19 +++
 .../main/resources/brooklyn/logback-debug.xml   |  19 +++
 .../brooklyn/logback-logger-debug-all.xml       |  19 +++
 .../brooklyn/logback-logger-debug-favs.xml      |  19 +++
 .../brooklyn/logback-logger-debug-jclouds.xml   |  19 +++
 .../brooklyn/logback-logger-excludes.xml        |  19 +++
 .../src/main/resources/logback-custom.xml       |  19 +++
 .../src/main/resources/logback-main.xml         |  19 +++
 usage/logback-xml/pom.xml                       |  19 +++
 .../logback-xml/src/main/resources/logback.xml  |  19 +++
 usage/qa/pom.xml                                |  23 +++-
 .../java/brooklyn/qa/longevity/Monitor.java     |  18 +++
 .../brooklyn/qa/longevity/MonitorListener.java  |  18 +++
 .../brooklyn/qa/longevity/MonitorPrefs.java     |  18 +++
 .../brooklyn/qa/longevity/MonitorUtils.java     |  18 +++
 .../brooklyn/qa/longevity/StatusRecorder.java   |  18 +++
 .../webcluster/SinusoidalLoadGenerator.java     |  18 +++
 .../qa/longevity/webcluster/WebClusterApp.java  |  18 +++
 .../qa/longevity/MonitorUtilsTest.groovy        |  18 +++
 usage/qa/start-monitor.sh                       |  18 +++
 usage/qa/start-webcluster.sh                    |  18 +++
 usage/rest-api/pom.xml                          |  21 ++-
 .../main/java/brooklyn/rest/api/AccessApi.java  |  18 +++
 .../java/brooklyn/rest/api/ActivityApi.java     |  18 +++
 .../java/brooklyn/rest/api/ApplicationApi.java  |  18 +++
 .../main/java/brooklyn/rest/api/CatalogApi.java |  18 +++
 .../java/brooklyn/rest/api/EffectorApi.java     |  18 +++
 .../main/java/brooklyn/rest/api/EntityApi.java  |  18 +++
 .../java/brooklyn/rest/api/EntityConfigApi.java |  18 +++
 .../java/brooklyn/rest/api/LocationApi.java     |  18 +++
 .../main/java/brooklyn/rest/api/PolicyApi.java  |  18 +++
 .../java/brooklyn/rest/api/PolicyConfigApi.java |  18 +++
 .../main/java/brooklyn/rest/api/ScriptApi.java  |  18 +++
 .../main/java/brooklyn/rest/api/SensorApi.java  |  25 ++--
 .../main/java/brooklyn/rest/api/ServerApi.java  |  18 +++
 .../main/java/brooklyn/rest/api/UsageApi.java   |  18 +++
 .../main/java/brooklyn/rest/api/VersionApi.java |  18 +++
 .../brooklyn/rest/domain/AccessSummary.java     |  18 +++
 .../java/brooklyn/rest/domain/ApiError.java     |  18 +++
 .../brooklyn/rest/domain/ApplicationSpec.java   |  18 +++
 .../rest/domain/ApplicationSummary.java         |  18 +++
 .../rest/domain/CatalogEntitySummary.java       |  18 +++
 .../rest/domain/CatalogItemSummary.java         |  18 +++
 .../rest/domain/CatalogPolicySummary.java       |  18 +++
 .../brooklyn/rest/domain/ConfigSummary.java     |  18 +++
 .../brooklyn/rest/domain/EffectorSummary.java   |  18 +++
 .../rest/domain/EntityConfigSummary.java        |  18 +++
 .../java/brooklyn/rest/domain/EntitySpec.java   |  18 +++
 .../brooklyn/rest/domain/EntitySummary.java     |  18 +++
 .../rest/domain/HighAvailabilitySummary.java    |  18 +++
 .../brooklyn/rest/domain/LinkWithMetadata.java  |  18 +++
 .../java/brooklyn/rest/domain/LocationSpec.java |  18 +++
 .../brooklyn/rest/domain/LocationSummary.java   |  18 +++
 .../rest/domain/PolicyConfigSummary.java        |  18 +++
 .../brooklyn/rest/domain/PolicySummary.java     |  18 +++
 .../rest/domain/ScriptExecutionSummary.java     |  18 +++
 .../brooklyn/rest/domain/SensorSummary.java     |  18 +++
 .../main/java/brooklyn/rest/domain/Status.java  |  18 +++
 .../java/brooklyn/rest/domain/TaskSummary.java  |  18 +++
 .../brooklyn/rest/domain/UsageStatistic.java    |  18 +++
 .../brooklyn/rest/domain/UsageStatistics.java   |  18 +++
 usage/rest-api/src/main/webapp/WEB-INF/web.xml  |  19 +++
 .../java/brooklyn/rest/domain/ApiErrorTest.java |  18 +++
 .../rest/domain/ApplicationSpecTest.java        |  18 +++
 .../rest/domain/EffectorSummaryTest.java        |  18 +++
 .../brooklyn/rest/domain/EntitySpecTest.java    |  18 +++
 .../brooklyn/rest/domain/EntitySummaryTest.java |  18 +++
 .../brooklyn/rest/domain/LocationSpecTest.java  |  18 +++
 usage/rest-client/pom.xml                       |  25 +++-
 .../java/brooklyn/rest/client/BrooklynApi.java  |  18 +++
 .../ApplicationResourceIntegrationTest.java     |  18 +++
 .../rest/client/BrooklynApiRestClientTest.java  |  18 +++
 .../rest-client/src/test/webapp/WEB-INF/web.xml |  19 +++
 usage/rest-server/pom.xml                       |  21 ++-
 .../java/brooklyn/rest/BrooklynRestApi.java     |  18 +++
 .../java/brooklyn/rest/BrooklynWebConfig.java   |  18 +++
 .../resources/AbstractBrooklynRestResource.java |  18 +++
 .../brooklyn/rest/resources/AccessResource.java |  18 +++
 .../rest/resources/ActivityResource.java        |  18 +++
 .../brooklyn/rest/resources/ApidocResource.java |  18 +++
 .../rest/resources/ApplicationResource.java     |  18 +++
 .../rest/resources/CatalogResource.java         |  18 +++
 .../rest/resources/EffectorResource.java        |  18 +++
 .../rest/resources/EntityConfigResource.java    |  18 +++
 .../brooklyn/rest/resources/EntityResource.java |  18 +++
 .../rest/resources/LocationResource.java        |  18 +++
 .../rest/resources/PolicyConfigResource.java    |  18 +++
 .../brooklyn/rest/resources/PolicyResource.java |  18 +++
 .../brooklyn/rest/resources/ScriptResource.java |  18 +++
 .../brooklyn/rest/resources/SensorResource.java |  25 ++--
 .../brooklyn/rest/resources/ServerResource.java |  18 +++
 .../brooklyn/rest/resources/UsageResource.java  |  18 +++
 .../rest/resources/VersionResource.java         |  18 +++
 .../BrooklynPropertiesSecurityFilter.java       |  18 +++
 .../provider/AnyoneSecurityProvider.java        |  18 +++
 .../provider/BlackholeSecurityProvider.java     |  18 +++
 .../provider/DelegatingSecurityProvider.java    |  18 +++
 .../provider/ExplicitUsersSecurityProvider.java |  18 +++
 .../security/provider/LdapSecurityProvider.java |  18 +++
 .../security/provider/SecurityProvider.java     |  18 +++
 .../rest/transform/AccessTransformer.java       |  18 +++
 .../rest/transform/ApplicationTransformer.java  |  18 +++
 .../rest/transform/CatalogTransformer.java      |  18 +++
 .../rest/transform/EffectorTransformer.java     |  18 +++
 .../rest/transform/EntityTransformer.java       |  18 +++
 .../transform/HighAvailabilityTransformer.java  |  18 +++
 .../rest/transform/LocationTransformer.java     |  18 +++
 .../rest/transform/PolicyTransformer.java       |  18 +++
 .../rest/transform/SensorTransformer.java       |  25 ++--
 .../rest/transform/TaskTransformer.java         |  18 +++
 .../rest/util/BrooklynRestResourceUtils.java    |  18 +++
 .../rest/util/DefaultExceptionMapper.java       |  18 +++
 .../brooklyn/rest/util/EntityLocationUtils.java |  18 +++
 .../brooklyn/rest/util/HaMasterCheckFilter.java |  18 +++
 .../brooklyn/rest/util/URLParamEncoder.java     |  18 +++
 .../brooklyn/rest/util/WebResourceUtils.java    |  18 +++
 .../rest-server/src/main/webapp/WEB-INF/web.xml |  19 ++-
 .../config/render/TestRendererHints.java        |  25 ++--
 .../brooklynnode/DeployBlueprintTest.java       |  18 +++
 .../brooklyn/rest/BrooklynRestApiLauncher.java  |  18 +++
 .../rest/BrooklynRestApiLauncherTest.java       |  18 +++
 .../BrooklynRestApiLauncherTestFixture.java     |  18 +++
 .../brooklyn/rest/domain/ApplicationTest.java   |  18 +++
 .../rest/domain/LocationSummaryTest.java        |  18 +++
 .../brooklyn/rest/domain/SensorSummaryTest.java |  18 +++
 .../rest/resources/AccessResourceTest.java      |  18 +++
 .../rest/resources/ActivityResourceTest.java    |  18 +++
 .../rest/resources/ApiDocResourceTest.java      |  18 +++
 .../ApplicationResourceIntegrationTest.java     |  18 +++
 .../rest/resources/ApplicationResourceTest.java |  18 +++
 .../rest/resources/CatalogResourceTest.java     |  18 +++
 .../rest/resources/DelegatingPrintStream.java   |  18 +++
 .../rest/resources/DescendantsTest.java         |  18 +++
 .../resources/EntityConfigResourceTest.java     |  18 +++
 .../rest/resources/EntityResourceTest.java      |  18 +++
 .../rest/resources/ErrorResponseTest.java       |  18 +++
 .../rest/resources/LocationResourceTest.java    |  18 +++
 .../rest/resources/PolicyResourceTest.java      |  18 +++
 .../rest/resources/ScriptResourceTest.java      |  21 ++-
 .../rest/resources/SensorResourceTest.java      |  18 +++
 .../rest/resources/ServerResourceTest.java      |  18 +++
 .../rest/resources/UsageResourceTest.java       |  18 +++
 .../rest/resources/VersionResourceTest.java     |  18 +++
 .../rest/testing/BrooklynRestApiTest.java       |  18 +++
 .../rest/testing/BrooklynRestResourceTest.java  |  18 +++
 .../rest/testing/mocks/CapitalizePolicy.java    |  18 +++
 .../rest/testing/mocks/EverythingGroup.java     |  18 +++
 .../rest/testing/mocks/EverythingGroupImpl.java |  18 +++
 .../rest/testing/mocks/RestMockApp.java         |  18 +++
 .../rest/testing/mocks/RestMockAppBuilder.java  |  18 +++
 .../testing/mocks/RestMockSimpleEntity.java     |  18 +++
 .../testing/mocks/RestMockSimplePolicy.java     |  18 +++
 .../util/BrooklynRestResourceUtilsTest.java     |  18 +++
 .../rest/util/EntityLocationUtilsTest.java      |  18 +++
 .../util/NullHttpServletRequestProvider.java    |  18 +++
 .../rest/util/NullServletConfigProvider.java    |  18 +++
 usage/scripts/buildAndTest                      |  17 +++
 usage/scripts/change-version.sh                 |  18 +++
 usage/scripts/grep-in-poms.sh                   |  18 +++
 usage/scripts/release-branch-from-master        |  18 +++
 usage/scripts/release-make                      |  18 +++
 usage/test-support/pom.xml                      |  19 +++
 .../java/brooklyn/test/EntityTestUtils.java     |  18 +++
 .../main/java/brooklyn/test/HttpTestUtils.java  |  18 +++
 .../main/java/brooklyn/test/TestUtils.groovy    |  18 +++
 .../brooklyn/test/TrustingSslSocketFactory.java |  18 +++
 .../main/java/brooklyn/test/WebAppMonitor.java  |  18 +++
 utils/common/pom.xml                            |  19 +++
 .../main/java/brooklyn/config/ConfigKey.java    |  18 +++
 .../main/java/brooklyn/config/ConfigMap.java    |  18 +++
 .../java/brooklyn/config/StringConfigMap.java   |  18 +++
 .../src/main/java/brooklyn/test/Asserts.java    |  63 +++++++++
 .../java/brooklyn/util/CommandLineUtil.java     |  18 +++
 .../brooklyn/util/JavaGroovyEquivalents.java    |  18 +++
 .../src/main/java/brooklyn/util/ShellUtils.java |  18 +++
 .../util/collections/CollectionFunctionals.java |  18 +++
 .../java/brooklyn/util/collections/Jsonya.java  |  18 +++
 .../brooklyn/util/collections/MutableList.java  |  18 +++
 .../brooklyn/util/collections/MutableMap.java   |  18 +++
 .../brooklyn/util/collections/MutableSet.java   |  18 +++
 .../util/collections/SetFromLiveMap.java        |  18 +++
 .../util/collections/TimeWindowedList.java      |  18 +++
 .../util/collections/TimestampedValue.java      |  18 +++
 .../brooklyn/util/crypto/SslTrustUtils.java     |  18 +++
 .../util/crypto/TrustingSslSocketFactory.java   |  18 +++
 .../exceptions/CompoundRuntimeException.java    |  18 +++
 .../brooklyn/util/exceptions/Exceptions.java    |  18 +++
 .../FatalConfigurationRuntimeException.java     |  18 +++
 .../util/exceptions/FatalRuntimeException.java  |  18 +++
 .../exceptions/PropagatedRuntimeException.java  |  18 +++
 .../exceptions/RuntimeInterruptedException.java |  18 +++
 .../main/java/brooklyn/util/git/GithubUrls.java |  18 +++
 .../java/brooklyn/util/guava/Functionals.java   |  18 +++
 .../util/guava/KeyTransformingLoadingCache.java |  18 +++
 .../main/java/brooklyn/util/guava/Maybe.java    |  18 +++
 .../brooklyn/util/guava/MaybeFunctions.java     |  18 +++
 .../util/guava/SerializablePredicate.java       |  18 +++
 .../java/brooklyn/util/guava/TypeTokens.java    |  18 +++
 .../internal/BasicDelegatingSystemProperty.java |  18 +++
 .../util/internal/BooleanSystemProperty.java    |  18 +++
 .../util/internal/BrooklynSystemProperties.java |  18 +++
 .../util/internal/DoubleSystemProperty.java     |  18 +++
 .../util/internal/IntegerSystemProperty.java    |  18 +++
 .../util/internal/StringSystemProperty.java     |  18 +++
 .../util/javalang/AggregateClassLoader.java     |  18 +++
 .../util/javalang/AtomicReferences.java         |  18 +++
 .../java/brooklyn/util/javalang/Boxing.java     |  18 +++
 .../main/java/brooklyn/util/javalang/Enums.java |  18 +++
 .../brooklyn/util/javalang/JavaClassNames.java  |  18 +++
 .../util/javalang/LoadedClassLoader.java        |  18 +++
 .../brooklyn/util/javalang/Reflections.java     |  18 +++
 .../brooklyn/util/javalang/Serializers.java     |  18 +++
 .../util/javalang/StackTraceSimplifier.java     |  18 +++
 .../java/brooklyn/util/javalang/Threads.java    |  18 +++
 .../brooklyn/util/logging/LoggingSetup.java     |  18 +++
 .../util/logging/SimpleOneLineLogFormatter.java |  18 +++
 .../main/java/brooklyn/util/math/BitList.java   |  18 +++
 .../main/java/brooklyn/util/math/BitUtils.java  |  18 +++
 .../java/brooklyn/util/math/MathFunctions.java  |  18 +++
 .../java/brooklyn/util/maven/MavenArtifact.java |  18 +++
 .../brooklyn/util/maven/MavenRetriever.java     |  18 +++
 .../src/main/java/brooklyn/util/net/Cidr.java   |  18 +++
 .../util/net/NetworkMultiAddressUtils.java      |  18 +++
 .../main/java/brooklyn/util/net/Networking.java |  18 +++
 .../main/java/brooklyn/util/net/Protocol.java   |  18 +++
 .../java/brooklyn/util/net/URLParamEncoder.java |  18 +++
 .../src/main/java/brooklyn/util/net/Urls.java   |  18 +++
 .../brooklyn/util/net/UserAndHostAndPort.java   |  18 +++
 .../src/main/java/brooklyn/util/os/Os.java      |  18 +++
 .../main/java/brooklyn/util/pool/BasicPool.java |  18 +++
 .../src/main/java/brooklyn/util/pool/Lease.java |  18 +++
 .../src/main/java/brooklyn/util/pool/Pool.java  |  18 +++
 .../java/brooklyn/util/repeat/Repeater.java     |  18 +++
 .../java/brooklyn/util/ssh/BashCommands.java    |  25 ++--
 .../brooklyn/util/ssh/IptablesCommands.java     |  18 +++
 .../util/stream/DelegatingPrintStream.java      |  18 +++
 .../util/stream/IllegalOutputStream.java        |  18 +++
 .../util/stream/InputStreamSupplier.java        |  18 +++
 .../util/stream/KnownSizeInputStream.java       |  18 +++
 .../brooklyn/util/stream/ReaderInputStream.java |  18 +++
 .../brooklyn/util/stream/StreamGobbler.java     |  18 +++
 .../main/java/brooklyn/util/stream/Streams.java |  18 +++
 .../util/stream/ThreadLocalPrintStream.java     |  18 +++
 .../brooklyn/util/text/ByteSizeStrings.java     |  25 ++--
 .../brooklyn/util/text/ComparableVersion.java   |  18 +++
 .../brooklyn/util/text/FormattedString.java     |  18 +++
 .../java/brooklyn/util/text/Identifiers.java    |  18 +++
 .../java/brooklyn/util/text/KeyValueParser.java |  18 +++
 .../util/text/NaturalOrderComparator.java       |  18 +++
 .../util/text/QuotedStringTokenizer.java        |  18 +++
 .../java/brooklyn/util/text/StringEscapes.java  |  18 +++
 .../brooklyn/util/text/StringFunctions.java     |  18 +++
 .../brooklyn/util/text/StringPredicates.java    |  18 +++
 .../brooklyn/util/text/StringShortener.java     |  18 +++
 .../main/java/brooklyn/util/text/Strings.java   |  17 ++-
 .../java/brooklyn/util/text/WildcardGlobs.java  |  18 +++
 .../java/brooklyn/util/time/CountdownTimer.java |  18 +++
 .../main/java/brooklyn/util/time/Duration.java  |  18 +++
 .../main/java/brooklyn/util/time/Durations.java |  18 +++
 .../src/main/java/brooklyn/util/time/Time.java  |  19 ++-
 .../test/java/brooklyn/test/AssertsTest.java    |  76 +++++++++++
 .../java/brooklyn/test/FixedLocaleTest.java     |  18 +++
 .../brooklyn/util/collections/JsonyaTest.java   |  18 +++
 .../util/collections/MutableListTest.java       |  18 +++
 .../util/collections/MutableMapTest.java        |  18 +++
 .../util/collections/TimeWindowedListTest.java  |  18 +++
 .../guava/KeyTransformingLoadingCacheTest.java  |  18 +++
 .../util/internal/CommandLineUtilTest.java      |  18 +++
 .../util/internal/JavaClassNamesCallerTest.java |  18 +++
 .../java/brooklyn/util/javalang/EnumsTest.java  |  18 +++
 .../util/javalang/JavaClassNamesTest.java       |  18 +++
 .../brooklyn/util/javalang/ReflectionsTest.java |  18 +++
 .../util/javalang/StackTraceSimplifierTest.java |  18 +++
 .../java/brooklyn/util/math/BitListTest.java    |  18 +++
 .../java/brooklyn/util/math/BitUtilsTest.java   |  18 +++
 .../brooklyn/util/math/MathFunctionsTest.java   |  18 +++
 .../brooklyn/util/maven/MavenArtifactTest.java  |  18 +++
 .../test/java/brooklyn/util/net/CidrTest.java   |  18 +++
 .../brooklyn/util/net/NetworkingUtilsTest.java  |  18 +++
 .../test/java/brooklyn/util/net/UrlsTest.java   |  18 +++
 .../util/net/UserAndHostAndPortTest.java        |  18 +++
 .../src/test/java/brooklyn/util/os/OsTest.java  |  18 +++
 .../java/brooklyn/util/pool/BasicPoolTest.java  |  18 +++
 .../java/brooklyn/util/repeat/RepeaterTest.java |  18 +++
 .../brooklyn/util/ssh/IptablesCommandsTest.java |  18 +++
 .../stream/ThreadLocalStdoutStderrTest.java     |  18 +++
 .../brooklyn/util/text/ByteSizeStringsTest.java |  25 ++--
 .../util/text/ComparableVersionTest.java        |  18 +++
 .../brooklyn/util/text/IdentifiersTest.java     |  18 +++
 .../brooklyn/util/text/KeyValueParserTest.java  |  19 ++-
 .../util/text/NaturalOrderComparatorTest.java   |  18 +++
 .../util/text/QuotedStringTokenizerTest.java    |  22 +++-
 .../brooklyn/util/text/StringEscapesTest.java   |  18 +++
 .../brooklyn/util/text/StringFunctionsTest.java |  18 +++
 .../brooklyn/util/text/StringShortenerTest.java |  18 +++
 .../java/brooklyn/util/text/StringsTest.java    |  17 ++-
 .../brooklyn/util/text/WildcardGlobsTest.java   |  18 +++
 .../brooklyn/util/time/CountdownTimerTest.java  |  18 +++
 .../java/brooklyn/util/time/DurationTest.java   |  18 +++
 .../test/java/brooklyn/util/time/TimeTest.java  |  18 +++
 utils/groovy/pom.xml                            |  19 +++
 .../java/brooklyn/util/GroovyJavaMethods.groovy |  18 +++
 .../brooklyn/util/internal/JavadocDummy.java    |  18 +++
 .../brooklyn/util/internal/LanguageUtils.groovy |  18 +++
 .../brooklyn/util/internal/TimeExtras.groovy    |  18 +++
 .../util/internal/LanguageUtilsTest.groovy      |  18 +++
 .../util/internal/PojoTestingFields.java        |  18 +++
 .../util/internal/TimeExtrasTest.groovy         |  18 +++
 utils/jmx/jmxmp-ssl-agent/pom.xml               |  21 ++-
 .../brooklyn/util/jmx/jmxmp/JmxmpAgent.java     |  18 +++
 .../util/jmx/jmxmp/JmxmpAgentSslTest.java       |  18 +++
 .../brooklyn/util/jmx/jmxmp/JmxmpClient.java    |  18 +++
 utils/jmx/jmxrmi-agent/pom.xml                  |  19 +++
 .../brooklyn/util/jmx/jmxrmi/JmxRmiAgent.java   |  18 ++-
 .../brooklyn/util/jmx/jmxrmi/JmxRmiClient.java  |  18 +++
 utils/rest-swagger/pom.xml                      |  23 +++-
 .../main/java/brooklyn/rest/apidoc/Apidoc.java  |  18 +++
 .../brooklyn/rest/apidoc/ApidocEndpoint.java    |  18 +++
 .../apidoc/ApidocHelpMessageBodyWriter.java     |  18 +++
 .../brooklyn/rest/apidoc/ApidocResource.java    |  18 +++
 utils/test-support/pom.xml                      |  19 +++
 .../brooklyn/test/BrooklynLeakListener.java     |  18 +++
 .../brooklyn/test/LoggingVerboseReporter.java   |  18 +++
 .../main/java/brooklyn/test/StatusListener.java |  18 +++
 .../java/brooklyn/test/VerboseReporter.java     |  18 +++
 .../brooklyn/logback-appender-file.xml          |  19 +++
 .../src/main/resources/logback-test.xml         |  19 +++
 2427 files changed, 44160 insertions(+), 1589 deletions(-)
----------------------------------------------------------------------