brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [47/64] [abbrv] incubator-brooklyn git commit: BROOKLYN-162 - apply org.apache package prefix to utils-common
Date Tue, 18 Aug 2015 15:03:56 GMT
BROOKLYN-162 - apply org.apache package prefix to utils-common


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

Branch: refs/heads/master
Commit: cf2f7a9377d7b6f713d3cac12af2891ff8a49a38
Parents: 207ffa8
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Tue Aug 18 13:14:41 2015 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Tue Aug 18 14:51:55 2015 +0100

----------------------------------------------------------------------
 .../api/basic/AbstractBrooklynObjectSpec.java   |   5 +-
 .../apache/brooklyn/api/basic/BrooklynType.java |   2 +-
 .../api/basic/internal/ApiObjectsFactory.java   |   2 +-
 .../org/apache/brooklyn/api/entity/Entity.java  |   7 +-
 .../apache/brooklyn/api/entity/EntityType.java  |   3 +-
 .../brooklyn/api/entity/basic/EntityLocal.java  |   7 +-
 .../api/entity/proxying/EntitySpec.java         |   7 +-
 .../api/entity/rebind/RebindManager.java        |   3 +-
 .../brooklyn/api/entity/trait/Configurable.java |   5 +-
 .../apache/brooklyn/api/location/Location.java  |   5 +-
 .../brooklyn/api/location/LocationRegistry.java |   2 +-
 .../brooklyn/api/location/LocationSpec.java     |   5 +-
 .../brooklyn/api/location/MachineLocation.java  |   2 +-
 .../api/management/ManagementContext.java       |   5 +-
 .../apache/brooklyn/api/management/Task.java    |   4 +-
 .../api/management/TaskQueueingContext.java     |   2 +-
 .../BrooklynClassLoadingContext.java            |   3 +-
 .../api/management/ha/ManagementNodeState.java  |   2 +-
 .../ha/ManagementPlaneSyncRecordPersister.java  |   3 +-
 .../api/mementos/BrooklynMementoPersister.java  |   3 +-
 .../brooklyn/api/mementos/EntityMemento.java    |   3 +-
 .../apache/brooklyn/api/policy/Enricher.java    |   3 +-
 .../brooklyn/api/policy/EnricherSpec.java       |   5 +-
 .../org/apache/brooklyn/api/policy/Policy.java  |   3 +-
 .../apache/brooklyn/api/policy/PolicySpec.java  |   5 +-
 .../brooklyn/camp/spi/AbstractResource.java     |   7 +-
 .../spi/collection/BasicResourceLookup.java     |   3 +-
 .../apache/brooklyn/camp/spi/pdp/Artifact.java  |   5 +-
 .../brooklyn/camp/spi/pdp/ArtifactContent.java  |   3 +-
 .../camp/spi/pdp/ArtifactRequirement.java       |   5 +-
 .../brooklyn/camp/spi/pdp/DeploymentPlan.java   |   5 +-
 .../apache/brooklyn/camp/spi/pdp/Service.java   |   5 +-
 .../camp/spi/pdp/ServiceCharacteristic.java     |   5 +-
 .../brooklyn/camp/spi/resolve/PdpProcessor.java |   9 +-
 .../interpret/PlanInterpretationNode.java       |   7 +-
 .../apache/brooklyn/camp/util/yaml/Yamls.java   |   4 +-
 .../pdp/DeploymentPlanToyInterpreterTest.java   |   7 +-
 .../brooklyn/camp/spi/pdp/PdpYamlTest.java      |   3 +-
 .../camp/test/mock/web/MockWebPlatform.java     |   3 +-
 .../camp/server/dto/DtoCustomAttributes.java    |   2 +-
 .../brooklyn/camp/server/dto/ResourceDto.java   |   3 +-
 .../brooklyn/camp/server/rest/CampServer.java   |   5 +-
 .../resource/AssemblyTemplateRestResource.java  |   3 +-
 .../camp/server/rest/util/CampJsons.java        |   2 +-
 .../camp/server/rest/util/DtoFactory.java       |   5 +-
 .../brooklyn/camp/server/dto/BasicDtoTest.java  |   5 +-
 .../brooklyn/camp/server/dto/LinkDtoTest.java   |   3 +-
 .../test/fixture/AbstractRestResourceTest.java  |   5 +-
 .../src/main/java/brooklyn/BrooklynVersion.java |   7 +-
 .../brooklyn/config/BrooklynProperties.java     |  14 +-
 .../brooklyn/config/BrooklynServerConfig.java   |   6 +-
 .../brooklyn/config/BrooklynServerPaths.java    |  18 +-
 .../config/BrooklynServiceAttributes.java       |   3 +-
 .../java/brooklyn/config/ConfigPredicates.java  |   3 +-
 .../main/java/brooklyn/config/ConfigUtils.java  |   5 +-
 .../java/brooklyn/config/WrappedConfigKey.java  |   5 +-
 .../config/internal/AbstractConfigMapImpl.java  |   6 +-
 .../brooklyn/config/render/RendererHints.java   |   2 +-
 .../main/java/brooklyn/enricher/Enrichers.java  |  10 +-
 .../enricher/basic/AbstractAggregator.java      |   6 +-
 .../enricher/basic/AbstractEnricher.java        |   2 +-
 .../basic/AbstractMultipleSensorAggregator.java |   2 +-
 .../enricher/basic/AbstractTransformer.java     |   2 +-
 .../brooklyn/enricher/basic/Aggregator.java     |  10 +-
 .../java/brooklyn/enricher/basic/Combiner.java  |   6 +-
 .../enricher/basic/EnricherTypeSnapshot.java    |   3 +-
 .../java/brooklyn/enricher/basic/Joiner.java    |   8 +-
 .../brooklyn/enricher/basic/Propagator.java     |   4 +-
 .../basic/SensorTransformingEnricher.java       |   5 +-
 .../brooklyn/enricher/basic/Transformer.java    |   4 +-
 .../brooklyn/enricher/basic/UpdatingMap.java    |   6 +-
 .../YamlRollingTimeWindowMeanEnricher.java      |   4 +-
 .../basic/YamlTimeWeightedDeltaEnricher.java    |   4 +-
 .../entity/basic/AbstractApplication.java       |  10 +-
 .../AbstractConfigurableEntityFactory.java      |   5 +-
 .../brooklyn/entity/basic/AbstractEntity.java   |  19 +-
 .../brooklyn/entity/basic/AbstractGroup.java    |   6 +-
 .../entity/basic/AbstractGroupImpl.java         |   3 +-
 .../java/brooklyn/entity/basic/Attributes.java  |   2 +-
 .../java/brooklyn/entity/basic/BasicGroup.java  |   2 +-
 .../brooklyn/entity/basic/BasicStartable.java   |   2 +-
 .../entity/basic/BasicStartableImpl.java        |   2 +-
 .../entity/basic/BrooklynConfigKeys.java        |   6 +-
 .../entity/basic/BrooklynShutdownHooks.java     |  14 +-
 .../brooklyn/entity/basic/BrooklynTaskTags.java |  11 +-
 .../java/brooklyn/entity/basic/ConfigKeys.java  |   6 +-
 .../basic/ConfigMapViewWithStringKeys.java      |   7 +-
 .../entity/basic/ConfigurableEntityFactory.java |   3 +-
 .../java/brooklyn/entity/basic/DataEntity.java  |   2 +-
 .../brooklyn/entity/basic/DynamicGroup.java     |   3 +-
 .../brooklyn/entity/basic/DynamicGroupImpl.java |   2 +-
 .../entity/basic/EffectorStartableImpl.java     |   2 +-
 .../java/brooklyn/entity/basic/Entities.java    |  19 +-
 .../brooklyn/entity/basic/EntityAdjuncts.java   |   4 +-
 .../brooklyn/entity/basic/EntityConfigMap.java  |   8 +-
 .../entity/basic/EntityDynamicType.java         |   6 +-
 .../brooklyn/entity/basic/EntityFunctions.java  |   5 +-
 .../brooklyn/entity/basic/EntityInternal.java   |   3 +-
 .../brooklyn/entity/basic/EntityPredicates.java |  13 +-
 .../java/brooklyn/entity/basic/EntityTasks.java |   4 +-
 .../basic/EntityTransientCopyInternal.java      |   6 +-
 .../entity/basic/EntityTypeSnapshot.java        |   5 +-
 .../java/brooklyn/entity/basic/Lifecycle.java   |   2 +-
 .../brooklyn/entity/basic/MethodEffector.java   |   2 +-
 .../java/brooklyn/entity/basic/QuorumCheck.java |   6 +-
 .../entity/basic/ServiceStateLogic.java         |  24 +-
 .../drivers/ReflectiveEntityDriverFactory.java  |  11 +-
 .../downloads/BasicDownloadRequirement.java     |   3 +-
 .../drivers/downloads/BasicDownloadTargets.java |   3 +-
 .../downloads/BasicDownloadsManager.java        |   5 +-
 .../DownloadProducerFromCloudsoftRepo.java      |   4 +-
 .../DownloadProducerFromLocalRepo.java          |   4 +-
 .../DownloadProducerFromProperties.java         |   4 +-
 .../drivers/downloads/DownloadSubstituters.java |   4 +-
 .../drivers/downloads/FilenameProducers.java    |   3 +-
 .../entity/effector/AddChildrenEffector.java    |   2 +-
 .../brooklyn/entity/effector/AddEffector.java   |   4 +-
 .../brooklyn/entity/effector/AddSensor.java     |   8 +-
 .../brooklyn/entity/effector/EffectorTasks.java |   5 +-
 .../brooklyn/entity/effector/Effectors.java     |   6 +-
 .../group/AbstractMembershipTrackingPolicy.java |   6 +-
 .../brooklyn/entity/group/DynamicCluster.java   |   4 +-
 .../entity/group/DynamicClusterImpl.java        |  19 +-
 .../brooklyn/entity/group/DynamicFabric.java    |   2 +-
 .../entity/group/DynamicFabricImpl.java         |   4 +-
 .../entity/group/DynamicMultiGroup.java         |   2 +-
 .../entity/group/DynamicMultiGroupImpl.java     |   2 +-
 .../entity/group/DynamicRegionsFabricImpl.java  |   2 +-
 .../brooklyn/entity/group/QuarantineGroup.java  |   2 +-
 .../entity/group/QuarantineGroupImpl.java       |   4 +-
 .../CriticalCauseZoneFailureDetector.java       |   3 +-
 .../ProportionalZoneFailureDetector.java        |   3 +-
 .../proxying/BasicEntityTypeRegistry.java       |   3 +-
 .../entity/proxying/InternalEntityFactory.java  |  10 +-
 .../entity/proxying/InternalFactory.java        |   7 +-
 .../proxying/InternalLocationFactory.java       |   7 +-
 .../entity/proxying/InternalPolicyFactory.java  |   6 +-
 .../AbstractBrooklynObjectRebindSupport.java    |   4 +-
 .../rebind/ActivePartialRebindIteration.java    |   6 +-
 .../rebind/BasicCatalogItemRebindSupport.java   |   3 +-
 .../entity/rebind/BasicEntityRebindSupport.java |   4 +-
 .../rebind/BasicLocationRebindSupport.java      |   5 +-
 .../rebind/InitialFullRebindIteration.java      |   2 +-
 .../rebind/PeriodicDeltaChangeListener.java     |  16 +-
 .../rebind/PersistenceExceptionHandlerImpl.java |   3 +-
 .../entity/rebind/RebindContextImpl.java        |   3 +-
 .../rebind/RebindExceptionHandlerImpl.java      |   9 +-
 .../brooklyn/entity/rebind/RebindIteration.java |  19 +-
 .../entity/rebind/RebindManagerImpl.java        |  16 +-
 .../entity/rebind/dto/BasicEntityMemento.java   |   4 +-
 .../entity/rebind/dto/MementosGenerators.java   |   6 +-
 .../BrooklynMementoPersisterToObjectStore.java  |  16 +-
 .../persister/BrooklynPersistenceUtils.java     |  11 +-
 .../rebind/persister/FileBasedObjectStore.java  |  14 +-
 .../persister/FileBasedStoreObjectAccessor.java |   7 +-
 .../persister/PersistenceActivityMetrics.java   |   6 +-
 .../persister/PersistenceObjectStore.java       |   3 +-
 .../persister/StoreObjectAccessorLocking.java   |   7 +-
 .../rebind/persister/XmlMementoSerializer.java  |   4 +-
 .../dto/BasicManagementNodeSyncRecord.java      |   2 +-
 .../dto/ManagementPlaneSyncRecordImpl.java      |   3 +-
 .../rebind/transformer/CompoundTransformer.java |   4 +-
 .../transformer/CompoundTransformerLoader.java  |   4 +-
 .../DeleteOrphanedLocationsTransformer.java     |   6 +-
 .../java/brooklyn/entity/trait/Startable.java   |   2 +-
 .../brooklyn/entity/trait/StartableMethods.java |   4 +-
 .../basic/AbstractCollectionConfigKey.java      |   7 +-
 .../basic/AbstractStructuredConfigKey.java      |   5 +-
 .../java/brooklyn/event/basic/AttributeMap.java |   2 +-
 .../basic/AttributeSensorAndConfigKey.java      |   4 +-
 .../basic/BasicAttributeSensorAndConfigKey.java |   3 +-
 .../brooklyn/event/basic/BasicConfigKey.java    |   9 +-
 .../java/brooklyn/event/basic/BasicSensor.java  |   3 +-
 .../event/basic/DependentConfiguration.java     |  28 +-
 .../brooklyn/event/basic/ListConfigKey.java     |   3 +-
 .../java/brooklyn/event/basic/MapConfigKey.java |   7 +-
 .../basic/PortAttributeSensorAndConfigKey.java  |   5 +-
 .../main/java/brooklyn/event/basic/Sensors.java |   8 +-
 .../java/brooklyn/event/basic/SetConfigKey.java |   3 +-
 .../event/basic/SubElementConfigKey.java        |   5 +-
 ...platedStringAttributeSensorAndConfigKey.java |   2 +-
 .../java/brooklyn/event/feed/AbstractFeed.java  |   6 +-
 .../event/feed/AttributePollHandler.java        |   2 +-
 .../java/brooklyn/event/feed/FeedConfig.java    |   8 +-
 .../java/brooklyn/event/feed/PollConfig.java    |   5 +-
 .../main/java/brooklyn/event/feed/Poller.java   |   4 +-
 .../event/feed/function/FunctionFeed.java       |   4 +-
 .../event/feed/function/FunctionPollConfig.java |   4 +-
 .../java/brooklyn/event/feed/http/HttpFeed.java |   4 +-
 .../event/feed/http/HttpPollConfig.java         |   6 +-
 .../event/feed/http/HttpValueFunctions.java     |   3 +-
 .../brooklyn/event/feed/http/JsonFunctions.java |   6 +-
 .../brooklyn/event/feed/shell/ShellFeed.java    |   2 +-
 .../event/feed/shell/ShellPollConfig.java       |   2 +-
 .../java/brooklyn/event/feed/ssh/SshFeed.java   |   5 +-
 .../brooklyn/event/feed/ssh/SshPollConfig.java  |   4 +-
 .../windows/WindowsPerformanceCounterFeed.java  |   7 +-
 .../brooklyn/basic/AbstractBrooklynObject.java  |   2 +-
 .../brooklyn/basic/BasicConfigurableObject.java |   8 +-
 .../brooklyn/basic/BrooklynDynamicType.java     |   8 +-
 .../brooklyn/basic/BrooklynObjectInternal.java  |   7 +-
 .../brooklyn/basic/BrooklynTypeSnapshot.java    |   5 +-
 .../apache/brooklyn/basic/BrooklynTypes.java    |   4 +-
 .../catalog/internal/BasicBrooklynCatalog.java  |  29 +-
 .../catalog/internal/CatalogClasspathDo.java    |  12 +-
 .../core/catalog/internal/CatalogDo.java        |  13 +-
 .../core/catalog/internal/CatalogDto.java       |  11 +-
 .../core/catalog/internal/CatalogDtoUtils.java  |   3 +-
 .../catalog/internal/CatalogInitialization.java |  16 +-
 .../catalog/internal/CatalogItemComparator.java |   3 +-
 .../core/catalog/internal/CatalogItemDo.java    |   4 +-
 .../internal/CatalogItemDtoAbstract.java        |   6 +-
 .../core/catalog/internal/CatalogUtils.java     |   8 +-
 .../core/internal/BrooklynInitialization.java   |   3 +-
 .../AbstractBrooklynClassLoadingContext.java    |   3 +-
 .../BrooklynClassLoadingContextSequential.java  |   9 +-
 .../JavaBrooklynClassLoadingContext.java        |   5 +-
 .../OsgiBrooklynClassLoadingContext.java        |   3 +-
 .../management/entitlement/Entitlements.java    |   8 +-
 .../entitlement/PerUserEntitlementManager.java  |   6 +-
 .../entitlement/WebEntitlementContext.java      |   3 +-
 .../core/management/ha/BasicMasterChooser.java  |   7 +-
 .../ha/HighAvailabilityManagerImpl.java         |  16 +-
 ...ntPlaneSyncRecordPersisterToObjectStore.java |   8 +-
 .../core/management/ha/MasterChooser.java       |   3 +-
 .../core/management/ha/OsgiManager.java         |  20 +-
 .../internal/AbstractManagementContext.java     |   8 +-
 .../internal/AsyncCollectionChangeAdapter.java  |   5 +-
 .../internal/BasicSubscriptionContext.java      |   2 +-
 .../internal/BrooklynGarbageCollector.java      |  16 +-
 .../core/management/internal/EffectorUtils.java |  10 +-
 .../internal/EntityChangeListener.java          |   3 +-
 .../internal/EntityManagementSupport.java       |   4 +-
 .../internal/EntityManagementUtils.java         |  14 +-
 .../management/internal/LocalEntityManager.java |  10 +-
 .../internal/LocalLocationManager.java          |   9 +-
 .../internal/LocalManagementContext.java        |   8 +-
 .../internal/LocalSubscriptionManager.java      |  10 +-
 .../management/internal/LocalUsageManager.java  |   7 +-
 .../internal/ManagementContextInternal.java     |   2 +-
 .../NonDeploymentManagementContext.java         |   6 +-
 .../core/management/internal/Subscription.java  |   3 +-
 .../core/management/internal/UsageManager.java  |   4 +-
 .../policy/basic/AbstractEntityAdjunct.java     |  12 +-
 .../brooklyn/core/policy/basic/AdjunctType.java |   5 +-
 .../core/policy/basic/ConfigMapImpl.java        |   4 +-
 .../core/policy/basic/PolicyTypeSnapshot.java   |   3 +-
 .../core/util/BrooklynMavenArtifacts.java       |   7 +-
 .../core/util/BrooklynNetworkUtils.java         |   5 +-
 .../brooklyn/core/util/ResourceUtils.java       |  15 +-
 .../brooklyn/core/util/config/ConfigBag.java    |  10 +-
 .../core/util/crypto/FluentKeySigner.java       |   3 +-
 .../brooklyn/core/util/crypto/SecureKeys.java   |   9 +-
 .../brooklyn/core/util/file/ArchiveBuilder.java |   5 +-
 .../brooklyn/core/util/file/ArchiveTasks.java   |   3 +-
 .../brooklyn/core/util/file/ArchiveUtils.java   |  17 +-
 .../brooklyn/core/util/flags/FlagUtils.java     |   8 +-
 .../core/util/flags/MethodCoercions.java        |  12 +-
 .../brooklyn/core/util/flags/TypeCoercions.java |  32 +-
 .../brooklyn/core/util/http/HttpTool.java       |  11 +-
 .../core/util/http/HttpToolResponse.java        |   8 +-
 .../util/internal/ConfigKeySelfExtracting.java  |   3 +-
 .../brooklyn/core/util/internal/Repeater.java   |  12 +-
 .../ssh/BackoffLimitedRetryHandler.java         |   3 +-
 .../util/internal/ssh/ShellAbstractTool.java    |  19 +-
 .../core/util/internal/ssh/ShellTool.java       |   7 +-
 .../core/util/internal/ssh/SshAbstractTool.java |   4 +-
 .../core/util/internal/ssh/SshTool.java         |   7 +-
 .../core/util/internal/ssh/cli/SshCliTool.java  |   8 +-
 .../util/internal/ssh/process/ProcessTool.java  |  15 +-
 .../core/util/internal/ssh/sshj/SshjTool.java   |  21 +-
 .../core/util/javalang/ReflectionScanner.java   |   3 +-
 .../core/util/javalang/UrlClassLoader.java      |   3 +-
 .../core/util/mutex/SemaphoreForTasks.java      |   7 +-
 .../core/util/mutex/SemaphoreWithOwners.java    |   2 +-
 .../apache/brooklyn/core/util/osgi/Osgis.java   |  25 +-
 .../core/util/task/BasicExecutionManager.java   |   7 +-
 .../brooklyn/core/util/task/BasicTask.java      |  18 +-
 .../brooklyn/core/util/task/CompoundTask.java   |   2 +-
 .../core/util/task/DynamicSequentialTask.java   |   8 +-
 .../brooklyn/core/util/task/DynamicTasks.java   |   4 +-
 .../brooklyn/core/util/task/ForwardingTask.java |   3 +-
 .../brooklyn/core/util/task/ParallelTask.java   |   5 +-
 .../brooklyn/core/util/task/ScheduledTask.java  |   5 +-
 .../brooklyn/core/util/task/TaskBuilder.java    |   9 +-
 .../brooklyn/core/util/task/TaskInternal.java   |   3 +-
 .../apache/brooklyn/core/util/task/Tasks.java   |  13 +-
 .../brooklyn/core/util/task/ValueResolver.java  |  14 +-
 .../core/util/task/ssh/SshFetchTaskWrapper.java |   5 +-
 .../core/util/task/ssh/SshPutTaskFactory.java   |   5 +-
 .../brooklyn/core/util/task/ssh/SshTasks.java   |  13 +-
 .../util/task/system/ProcessTaskFactory.java    |   4 +-
 .../core/util/task/system/ProcessTaskStub.java  |   5 +-
 .../util/task/system/ProcessTaskWrapper.java    |   4 +-
 .../internal/AbstractProcessTaskFactory.java    |   7 +-
 .../system/internal/ExecWithLoggingHelpers.java |  13 +-
 .../internal/SystemProcessTaskFactory.java      |   3 +-
 .../core/util/text/DataUriSchemeParser.java     |   2 +-
 .../core/util/text/TemplateProcessor.java       |   6 +-
 .../xstream/EnumCaseForgivingConverter.java     |   2 +-
 .../util/xstream/Inet4AddressConverter.java     |   2 +-
 .../core/util/xstream/MutableSetConverter.java  |   2 +-
 .../util/xstream/StringKeyMapConverter.java     |   7 +-
 .../core/util/xstream/XmlSerializer.java        |   6 +-
 .../brooklyn/core/util/xstream/XmlUtil.java     |   3 +-
 .../location/access/BrooklynAccessUtils.java    |  11 +-
 .../location/access/PortForwardManager.java     |   2 +-
 .../access/PortForwardManagerClient.java        |   7 +-
 .../location/access/PortForwardManagerImpl.java |   4 +-
 .../location/basic/AbstractLocation.java        |  15 +-
 .../basic/AbstractLocationResolver.java         |   5 +-
 .../AggregatingMachineProvisioningLocation.java |   3 +-
 .../location/basic/BasicLocationDefinition.java |   3 +-
 .../location/basic/BasicLocationRegistry.java   |  20 +-
 .../location/basic/BasicMachineDetails.java     |   3 +-
 .../location/basic/ByonLocationResolver.java    |  10 +-
 .../basic/DeprecatedKeysMappingBuilder.java     |   3 +-
 .../FixedListMachineProvisioningLocation.java   |  15 +-
 .../location/basic/HostLocationResolver.java    |   9 +-
 .../LocalhostMachineProvisioningLocation.java   |  16 +-
 .../location/basic/LocationConfigKeys.java      |   5 +-
 .../location/basic/LocationConfigUtils.java     |  19 +-
 .../location/basic/LocationInternal.java        |   6 +-
 .../location/basic/LocationPredicates.java      |   5 +-
 ...ocationPropertiesFromBrooklynProperties.java |   4 +-
 .../location/basic/LocationTypeSnapshot.java    |   3 +-
 .../brooklyn/location/basic/Locations.java      |   6 +-
 .../brooklyn/location/basic/Machines.java       |   5 +-
 .../brooklyn/location/basic/MultiLocation.java  |  12 +-
 .../location/basic/MultiLocationResolver.java   |   9 +-
 .../location/basic/NamedLocationResolver.java   |   3 +-
 .../basic/SingleMachineLocationResolver.java    |   7 +-
 .../location/basic/SshMachineLocation.java      |  30 +-
 .../location/basic/SupportsPortForwarding.java  |   2 +-
 .../location/basic/WinRmMachineLocation.java    |  10 +-
 ...bstractCloudMachineProvisioningLocation.java |   3 +-
 .../location/cloud/CloudLocationConfig.java     |   2 +-
 .../cloud/names/AbstractCloudMachineNamer.java  |   5 +-
 .../cloud/names/BasicCloudMachineNamer.java     |   7 +-
 .../cloud/names/CustomMachineNamer.java         |   5 +-
 .../location/dynamic/DynamicLocation.java       |   2 +-
 .../location/dynamic/LocationOwner.java         |   2 +-
 .../location/geo/GeoBytesHostGeoLookup.java     |   3 +-
 .../brooklyn/location/geo/HostGeoInfo.java      |   7 +-
 .../location/geo/LocalhostExternalIpLoader.java |   9 +-
 .../location/geo/MaxMind2HostGeoLookup.java     |   7 +-
 .../location/geo/UtraceHostGeoLookup.java       |  11 +-
 .../test/java/brooklyn/BrooklynVersionTest.java |   3 +-
 .../brooklyn/camp/lite/CampYamlLiteTest.java    |   4 +-
 .../camp/lite/TestAppAssemblyInstantiator.java  |   2 +-
 .../config/BrooklynPropertiesBuilderTest.java   |   3 +-
 .../BrooklynPropertiesFromGroovyTest.groovy     |   2 +-
 .../brooklyn/config/BrooklynPropertiesTest.java |   2 +-
 .../java/brooklyn/config/ConfigUtilsTest.java   |   3 +-
 .../enricher/CustomAggregatingEnricherTest.java |   3 +-
 .../java/brooklyn/enricher/EnrichersTest.java   |  14 +-
 ...SensorPropagatingEnricherDeprecatedTest.java |   6 +-
 .../enricher/SensorPropagatingEnricherTest.java |   8 +-
 .../TransformingEnricherDeprecatedTest.groovy   |   2 +-
 .../enricher/TransformingEnricherTest.java      |   3 +-
 .../enricher/basic/BasicEnricherTest.java       |   4 +-
 .../enricher/basic/EnricherConfigTest.java      |   2 +-
 .../YamlRollingTimeWindowMeanEnricherTest.java  |   2 +-
 .../java/brooklyn/entity/EffectorSayHiTest.java |   2 +-
 .../java/brooklyn/entity/SetFromFlagTest.java   |   3 +-
 .../entity/basic/AbstractEntityLegacyTest.java  |   3 +-
 .../brooklyn/entity/basic/AttributeMapTest.java |   6 +-
 .../entity/basic/BasicStartableTest.java        |   3 +-
 .../entity/basic/BrooklynShutdownHooksTest.java |   2 +-
 .../basic/ConfigEntityInheritanceTest.java      |   4 +-
 .../brooklyn/entity/basic/ConfigKeysTest.java   |   4 +-
 .../brooklyn/entity/basic/ConfigMapTest.java    |   6 +-
 .../brooklyn/entity/basic/DataEntityTest.java   |   5 +-
 .../basic/DependentConfigurationTest.java       |  14 +-
 .../entity/basic/DynamicEntityTest.java         |   2 +-
 .../brooklyn/entity/basic/DynamicGroupTest.java |  12 +-
 .../brooklyn/entity/basic/EntitiesTest.java     |   5 +-
 .../basic/EntityConfigMapUsageLegacyTest.java   |   7 +-
 .../entity/basic/EntityConfigMapUsageTest.java  |   5 +-
 .../brooklyn/entity/basic/EntityConfigTest.java |   3 +-
 .../entity/basic/EntityLocationsTest.java       |   2 +-
 .../entity/basic/EntityPredicatesTest.java      |   2 +-
 .../entity/basic/EntityRegistrationTest.java    |   4 +-
 .../brooklyn/entity/basic/EntitySpecTest.java   |   5 +-
 .../entity/basic/EntitySubscriptionTest.java    |   3 +-
 .../brooklyn/entity/basic/EntityTypeTest.java   |   4 +-
 .../basic/MapConfigKeyAndFriendsMoreTest.java   |   6 +-
 ...apListAndOtherStructuredConfigKeyTest.groovy |   4 +-
 .../entity/basic/OwnedChildrenTest.java         |   2 +-
 .../entity/basic/PolicyRegistrationTest.java    |   2 +-
 .../entity/basic/ServiceStateLogicTest.java     |   6 +-
 .../drivers/BasicEntityDriverManagerTest.java   |   3 +-
 .../drivers/EntityDriverRegistryTest.java       |   3 +-
 .../ReflectiveEntityDriverFactoryTest.java      |   2 +-
 .../RegistryEntityDriverFactoryTest.java        |   3 +-
 .../entity/effector/EffectorBasicTest.java      |   5 +-
 .../effector/EffectorConcatenateTest.java       |   2 +-
 .../entity/effector/EffectorTaskTest.java       |   4 +-
 .../entity/group/DynamicClusterTest.java        |  13 +-
 ...DynamicClusterWithAvailabilityZonesTest.java |   5 +-
 .../entity/group/DynamicFabricTest.java         |   9 +-
 .../entity/group/DynamicMultiGroupTest.java     |   3 +-
 .../entity/group/DynamicRegionsFabricTest.java  |   5 +-
 .../entity/group/GroupPickUpEntitiesTest.java   |   4 +-
 .../java/brooklyn/entity/group/GroupTest.java   |   3 +-
 .../group/MembershipTrackingPolicyTest.java     |   5 +-
 .../BalancingNodePlacementStrategyTest.java     |   3 +-
 .../ProportionalZoneFailureDetectorTest.java    |   3 +-
 .../java/brooklyn/entity/hello/HelloEntity.java |   2 +-
 .../entity/hello/LocalEntitiesTest.java         |   7 +-
 .../ApplicationBuilderOverridingTest.java       |   2 +-
 .../entity/proxying/EntityManagerTest.java      |   4 +-
 .../entity/proxying/EntityProxyTest.java        |   2 +-
 .../entity/rebind/ActivePartialRebindTest.java  |   2 +-
 .../rebind/ActivePartialRebindVersionTest.java  |   2 +-
 .../java/brooklyn/entity/rebind/Dumpers.java    |   7 +-
 .../entity/rebind/RebindDynamicGroupTest.java   |   2 +-
 .../entity/rebind/RebindEnricherTest.java       |  11 +-
 .../rebind/RebindEntityDynamicTypeInfoTest.java |   4 +-
 .../entity/rebind/RebindEntityTest.java         |  13 +-
 .../entity/rebind/RebindFailuresTest.java       |   8 +-
 .../brooklyn/entity/rebind/RebindFeedTest.java  |  15 +-
 .../entity/rebind/RebindFeedWithHaTest.java     |   5 +-
 .../brooklyn/entity/rebind/RebindGroupTest.java |   2 +-
 .../entity/rebind/RebindLocationTest.java       |   7 +-
 .../entity/rebind/RebindManagerSorterTest.java  |   2 +-
 .../entity/rebind/RebindPolicyTest.java         |   9 +-
 .../entity/rebind/RebindTestFixture.java        |   8 +-
 .../brooklyn/entity/rebind/RebindTestUtils.java |   8 +-
 .../BrooklynMementoPersisterFileBasedTest.java  |   6 +-
 ...ntoPersisterInMemorySizeIntegrationTest.java |   6 +-
 .../BrooklynMementoPersisterInMemoryTest.java   |   2 +-
 .../persister/FileBasedObjectStoreTest.java     |   4 +-
 .../FileBasedStoreObjectAccessorWriterTest.java |   4 +-
 .../rebind/persister/InMemoryObjectStore.java   |   5 +-
 .../rebind/persister/ListeningObjectStore.java  |   9 +-
 ...nceStoreObjectAccessorWriterTestFixture.java |   6 +-
 .../persister/XmlMementoSerializerTest.java     |   6 +-
 .../transformer/CompoundTransformerTest.java    |   6 +-
 .../transformer/impl/XsltTransformerTest.java   |   3 +-
 .../brooklyn/entity/trait/FailingEntity.java    |   2 +-
 .../entity/trait/FailingEntityImpl.java         |   2 +-
 .../java/brooklyn/event/feed/PollerTest.java    |   6 +-
 .../event/feed/function/FunctionFeedTest.java   |   3 +-
 .../feed/http/HttpFeedIntegrationTest.java      |   2 +-
 .../brooklyn/event/feed/http/HttpFeedTest.java  |  12 +-
 .../event/feed/http/JsonFunctionsTest.java      |  11 +-
 .../feed/shell/ShellFeedIntegrationTest.java    |   5 +-
 .../event/feed/ssh/SshFeedIntegrationTest.java  |  15 +-
 .../WindowsPerformanceCounterFeedLiveTest.java  |   2 +-
 .../WindowsPerformanceCounterFeedTest.java      |   2 +-
 .../longevity/EntityCleanupLongevityTest.java   |   3 +-
 .../EntityCleanupLongevityTestFixture.java      |   5 +-
 .../qa/longevity/EntityCleanupTest.java         |   3 +-
 .../qa/performance/AbstractPerformanceTest.java |   3 +-
 .../qa/performance/EntityPerformanceTest.java   |   6 +-
 .../EntityPersistencePerformanceTest.java       |   4 +-
 .../FilePersistencePerformanceTest.java         |   6 +-
 .../SubscriptionPerformanceTest.java            |   5 +-
 .../qa/performance/TaskPerformanceTest.java     |   7 +-
 .../test/java/brooklyn/test/HttpService.java    |   5 +-
 .../brooklyn/test/TestHttpRequestHandler.java   |   3 +-
 .../test/java/brooklyn/test/TestHttpServer.java |   7 +-
 .../java/brooklyn/test/policy/TestEnricher.java |   2 +-
 .../java/brooklyn/test/policy/TestPolicy.java   |   2 +-
 .../core/catalog/internal/CatalogDtoTest.java   |   2 +-
 .../core/catalog/internal/CatalogScanTest.java  |   4 +-
 .../ConcurrentMapAcceptingNullValsTest.java     |   7 +-
 .../AcmeEntitlementManagerTestFixture.java      |   2 +-
 .../entitlement/EntityEntitlementTest.java      |   2 +-
 .../HighAvailabilityManagerFileBasedTest.java   |   2 +-
 ...ilabilityManagerInMemoryIntegrationTest.java |   4 +-
 .../ha/HighAvailabilityManagerInMemoryTest.java |   3 +-
 .../HighAvailabilityManagerSplitBrainTest.java  |  12 +-
 .../ha/HighAvailabilityManagerTestFixture.java  |   4 +-
 .../core/management/ha/HotStandbyTest.java      |  15 +-
 ...agementPlaneSyncRecordPersisterInMemory.java |   2 +-
 .../core/management/ha/MasterChooserTest.java   |   2 +-
 .../core/management/ha/WarmStandbyTest.java     |   6 +-
 .../management/internal/AccessManagerTest.java  |   3 +-
 .../internal/EntityExecutionManagerTest.java    |  12 +-
 .../internal/LocalManagementContextTest.java    |   2 +-
 .../core/management/osgi/OsgiPathTest.java      |   4 +-
 .../management/osgi/OsgiStandaloneTest.java     |  17 +-
 .../osgi/OsgiVersionMoreEntityTest.java         |   5 +-
 .../core/policy/basic/BasicPolicyTest.java      |   4 +-
 .../core/policy/basic/PolicyConfigTest.java     |   4 +-
 .../policy/basic/PolicySubscriptionTest.java    |   3 +-
 .../core/util/BrooklynMavenArtifactsTest.java   |  17 +-
 .../core/util/ResourceUtilsHttpTest.java        |   4 +-
 .../brooklyn/core/util/ResourceUtilsTest.java   |   9 +-
 .../core/util/config/ConfigBagTest.java         |  10 +-
 .../util/crypto/SecureKeysAndSignerTest.java    |   5 +-
 .../core/util/file/ArchiveBuilderTest.java      |   7 +-
 .../core/util/file/ArchiveUtilsTest.java        |   3 +-
 .../core/util/flags/MethodCoercionsTest.java    |   5 +-
 .../core/util/internal/FlagUtilsTest.java       |   6 +-
 .../core/util/internal/RepeaterTest.groovy      |   2 +-
 .../core/util/internal/TypeCoercionsTest.java   |   4 +-
 .../internal/ssh/ShellToolAbstractTest.java     |   7 +-
 .../ssh/SshToolAbstractIntegrationTest.java     |  11 +-
 .../ssh/SshToolAbstractPerformanceTest.java     |   7 +-
 .../ssh/cli/SshCliToolIntegrationTest.java      |   3 +-
 .../ssh/process/ProcessToolStaticsTest.java     |   5 +-
 .../sshj/SshjToolAsyncStubIntegrationTest.java  |   5 +-
 .../ssh/sshj/SshjToolIntegrationTest.java       |  11 +-
 .../util/ssh/BashCommandsIntegrationTest.java   |  17 +-
 .../task/BasicTaskExecutionPerformanceTest.java |   3 +-
 .../core/util/task/BasicTaskExecutionTest.java  |   5 +-
 .../core/util/task/BasicTasksFutureTest.java    |   7 +-
 .../util/task/CompoundTaskExecutionTest.java    |   5 +-
 .../util/task/DynamicSequentialTaskTest.java    |  15 +-
 .../util/task/NonBasicTaskExecutionTest.java    |   5 +-
 .../core/util/task/ScheduledExecutionTest.java  |  15 +-
 .../util/task/SingleThreadedSchedulerTest.java  |   5 +-
 .../core/util/task/TaskFinalizationTest.java    |   3 +-
 .../brooklyn/core/util/task/TasksTest.java      |   6 +-
 .../core/util/task/ValueResolverTest.java       |   6 +-
 .../core/util/task/ssh/SshTasksTest.java        |   5 +-
 .../core/util/task/system/SystemTasksTest.java  |   2 +-
 .../core/util/text/TemplateProcessorTest.java   |   2 +-
 .../util/xstream/StringKeyMapConverterTest.java |   3 +-
 .../access/BrooklynAccessUtilsTest.java         |   2 +-
 .../access/PortForwardManagerRebindTest.java    |  11 +-
 .../location/access/PortForwardManagerTest.java |   3 +-
 .../location/basic/AbstractLocationTest.java    |   4 +-
 .../basic/ByonLocationResolverTest.java         |  12 +-
 ...stMachineProvisioningLocationRebindTest.java |   4 +-
 ...ixedListMachineProvisioningLocationTest.java |  10 +-
 .../basic/LegacyAbstractLocationTest.java       |   3 +-
 .../basic/LocalhostLocationResolverTest.java    |   2 +-
 ...ocalhostMachineProvisioningLocationTest.java |   5 +-
 .../location/basic/LocationConfigTest.java      |   2 +-
 .../location/basic/MultiLocationRebindTest.java |   8 +-
 .../basic/MultiLocationResolverTest.java        |   6 +-
 .../location/basic/MultiLocationTest.java       |   7 +-
 .../location/basic/SimulatedLocation.java       |   5 +-
 .../SshMachineLocationIntegrationTest.java      |   2 +-
 .../SshMachineLocationPerformanceTest.java      |  11 +-
 .../SshMachineLocationReuseIntegrationTest.java |  11 +-
 .../location/basic/SshMachineLocationTest.java  |  16 +-
 .../location/cloud/CloudMachineNamerTest.java   |   3 +-
 .../brooklyn/location/geo/HostGeoInfoTest.java  |   3 +-
 .../geo/HostGeoLookupIntegrationTest.java       |   3 +-
 .../brooklyn/test/entity/BlockingEntity.java    |   2 +-
 .../entity/LocalManagementContextForTests.java  |   2 +-
 .../test/entity/TestApplicationImpl.java        |   3 +-
 .../apache/brooklyn/test/entity/TestEntity.java |   4 +-
 .../brooklyn/test/entity/TestEntityImpl.java    |   2 +-
 .../brooklyn/demo/GlobalWebFabricExample.java   |   7 +-
 .../brooklyn/demo/KafkaClusterExample.java      |   5 +-
 .../demo/StandaloneQpidBrokerExample.java       |   5 +-
 .../brooklyn/demo/CumulusRDFApplication.java    |  15 +-
 .../demo/HighAvailabilityCassandraCluster.java  |   5 +-
 .../brooklyn/demo/ResilientMongoDbApp.java      |   3 +-
 .../brooklyn/demo/RiakClusterExample.java       |   5 +-
 .../brooklyn/demo/SimpleCassandraCluster.java   |   3 +-
 .../apache/brooklyn/demo/StormSampleApp.java    |   5 +-
 .../brooklyn/demo/WideAreaCassandraCluster.java |   5 +-
 .../brooklyn/demo/SingleWebServerExample.java   |   3 +-
 .../demo/WebClusterDatabaseExample.java         |   5 +-
 .../demo/WebClusterDatabaseExampleApp.java      |   8 +-
 .../demo/WebClusterDatabaseExampleGroovy.groovy |   4 +-
 .../apache/brooklyn/demo/WebClusterExample.java |   3 +-
 ...lusterDatabaseExampleAppIntegrationTest.java |   9 +-
 .../JcloudsBlobStoreBasedObjectStore.java       |   5 +-
 .../jclouds/JcloudsStoreObjectAccessor.java     |   2 +-
 .../brooklyn/policy/os/CreateUserPolicy.java    |   5 +-
 .../location/jclouds/BrooklynImageChooser.java  |   3 +-
 .../location/jclouds/BrooklynMachinePool.java   |   3 +-
 .../jclouds/ComputeServiceRegistryImpl.java     |   6 +-
 .../jclouds/JcloudsByonLocationResolver.java    |  13 +-
 .../location/jclouds/JcloudsLocation.java       |  58 +-
 .../location/jclouds/JcloudsLocationConfig.java |   2 +-
 .../jclouds/JcloudsLocationResolver.java        |   3 +-
 ...JcloudsPropertiesFromBrooklynProperties.java |   3 +-
 .../jclouds/JcloudsSshMachineLocation.java      |   9 +-
 .../brooklyn/location/jclouds/JcloudsUtil.java  |  16 +-
 .../jclouds/JcloudsWinRmMachineLocation.java    |   5 +-
 .../JcloudsLocationSecurityGroupCustomizer.java |   7 +-
 .../JcloudsPortForwarderExtension.java          |   5 +-
 .../networking/SecurityGroupDefinition.java     |   9 +-
 .../jclouds/networking/SecurityGroupTool.java   |   5 +-
 .../persister/jclouds/BlobStoreExpiryTest.java  |   9 +-
 .../BlobStorePersistencePerformanceTest.java    |   2 +-
 .../rebind/persister/jclouds/BlobStoreTest.java |   5 +-
 ...nMementoPersisterJcloudsObjectStoreTest.java |   4 +-
 ...ailabilityManagerJcloudsObjectStoreTest.java |   2 +-
 .../JcloudsBlobStoreBasedObjectStoreTest.java   |   6 +-
 .../jclouds/JcloudsExpect100ContinueTest.java   |   4 +-
 .../JcloudsObjectStoreAccessorWriterTest.java   |   8 +-
 .../policy/os/CreateUserPolicyLiveTest.java     |   3 +-
 .../jclouds/AbstractJcloudsLiveTest.java        |   3 +-
 .../jclouds/BailOutJcloudsLocation.java         |   8 +-
 .../jclouds/JcloudsAddressesLiveTest.java       |   5 +-
 .../JcloudsByonLocationResolverAwsLiveTest.java |   3 +-
 ...dsByonLocationResolverSoftlayerLiveTest.java |   3 +-
 .../JcloudsHardwareProfilesStubbedLiveTest.java |   3 +-
 .../jclouds/JcloudsLocationResolverTest.java    |   4 +-
 ...ationTemplateOptionsCustomisersLiveTest.java |   3 +-
 .../location/jclouds/JcloudsLocationTest.java   |   9 +-
 .../location/jclouds/JcloudsLoginLiveTest.java  |   7 +-
 .../jclouds/JcloudsMachineNamerTest.java        |   3 +-
 .../location/jclouds/JcloudsSshingLiveTest.java |   3 +-
 ...loudsLocationUserLoginAndConfigLiveTest.java |   7 +-
 .../jclouds/StandaloneJcloudsLiveTest.java      |   2 +-
 ...oudsLocationSecurityGroupCustomizerTest.java |   4 +-
 .../JcloudsPortForwardingStubbedLiveTest.java   |   7 +-
 .../provider/AbstractJcloudsLocationTest.java   |   7 +-
 .../provider/CarrenzaLocationLiveTest.groovy    |   2 +-
 .../provider/RackspaceLocationLiveTest.java     |   3 +-
 .../java/brooklyn/enricher/DeltaEnricher.java   |   2 +-
 .../brooklyn/enricher/HttpLatencyDetector.java  |  18 +-
 .../brooklyn/enricher/RollingMeanEnricher.java  |   2 +-
 .../enricher/RollingTimeWindowMeanEnricher.java |   6 +-
 .../enricher/TimeFractionDeltaEnricher.java     |   4 +-
 .../enricher/TimeWeightedDeltaEnricher.java     |   4 +-
 .../policy/autoscaling/AutoScalerPolicy.java    |   9 +-
 .../policy/autoscaling/SizeHistory.java         |   8 +-
 .../policy/followthesun/FollowTheSunPolicy.java |   7 +-
 .../policy/ha/AbstractFailureDetector.java      |  13 +-
 .../policy/ha/ConditionalSuspendPolicy.java     |   4 +-
 .../policy/ha/ConnectionFailureDetector.java    |   9 +-
 .../policy/ha/ServiceFailureDetector.java       |  11 +-
 .../brooklyn/policy/ha/ServiceReplacer.java     |   7 +-
 .../brooklyn/policy/ha/ServiceRestarter.java    |  11 +-
 .../policy/ha/SshMachineFailureDetector.java    |  10 +-
 .../loadbalancing/BalanceableContainer.java     |   6 +-
 .../loadbalancing/ItemsInContainersGroup.java   |   2 +-
 .../loadbalancing/LoadBalancingPolicy.java      |   9 +-
 .../brooklyn/policy/loadbalancing/Movable.java  |   2 +-
 .../enricher/HttpLatencyDetectorTest.java       |   3 +-
 .../brooklyn/enricher/RebindEnricherTest.java   |   6 +-
 .../entity/brooklyn/BrooklynMetricsTest.java    |   7 +-
 .../autoscaling/AutoScalerPolicyMetricTest.java |   2 +-
 .../autoscaling/AutoScalerPolicyRebindTest.java |   3 +-
 .../AutoScalerPolicyReconfigurationTest.java    |   4 +-
 .../autoscaling/AutoScalerPolicyTest.java       |   8 +-
 .../AbstractFollowTheSunPolicyTest.java         |   7 +-
 .../FollowTheSunPolicySoakTest.java             |   5 +-
 .../followthesun/FollowTheSunPolicyTest.java    |   5 +-
 .../ha/ConnectionFailureDetectorTest.java       |   7 +-
 .../brooklyn/policy/ha/HaPolicyRebindTest.java  |   5 +-
 ...ServiceFailureDetectorStabilizationTest.java |   7 +-
 .../policy/ha/ServiceFailureDetectorTest.java   |   9 +-
 .../brooklyn/policy/ha/ServiceReplacerTest.java |   5 +-
 .../policy/ha/ServiceRestarterTest.java         |   5 +-
 .../AbstractLoadBalancingPolicyTest.java        |   9 +-
 .../BalanceableWorkerPoolTest.java              |   5 +-
 .../ItemsInContainersGroupTest.java             |   5 +-
 .../LoadBalancingPolicySoakTest.java            |   4 +-
 .../loadbalancing/LoadBalancingPolicyTest.java  |   4 +-
 .../loadbalancing/MockContainerEntity.java      |   2 +-
 .../loadbalancing/MockContainerEntityImpl.java  |   4 +-
 .../loadbalancing/MockItemEntityImpl.java       |   2 +-
 .../entity/monitoring/zabbix/ZabbixFeed.java    |   4 +-
 .../monitoring/zabbix/ZabbixMonitored.java      |   2 +-
 .../monitoring/zabbix/ZabbixPollConfig.java     |   2 +-
 .../entity/monitoring/zabbix/ZabbixServer.java  |   2 +-
 .../basic/AbstractSoftwareProcessDriver.java    |  15 +-
 .../basic/AbstractSoftwareProcessSshDriver.java |  23 +-
 .../AbstractSoftwareProcessWinRmDriver.java     |  10 +-
 .../entity/basic/AbstractVanillaProcess.java    |   3 +-
 .../SameServerDriverLifecycleEffectorTasks.java |   7 +-
 .../brooklyn/entity/basic/SameServerEntity.java |   6 +-
 .../entity/basic/SameServerEntityImpl.java      |   2 +-
 .../brooklyn/entity/basic/SoftwareProcess.java  |   6 +-
 ...wareProcessDriverLifecycleEffectorTasks.java |   2 +-
 .../entity/basic/SoftwareProcessImpl.java       |  17 +-
 .../entity/basic/VanillaSoftwareProcess.java    |   3 +-
 .../basic/VanillaSoftwareProcessSshDriver.java  |  15 +-
 .../entity/basic/VanillaWindowsProcess.java     |   4 +-
 .../basic/VanillaWindowsProcessWinRmDriver.java |   3 +-
 .../entity/basic/lifecycle/ScriptHelper.java    |  12 +-
 .../entity/brooklynnode/BrooklynCluster.java    |   2 +-
 .../brooklynnode/BrooklynClusterImpl.java       |   2 +-
 .../brooklynnode/BrooklynEntityMirror.java      |   4 +-
 .../brooklynnode/BrooklynEntityMirrorImpl.java  |   6 +-
 .../entity/brooklynnode/BrooklynNode.java       |  10 +-
 .../entity/brooklynnode/BrooklynNodeImpl.java   |  25 +-
 .../brooklynnode/BrooklynNodeSshDriver.java     |  15 +-
 .../brooklynnode/EntityHttpClientImpl.java      |  10 +-
 .../brooklynnode/LocalBrooklynNodeImpl.java     |   3 +-
 .../BrooklynClusterUpgradeEffectorBody.java     |   6 +-
 .../BrooklynNodeUpgradeEffectorBody.java        |  10 +-
 .../effector/SelectMasterEffectorBody.java      |   6 +-
 .../SetHighAvailabilityModeEffectorBody.java    |   4 +-
 .../brooklyn/entity/chef/ChefAttributeFeed.java |   4 +-
 .../brooklyn/entity/chef/ChefBashCommands.java  |  13 +-
 .../java/brooklyn/entity/chef/ChefConfig.java   |   2 +-
 .../java/brooklyn/entity/chef/ChefConfigs.java  |   4 +-
 .../brooklyn/entity/chef/ChefEntityImpl.java    |   3 +-
 .../entity/chef/ChefLifecycleEffectorTasks.java |  19 +-
 .../brooklyn/entity/chef/ChefSoloDriver.java    |   2 +-
 .../brooklyn/entity/chef/ChefSoloTasks.java     |   2 +-
 .../java/brooklyn/entity/chef/ChefTasks.java    |  10 +-
 .../entity/chef/KnifeConvergeTaskFactory.java   |  11 +-
 .../brooklyn/entity/chef/KnifeTaskFactory.java  |   8 +-
 .../java/brooklyn/entity/java/JavaAppUtils.java |  12 +-
 .../brooklyn/entity/java/JavaEntityMethods.java |   2 +-
 .../java/JavaSoftwareProcessSshDriver.java      |  15 +-
 .../java/brooklyn/entity/java/JmxSupport.java   |  18 +-
 .../brooklyn/entity/java/JmxmpSslSupport.java   |   6 +-
 .../java/brooklyn/entity/java/UsesJava.java     |   2 +-
 .../brooklyn/entity/java/UsesJavaMXBeans.java   |   2 +-
 .../main/java/brooklyn/entity/java/UsesJmx.java |   2 +-
 .../brooklyn/entity/java/VanillaJavaApp.java    |   4 +-
 .../entity/java/VanillaJavaAppSshDriver.java    |  15 +-
 .../entity/machine/MachineAttributes.java       |   8 +-
 .../brooklyn/entity/machine/MachineEntity.java  |   2 +-
 .../entity/machine/MachineEntityImpl.java       |   7 +-
 .../java/brooklyn/entity/pool/ServerPool.java   |   2 +-
 .../brooklyn/entity/pool/ServerPoolImpl.java    |   7 +-
 .../entity/pool/ServerPoolLocation.java         |   2 +-
 .../entity/pool/ServerPoolLocationResolver.java |   7 +-
 .../entity/service/InitdServiceInstaller.java   |   9 +-
 .../entity/service/SystemServiceEnricher.java   |   5 +-
 .../entity/software/MachineInitTasks.java       |  13 +-
 .../software/MachineLifecycleEffectorTasks.java |  19 +-
 .../entity/software/SshEffectorTasks.java       |   7 +-
 .../brooklyn/entity/software/StaticSensor.java  |   4 +-
 .../entity/software/http/HttpRequestSensor.java |   2 +-
 .../software/java/JmxAttributeSensor.java       |   4 +-
 .../entity/software/ssh/SshCommandEffector.java |   6 +-
 .../entity/software/ssh/SshCommandSensor.java   |   8 +-
 .../winrm/WindowsPerformanceCounterSensors.java |   4 +-
 .../java/brooklyn/event/feed/jmx/JmxFeed.java   |   4 +-
 .../java/brooklyn/event/feed/jmx/JmxHelper.java |  14 +-
 .../jmx/JmxNotificationSubscriptionConfig.java  |   2 +-
 .../brooklyn/entity/AbstractEc2LiveTest.java    |   3 +-
 .../entity/AbstractGoogleComputeLiveTest.java   |   2 +-
 .../entity/AbstractSoftlayerLiveTest.java       |   6 +-
 ...ctSoftwareProcessRestartIntegrationTest.java |   3 +-
 .../entity/basic/DoNothingSoftwareProcess.java  |   3 +-
 .../basic/SoftwareProcessEntityLatchTest.java   |   7 +-
 .../entity/basic/SoftwareProcessEntityTest.java |  19 +-
 ...SoftwareProcessSshDriverIntegrationTest.java |  11 +-
 ...ftwareProcessAndChildrenIntegrationTest.java |  10 +-
 .../entity/basic/lifecycle/MyEntityImpl.java    |   9 +-
 .../basic/lifecycle/NaiveScriptRunnerTest.java  |   7 +-
 .../basic/lifecycle/ScriptHelperTest.java       |   3 +-
 .../basic/lifecycle/StartStopSshDriverTest.java |   9 +-
 .../BrooklynClusterIntegrationTest.java         |   7 +-
 .../BrooklynNodeIntegrationTest.java            |  21 +-
 .../entity/brooklynnode/BrooklynNodeTest.java   |  11 +-
 .../entity/brooklynnode/MockBrooklynNode.java   |   2 +-
 .../brooklynnode/SelectMasterEffectorTest.java  |   4 +-
 .../entity/chef/ChefLiveTestSupport.java        |   5 +-
 .../chef/ChefServerTasksIntegrationTest.java    |   6 +-
 .../mysql/ChefSoloDriverToyMySqlEntity.java     |   6 +-
 .../chef/mysql/DynamicToyMySqlEntityChef.java   |   2 +-
 .../chef/mysql/TypedToyMySqlEntityChef.java     |   3 +-
 ...rWithAvailabilityZonesMultiLocationTest.java |   3 +-
 .../brooklyn/entity/java/EntityPollingTest.java |   4 +-
 .../java/brooklyn/entity/java/JavaOptsTest.java |   8 +-
 ...SoftwareProcessSshDriverIntegrationTest.java |   9 +-
 .../brooklyn/entity/java/JmxSupportTest.java    |  10 +-
 .../entity/java/VanillaJavaAppRebindTest.java   |   5 +-
 .../entity/java/VanillaJavaAppTest.java         |   6 +-
 .../machine/MachineEntityEc2LiveTest.java       |   2 +-
 .../entity/pool/AbstractServerPoolTest.java     |   3 +-
 .../entity/pool/ServerPoolLiveTest.java         |   2 +-
 .../pool/ServerPoolLocationResolverTest.java    |   3 +-
 .../service/SystemServiceEnricherTest.java      |   7 +-
 .../entity/software/AbstractDockerLiveTest.java |   2 +-
 .../MachineLifecycleEffectorTasksTest.java      |   5 +-
 .../entity/software/SshEffectorTasksTest.java   |   5 +-
 .../software/http/HttpRequestSensorTest.java    |   2 +-
 .../mysql/AbstractToyMySqlEntityTest.java       |   9 +-
 .../mysql/DynamicToyMySqlEntityBuilder.java     |   9 +-
 .../mysql/DynamicToyMySqlEntityTest.java        |   3 +-
 .../software/ssh/SshCommandIntegrationTest.java |   5 +-
 .../brooklyn/event/feed/jmx/JmxFeedTest.java    |   4 +-
 .../brooklyn/event/feed/jmx/JmxHelperTest.java  |   4 +-
 .../event/feed/jmx/RebindJmxFeedTest.java       |   4 +-
 .../usage/ApplicationUsageTrackingTest.java     |   4 +-
 .../usage/LocationUsageTrackingTest.java        |   5 +-
 .../usage/RecordingLegacyUsageListener.java     |   3 +-
 .../usage/RecordingUsageListener.java           |   3 +-
 .../management/usage/UsageListenerTest.java     |   3 +-
 .../basic/MachineDetailsEc2LiveTest.java        |   2 +-
 .../basic/WinRmMachineLocationTest.java         |   2 +-
 .../entity/database/DatastoreMixins.java        |   6 +-
 .../entity/database/crate/CrateNode.java        |   4 +-
 .../entity/database/crate/CrateNodeImpl.java    |   3 +-
 .../database/crate/CrateNodeSshDriver.java      |   9 +-
 .../entity/database/mariadb/MariaDbNode.java    |   4 +-
 .../database/mariadb/MariaDbNodeImpl.java       |   9 +-
 .../database/mariadb/MariaDbSshDriver.java      |  27 +-
 .../entity/database/mysql/MySqlCluster.java     |   4 +-
 .../entity/database/mysql/MySqlClusterImpl.java |  14 +-
 .../entity/database/mysql/MySqlNode.java        |   4 +-
 .../entity/database/mysql/MySqlNodeImpl.java    |  11 +-
 .../entity/database/mysql/MySqlRowParser.java   |   4 +-
 .../entity/database/mysql/MySqlSshDriver.java   |  33 +-
 .../database/postgresql/PostgreSqlNode.java     |   5 +-
 .../PostgreSqlNodeChefImplFromScratch.java      |   9 +-
 .../postgresql/PostgreSqlSshDriver.java         |  46 +-
 .../entity/database/rubyrep/RubyRepNode.java    |   4 +-
 .../database/rubyrep/RubyRepNodeImpl.java       |   4 +-
 .../database/rubyrep/RubyRepSshDriver.java      |   9 +-
 .../mariadb/MariaDbIntegrationTest.java         |   5 +-
 .../mariadb/MariaDbLiveRackspaceTest.java       |   9 +-
 .../mysql/MySqlClusterIntegrationTest.java      |   2 +-
 .../database/mysql/MySqlClusterTestHelper.java  |   6 +-
 .../database/mysql/MySqlIntegrationTest.java    |   7 +-
 .../database/mysql/MySqlLiveRackspaceTest.java  |   9 +-
 .../database/postgresql/PostgreSqlChefTest.java |   5 +-
 .../postgresql/PostgreSqlRackspaceLiveTest.java |   9 +-
 .../rubyrep/RubyRepRackspaceLiveTest.java       |  11 +-
 .../messaging/activemq/ActiveMQBroker.java      |   6 +-
 .../activemq/ActiveMQDestinationImpl.java       |   3 +-
 .../messaging/activemq/ActiveMQSshDriver.java   |   9 +-
 .../entity/messaging/jms/JMSBrokerImpl.java     |   9 +-
 .../kafka/AbstractfKafkaSshDriver.java          |  11 +-
 .../brooklyn/entity/messaging/kafka/Kafka.java  |   3 +-
 .../entity/messaging/kafka/KafkaBroker.java     |   7 +-
 .../messaging/kafka/KafkaBrokerSshDriver.java   |   5 +-
 .../entity/messaging/kafka/KafkaCluster.java    |   6 +-
 .../messaging/kafka/KafkaClusterImpl.java       |   6 +-
 .../entity/messaging/kafka/KafkaZooKeeper.java  |   6 +-
 .../kafka/KafkaZooKeeperSshDriver.java          |   7 +-
 .../entity/messaging/qpid/QpidBroker.java       |   4 +-
 .../entity/messaging/qpid/QpidBrokerImpl.java   |   4 +-
 .../messaging/qpid/QpidDestinationImpl.java     |   4 +-
 .../entity/messaging/qpid/QpidQueueImpl.java    |   3 +-
 .../entity/messaging/qpid/QpidSshDriver.java    |   9 +-
 .../entity/messaging/qpid/QpidTopicImpl.java    |   2 +-
 .../entity/messaging/rabbit/RabbitBroker.java   |   4 +-
 .../messaging/rabbit/RabbitSshDriver.java       |   9 +-
 .../brooklyn/entity/messaging/storm/Storm.java  |   4 +-
 .../entity/messaging/storm/StormDeployment.java |   2 +-
 .../entity/messaging/storm/StormImpl.java       |   4 +-
 .../entity/messaging/storm/StormSshDriver.java  |  15 +-
 .../entity/zookeeper/ZooKeeperEnsemble.java     |   2 +-
 .../entity/zookeeper/ZooKeeperNode.java         |   2 +-
 .../entity/zookeeper/ZooKeeperSshDriver.java    |   9 +-
 .../messaging/kafka/KafkaIntegrationTest.java   |   9 +-
 .../entity/messaging/kafka/KafkaLiveTest.java   |   4 +-
 .../messaging/qpid/QpidIntegrationTest.java     |   6 +-
 .../storm/StormAbstractCloudLiveTest.java       |  12 +-
 .../messaging/storm/StormGceLiveTest.java       |   3 +-
 .../entity/network/bind/BindDnsServer.java      |   5 +-
 .../entity/network/bind/BindDnsServerImpl.java  |   9 +-
 .../network/bind/BindDnsServerSshDriver.java    |  19 +-
 .../network/bind/BindDnsServerByonLiveTest.java |   3 +-
 .../network/bind/BindDnsServerLiveTest.java     |   4 +-
 .../network/bind/PrefixAndIdEnricher.java       |   2 +-
 .../nosql/cassandra/CassandraDatacenter.java    |   6 +-
 .../cassandra/CassandraDatacenterImpl.java      |  11 +-
 .../entity/nosql/cassandra/CassandraFabric.java |   2 +-
 .../nosql/cassandra/CassandraFabricImpl.java    |   8 +-
 .../entity/nosql/cassandra/CassandraNode.java   |   7 +-
 .../nosql/cassandra/CassandraNodeImpl.java      |  11 +-
 .../nosql/cassandra/CassandraNodeSshDriver.java |  27 +-
 .../entity/nosql/cassandra/TokenGenerators.java |   2 +-
 .../nosql/couchbase/CouchbaseCluster.java       |   4 +-
 .../nosql/couchbase/CouchbaseClusterImpl.java   |  27 +-
 .../entity/nosql/couchbase/CouchbaseNode.java   |   4 +-
 .../nosql/couchbase/CouchbaseNodeImpl.java      |  19 +-
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |  17 +-
 .../nosql/couchbase/CouchbaseSyncGateway.java   |   2 +-
 .../CouchbaseSyncGatewaySshDriver.java          |  17 +-
 .../entity/nosql/couchdb/CouchDBNode.java       |   2 +-
 .../entity/nosql/couchdb/CouchDBNodeImpl.java   |   2 +-
 .../nosql/couchdb/CouchDBNodeSshDriver.java     |   9 +-
 .../nosql/elasticsearch/ElasticSearchNode.java  |   4 +-
 .../elasticsearch/ElasticSearchNodeImpl.java    |   9 +-
 .../ElasticSearchNodeSshDriver.java             |  11 +-
 .../nosql/mongodb/AbstractMongoDBServer.java    |   2 +-
 .../nosql/mongodb/AbstractMongoDBSshDriver.java |   9 +-
 .../entity/nosql/mongodb/MongoDBClient.java     |   2 +-
 .../nosql/mongodb/MongoDBClientSshDriver.java   |   5 +-
 .../entity/nosql/mongodb/MongoDBReplicaSet.java |   2 +-
 .../nosql/mongodb/MongoDBReplicaSetImpl.java    |   6 +-
 .../entity/nosql/mongodb/MongoDBServer.java     |   2 +-
 .../sharding/CoLocatedMongoDBRouter.java        |   2 +-
 .../nosql/mongodb/sharding/MongoDBRouter.java   |   4 +-
 .../sharding/MongoDBShardClusterImpl.java       |   6 +-
 .../sharding/MongoDBShardedDeployment.java      |   4 +-
 .../sharding/MongoDBShardedDeploymentImpl.java  |   2 +-
 .../entity/nosql/redis/RedisClusterImpl.java    |   6 +-
 .../brooklyn/entity/nosql/redis/RedisSlave.java |   2 +-
 .../brooklyn/entity/nosql/redis/RedisStore.java |   2 +-
 .../entity/nosql/redis/RedisStoreSshDriver.java |   7 +-
 .../brooklyn/entity/nosql/riak/RiakCluster.java |   4 +-
 .../entity/nosql/riak/RiakClusterImpl.java      |   6 +-
 .../brooklyn/entity/nosql/riak/RiakNode.java    |   2 +-
 .../entity/nosql/riak/RiakNodeImpl.java         |   7 +-
 .../entity/nosql/riak/RiakNodeSshDriver.java    |  33 +-
 .../brooklyn/entity/nosql/solr/SolrServer.java  |   5 +-
 .../entity/nosql/solr/SolrServerSshDriver.java  |  13 +-
 .../entity/nosql/cassandra/AstyanaxSupport.java |   8 +-
 .../CassandraDatacenterIntegrationTest.java     |   4 +-
 .../cassandra/CassandraDatacenterLiveTest.java  |  10 +-
 .../cassandra/CassandraDatacenterTest.java      |   5 +-
 .../nosql/cassandra/CassandraFabricTest.java    |   3 +-
 .../cassandra/CassandraNodeIntegrationTest.java |   4 +-
 .../nosql/cassandra/CassandraNodeLiveTest.java  |   5 +-
 .../nosql/couchdb/CouchDBNodeLiveTest.java      |   4 +-
 .../ElasticSearchClusterIntegrationTest.java    |   2 +-
 .../mongodb/MongoDBReplicaSetEc2LiveTest.java   |   2 +-
 .../MongoDBReplicaSetIntegrationTest.java       |   5 +-
 .../MongoDBConfigServerIntegrationTest.java     |   3 +-
 .../MongoDBShardedDeploymentEc2LiveTest.java    |   2 +-
 .../redis/RedisClusterIntegrationTest.java      |   3 +-
 .../nosql/redis/RedisIntegrationTest.java       |   3 +-
 .../nosql/solr/SolrServerEc2LiveTest.java       |   2 +-
 .../nosql/solr/SolrServerIntegrationTest.java   |   2 +-
 .../entity/nosql/solr/SolrServerLiveTest.java   |   4 +-
 .../entity/osgi/karaf/KarafContainer.java       |   2 +-
 .../entity/osgi/karaf/KarafContainerImpl.java   |   8 +-
 .../entity/osgi/karaf/KarafSshDriver.java       |  11 +-
 .../osgi/karaf/KarafContainerEc2LiveTest.java   |   2 +-
 .../entity/osgi/karaf/KarafContainerTest.java   |   7 +-
 .../entity/dns/AbstractGeoDnsService.java       |   3 +-
 .../entity/dns/AbstractGeoDnsServiceImpl.java   |  11 +-
 .../dns/geoscaling/GeoscalingDnsService.java    |   2 +-
 .../geoscaling/GeoscalingDnsServiceImpl.java    |   7 +-
 .../geoscaling/GeoscalingScriptGenerator.java   |   7 +-
 .../dns/geoscaling/GeoscalingWebClient.java     |   3 +-
 .../entity/proxy/AbstractController.java        |   2 +-
 .../entity/proxy/AbstractControllerImpl.java    |  11 +-
 .../AbstractNonProvisionedControllerImpl.java   |   6 +-
 .../brooklyn/entity/proxy/LoadBalancer.java     |   2 +-
 .../entity/proxy/nginx/NginxController.java     |   2 +-
 .../entity/proxy/nginx/NginxControllerImpl.java |   6 +-
 .../nginx/NginxDefaultConfigGenerator.java      |   3 +-
 .../entity/proxy/nginx/NginxSshDriver.java      |  15 +-
 .../nginx/NginxTemplateConfigGenerator.java     |   6 +-
 .../brooklyn/entity/proxy/nginx/UrlMapping.java |   2 +-
 .../entity/proxy/nginx/UrlMappingImpl.java      |   2 +-
 .../webapp/ControlledDynamicWebAppCluster.java  |   2 +-
 .../ControlledDynamicWebAppClusterImpl.java     |   8 +-
 .../entity/webapp/DynamicWebAppCluster.java     |   2 +-
 .../entity/webapp/DynamicWebAppClusterImpl.java |  10 +-
 .../brooklyn/entity/webapp/HttpsSslConfig.java  |   2 +-
 .../entity/webapp/JavaWebAppService.java        |   2 +-
 .../entity/webapp/JavaWebAppSshDriver.java      |   3 +-
 .../entity/webapp/WebAppServiceMethods.java     |   3 +-
 .../entity/webapp/WebAppServiceMetrics.java     |  10 +-
 .../entity/webapp/jboss/JBoss6Server.java       |   2 +-
 .../entity/webapp/jboss/JBoss6SshDriver.java    |  13 +-
 .../entity/webapp/jboss/JBoss7Server.java       |   4 +-
 .../entity/webapp/jboss/JBoss7ServerImpl.java   |   3 +-
 .../entity/webapp/jboss/JBoss7SshDriver.java    |  13 +-
 .../entity/webapp/jetty/Jetty6Server.java       |   4 +-
 .../entity/webapp/jetty/Jetty6SshDriver.java    |  13 +-
 .../webapp/nodejs/NodeJsWebAppService.java      |   2 +-
 .../webapp/nodejs/NodeJsWebAppSshDriver.java    |  13 +-
 .../entity/webapp/tomcat/Tomcat8Server.java     |   4 +-
 .../entity/webapp/tomcat/TomcatServer.java      |   7 +-
 .../entity/webapp/tomcat/TomcatSshDriver.java   |  13 +-
 .../entity/dns/AbstractGeoDnsServiceTest.java   |   7 +-
 .../geoscaling/GeoscalingIntegrationTest.java   |  11 +-
 .../dns/geoscaling/GeoscalingWebClientTest.java |   3 +-
 .../entity/proxy/AbstractControllerTest.java    |   9 +-
 .../entity/proxy/ProxySslConfigTest.java        |   3 +-
 .../brooklyn/entity/proxy/StubAppServer.java    |   2 +-
 .../brooklyn/entity/proxy/UrlMappingTest.java   |   7 +-
 .../nginx/NginxClusterIntegrationTest.java      |   5 +-
 .../nginx/NginxHttpsSslIntegrationTest.java     |   5 +-
 .../proxy/nginx/NginxIntegrationTest.java       |   6 +-
 .../proxy/nginx/NginxLightIntegrationTest.java  |   3 +-
 .../proxy/nginx/NginxRebindIntegrationTest.java |   3 +-
 .../nginx/NginxRebindWithHaIntegrationTest.java |   7 +-
 .../nginx/NginxUrlMappingIntegrationTest.java   |   3 +-
 .../proxy/nginx/NginxWebClusterEc2LiveTest.java |   3 +-
 .../AbstractWebAppFixtureIntegrationTest.java   |  13 +-
 ...lledDynamicWebAppClusterIntegrationTest.java |   7 +-
 .../ControlledDynamicWebAppClusterTest.java     |   3 +-
 .../entity/webapp/DynamicWebAppClusterTest.java |   3 +-
 .../entity/webapp/DynamicWebAppFabricTest.java  |   3 +-
 .../webapp/ElasticCustomLocationTest.java       |   3 +-
 ...ElasticJavaWebAppServiceIntegrationTest.java |   3 +-
 .../entity/webapp/HttpsSslConfigTest.java       |   3 +-
 .../webapp/TomcatAutoScalerPolicyTest.java      |   5 +-
 .../webapp/WebAppConcurrentDeployTest.java      |   9 +-
 .../jboss/JBoss6ServerAwsEc2LiveTest.java       |   2 +-
 ...Boss6ServerNonInheritingIntegrationTest.java |   3 +-
 .../jboss/JBoss7ServerAwsEc2LiveTest.java       |   2 +-
 .../jboss/JBoss7ServerDockerLiveTest.java       |   2 +-
 ...Boss7ServerNonInheritingIntegrationTest.java |   4 +-
 .../Jboss7ServerGoogleComputeLiveTest.java      |   2 +-
 .../NodeJsWebAppFixtureIntegrationTest.java     |   9 +-
 .../NodeJsWebAppSimpleIntegrationTest.java      |   3 +-
 .../webapp/tomcat/Tomcat8ServerEc2LiveTest.java |   2 +-
 .../tomcat/Tomcat8ServerSoftlayerLiveTest.java  |   2 +-
 ...mcat8ServerWebAppFixtureIntegrationTest.java |   7 +-
 ...ableRetrieveUsageMetricsIntegrationTest.java |   3 +-
 .../webapp/tomcat/TomcatServerEc2LiveTest.java  |   2 +-
 .../tomcat/TomcatServerSoftlayerLiveTest.java   |   2 +-
 ...omcatServerWebAppFixtureIntegrationTest.java |   5 +-
 .../test/entity/TestJavaWebAppEntity.java       |   2 +-
 .../impl/hazelcast/HazelcastStorageTest.java    |   3 +-
 .../camp/brooklyn/BrooklynCampConstants.java    |   4 +-
 .../camp/brooklyn/YamlLauncherAbstract.java     |   4 +-
 .../BrooklynAssemblyTemplateInstantiator.java   |   4 +-
 .../BrooklynComponentTemplateResolver.java      |  12 +-
 .../BrooklynEntityDecorationResolver.java       |   3 +-
 .../spi/creation/BrooklynEntityMatcher.java     |   7 +-
 .../creation/BrooklynYamlLocationResolver.java  |  13 +-
 .../creation/BrooklynYamlTypeInstantiator.java  |   9 +-
 .../service/BrooklynServiceTypeResolver.java    |   3 +-
 .../service/ChefServiceTypeResolver.java        |   2 +-
 .../spi/dsl/BrooklynDslDeferredSupplier.java    |   4 +-
 .../spi/dsl/BrooklynDslInterpreter.java         |   7 +-
 .../spi/dsl/methods/BrooklynDslCommon.java      |  10 +-
 .../brooklyn/spi/dsl/methods/DslComponent.java  |   4 +-
 .../camp/brooklyn/spi/dsl/parse/DslParser.java  |   2 +-
 .../brooklyn/spi/dsl/parse/QuotedString.java    |   3 +-
 .../brooklyn/spi/lookup/BrooklynUrlLookup.java  |   4 +-
 .../BrooklynYamlTypeInstantiatorTest.java       |   7 +-
 .../camp/brooklyn/ByonLocationsYamlTest.java    |   5 +-
 .../camp/brooklyn/DslAndRebindYamlTest.java     |   4 +-
 .../brooklyn/EmptySoftwareProcessYamlTest.java  |   3 +-
 .../EnrichersSlightlySimplerYamlTest.java       |   8 +-
 .../camp/brooklyn/EnrichersYamlTest.java        |   6 +-
 .../camp/brooklyn/EntitiesYamlTest.java         |  12 +-
 ...aWebAppWithDslYamlRebindIntegrationTest.java |   4 +-
 .../brooklyn/JavaWebAppsIntegrationTest.java    |  13 +-
 .../camp/brooklyn/JavaWebAppsMatchingTest.java  |   4 +-
 .../camp/brooklyn/LocationsYamlTest.java        |   3 +-
 .../brooklyn/camp/brooklyn/ObjectsYamlTest.java |   4 +-
 .../camp/brooklyn/PoliciesYamlTest.java         |   6 +-
 .../brooklyn/ReferencingYamlTestEntity.java     |   2 +-
 .../brooklyn/ReloadBrooklynPropertiesTest.java  |   4 +-
 .../camp/brooklyn/TestEntityWithInitConfig.java |   2 +-
 .../camp/brooklyn/TestReferencingEnricher.java  |   2 +-
 .../camp/brooklyn/TestReferencingPolicy.java    |   2 +-
 .../brooklyn/VanillaBashNetcatYamlTest.java     |   6 +-
 .../catalog/AbstractCatalogXmlTest.java         |   8 +-
 .../CatalogOsgiVersionMoreEntityTest.java       |   5 +-
 .../brooklyn/catalog/CatalogYamlCombiTest.java  |   3 +-
 .../brooklyn/catalog/CatalogYamlEntityTest.java |   5 +-
 .../catalog/CatalogYamlLocationTest.java        |   3 +-
 .../camp/brooklyn/spi/dsl/DslParseTest.java     |   3 +-
 .../org/apache/brooklyn/cli/AbstractMain.java   |   9 +-
 .../org/apache/brooklyn/cli/CloudExplorer.java  |   5 +-
 .../org/apache/brooklyn/cli/ItemLister.java     |   9 +-
 .../main/java/org/apache/brooklyn/cli/Main.java |  24 +-
 .../apache/brooklyn/cli/lister/ClassFinder.java |   4 +-
 .../brooklyn/cli/lister/ItemDescriptors.java    |   7 +-
 .../java/org/apache/brooklyn/cli/CliTest.java   |  13 +-
 .../jsgui/BrooklynJavascriptGuiLauncher.java    |   3 +-
 .../BrooklynJavascriptGuiLauncherTest.java      |   3 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |  27 +-
 .../brooklyn/launcher/BrooklynWebServer.java    |  22 +-
 .../config/BrooklynDevelopmentModes.java        |   4 +-
 .../launcher/config/BrooklynGlobalConfig.java   |   9 +-
 .../launcher/config/CustomResourceLocator.java  |   6 +-
 .../entity/basic/VanillaSoftwareYamlTest.java   |   7 +-
 .../BrooklynEntityMirrorIntegrationTest.java    |   7 +-
 .../brooklynnode/BrooklynNodeRestTest.java      |  13 +-
 .../BrooklynLauncherHighAvailabilityTest.java   |   6 +-
 .../BrooklynLauncherRebindCatalogTest.java      |   2 +-
 .../BrooklynLauncherRebindTestFixture.java      |   8 +-
 .../BrooklynLauncherRebindTestToFiles.java      |   6 +-
 ...lynLauncherRebindToCloudObjectStoreTest.java |   6 +-
 .../brooklyn/launcher/BrooklynLauncherTest.java |  13 +-
 .../launcher/BrooklynWebServerTest.java         |   5 +-
 .../brooklyn/launcher/WebAppRunnerTest.java     |   4 +-
 .../blueprints/AbstractBlueprintTest.java       |   5 +-
 .../apache/brooklyn/rest/domain/ApiError.java   |   3 +-
 .../brooklyn/rest/domain/ConfigSummary.java     |   5 +-
 .../rest/domain/EntityConfigSummary.java        |   3 +-
 .../rest/domain/SummaryComparators.java         |   5 +-
 .../brooklyn/rest/domain/TaskSummary.java       |   3 +-
 .../brooklyn/rest/util/RestApiTestUtils.java    |   5 +-
 .../brooklyn/rest/client/BrooklynApi.java       |   3 +-
 .../util/http/BuiltResponsePreservingError.java |   3 +-
 .../ApplicationResourceIntegrationTest.java     |   5 +-
 .../apache/brooklyn/rest/BrooklynWebConfig.java |   4 +-
 .../BrooklynPropertiesSecurityFilter.java       |   3 +-
 .../rest/filter/HaHotCheckResourceFilter.java   |   3 +-
 .../rest/filter/HaMasterCheckFilter.java        |   3 +-
 .../brooklyn/rest/filter/LoggingFilter.java     |   5 +-
 .../rest/filter/RequestTaggingFilter.java       |   3 +-
 .../resources/AbstractBrooklynRestResource.java |   5 +-
 .../rest/resources/ApplicationResource.java     |   7 +-
 .../rest/resources/CatalogResource.java         |  13 +-
 .../rest/resources/EffectorResource.java        |   7 +-
 .../rest/resources/EntityConfigResource.java    |   7 +-
 .../brooklyn/rest/resources/EntityResource.java |   5 +-
 .../rest/resources/LocationResource.java        |   9 +-
 .../rest/resources/PolicyConfigResource.java    |   3 +-
 .../brooklyn/rest/resources/PolicyResource.java |   3 +-
 .../brooklyn/rest/resources/ScriptResource.java |   7 +-
 .../brooklyn/rest/resources/SensorResource.java |   5 +-
 .../brooklyn/rest/resources/ServerResource.java |  21 +-
 .../brooklyn/rest/resources/UsageResource.java  |   7 +-
 .../provider/AbstractSecurityProvider.java      |   2 +-
 ...nUserWithRandomPasswordSecurityProvider.java |   5 +-
 .../provider/DelegatingSecurityProvider.java    |   7 +-
 .../provider/ExplicitUsersSecurityProvider.java |   2 +-
 .../security/provider/LdapSecurityProvider.java |   8 +-
 .../rest/transform/CatalogTransformer.java      |   9 +-
 .../rest/transform/EffectorTransformer.java     |   5 +-
 .../rest/transform/EntityTransformer.java       |   7 +-
 .../rest/transform/LocationTransformer.java     |   7 +-
 .../rest/transform/PolicyTransformer.java       |   3 +-
 .../rest/transform/SensorTransformer.java       |   9 +-
 .../rest/transform/TaskTransformer.java         |   7 +-
 .../rest/util/BrooklynRestResourceUtils.java    |  15 +-
 .../rest/util/DefaultExceptionMapper.java       |   9 +-
 .../brooklyn/rest/util/URLParamEncoder.java     |   4 +-
 .../brooklyn/rest/util/WebResourceUtils.java    |   7 +-
 .../util/json/BrooklynJacksonJsonProvider.java  |   2 +-
 .../json/ConfigurableSerializerProvider.java    |   3 +-
 .../ErrorAndToStringUnknownTypeSerializer.java  |   5 +-
 .../brooklynnode/DeployBlueprintTest.java       |   3 +-
 .../BrooklynPropertiesSecurityFilterTest.java   |   5 +-
 .../brooklyn/rest/BrooklynRestApiLauncher.java  |   7 +-
 .../rest/BrooklynRestApiLauncherTest.java       |   3 +-
 .../BrooklynRestApiLauncherTestFixture.java     |   3 +-
 .../brooklyn/rest/HaMasterCheckFilterTest.java  |   7 +-
 .../ApplicationResourceIntegrationTest.java     |   5 +-
 .../rest/resources/ApplicationResourceTest.java |  11 +-
 .../rest/resources/DescendantsTest.java         |   5 +-
 .../resources/EntityConfigResourceTest.java     |   3 +-
 .../rest/resources/EntityResourceTest.java      |   5 +-
 .../rest/resources/LocationResourceTest.java    |   3 +-
 .../SensorResourceIntegrationTest.java          |   5 +-
 .../rest/resources/SensorResourceTest.java      |   7 +-
 .../rest/resources/ServerResourceTest.java      |   5 +-
 .../rest/resources/ServerShutdownTest.java      |   5 +-
 .../rest/resources/UsageResourceTest.java       |   5 +-
 .../rest/testing/BrooklynRestApiTest.java       |   3 +-
 .../rest/testing/BrooklynRestResourceTest.java  |   7 +-
 .../rest/testing/mocks/NameMatcherGroup.java    |   2 +-
 .../testing/mocks/NameMatcherGroupImpl.java     |   3 +-
 .../rest/testing/mocks/RestMockAppBuilder.java  |   2 +-
 .../testing/mocks/RestMockSimpleEntity.java     |   2 +-
 .../testing/mocks/RestMockSimplePolicy.java     |   2 +-
 .../util/BrooklynRestResourceUtilsTest.java     |   3 +-
 .../json/BrooklynJacksonSerializerTest.java     |  11 +-
 .../apache/brooklyn/test/EntityTestUtils.java   |   5 +-
 .../org/apache/brooklyn/test/HttpTestUtils.java |  13 +-
 .../brooklyn/test/NetworkingTestUtils.java      |   9 +-
 .../brooklyn/test/PerformanceTestUtils.java     |   5 +-
 .../org/apache/brooklyn/test/TestUtils.groovy   |   8 +-
 .../org/apache/brooklyn/test/WebAppMonitor.java |   7 +-
 .../java/brooklyn/config/ConfigInheritance.java |  50 -
 .../main/java/brooklyn/config/ConfigKey.java    |  94 --
 .../main/java/brooklyn/config/ConfigMap.java    |  86 --
 .../java/brooklyn/config/StringConfigMap.java   |  35 -
 .../src/main/java/brooklyn/test/Asserts.java    | 499 ----------
 .../java/brooklyn/util/CommandLineUtil.java     |  53 -
 .../brooklyn/util/JavaGroovyEquivalents.java    | 181 ----
 .../src/main/java/brooklyn/util/ShellUtils.java | 181 ----
 .../util/collections/CollectionFunctionals.java | 242 -----
 .../java/brooklyn/util/collections/Jsonya.java  | 581 -----------
 .../brooklyn/util/collections/MutableList.java  | 252 -----
 .../brooklyn/util/collections/MutableMap.java   | 254 -----
 .../brooklyn/util/collections/MutableSet.java   | 208 ----
 .../brooklyn/util/collections/QuorumCheck.java  | 236 -----
 .../util/collections/SetFromLiveMap.java        | 141 ---
 .../util/collections/TimeWindowedList.java      | 147 ---
 .../util/collections/TimestampedValue.java      |  59 --
 .../util/concurrent/CallableFromRunnable.java   |  54 --
 .../util/crypto/AuthorizedKeysParser.java       | 134 ---
 .../crypto/SecureKeysWithoutBouncyCastle.java   | 161 ----
 .../brooklyn/util/crypto/SslTrustUtils.java     | 100 --
 .../util/crypto/TrustingSslSocketFactory.java   | 105 --
 .../exceptions/CompoundRuntimeException.java    |  59 --
 .../brooklyn/util/exceptions/Exceptions.java    | 284 ------
 .../FatalConfigurationRuntimeException.java     |  33 -
 .../util/exceptions/FatalRuntimeException.java  |  34 -
 .../util/exceptions/NotManagedException.java    |  36 -
 .../exceptions/PropagatedRuntimeException.java  |  70 --
 .../util/exceptions/ReferenceWithError.java     | 101 --
 .../exceptions/RuntimeInterruptedException.java |  50 -
 .../exceptions/RuntimeTimeoutException.java     |  36 -
 .../util/exceptions/UserFacingException.java    |  39 -
 .../main/java/brooklyn/util/git/GithubUrls.java |  42 -
 .../java/brooklyn/util/guava/Functionals.java   | 151 ---
 .../java/brooklyn/util/guava/IfFunctions.java   | 158 ---
 .../guava/IllegalStateExceptionSupplier.java    |  43 -
 .../util/guava/KeyTransformingLoadingCache.java | 152 ---
 .../main/java/brooklyn/util/guava/Maybe.java    | 296 ------
 .../brooklyn/util/guava/MaybeFunctions.java     |  52 -
 .../util/guava/SerializablePredicate.java       |  26 -
 .../java/brooklyn/util/guava/TypeTokens.java    |  72 --
 .../internal/BasicDelegatingSystemProperty.java |  36 -
 .../util/internal/BooleanSystemProperty.java    |  29 -
 .../util/internal/BrooklynSystemProperties.java |  39 -
 .../util/internal/DoubleSystemProperty.java     |  28 -
 .../util/internal/IntegerSystemProperty.java    |  28 -
 .../util/internal/StringSystemProperty.java     |  50 -
 .../main/java/brooklyn/util/io/FileUtil.java    | 202 ----
 .../util/javalang/AggregateClassLoader.java     | 173 ----
 .../util/javalang/AtomicReferences.java         |  48 -
 .../java/brooklyn/util/javalang/Boxing.java     | 102 --
 .../main/java/brooklyn/util/javalang/Enums.java | 170 ----
 .../java/brooklyn/util/javalang/Equals.java     |  94 --
 .../brooklyn/util/javalang/JavaClassNames.java  | 162 ----
 .../util/javalang/LoadedClassLoader.java        |  44 -
 .../util/javalang/MemoryUsageTracker.java       |  72 --
 .../brooklyn/util/javalang/Reflections.java     | 789 ---------------
 .../brooklyn/util/javalang/Serializers.java     | 121 ---
 .../util/javalang/StackTraceSimplifier.java     | 203 ----
 .../java/brooklyn/util/javalang/Threads.java    |  62 --
 .../brooklyn/util/logging/LoggingSetup.java     |  39 -
 .../util/logging/SimpleOneLineLogFormatter.java | 140 ---
 .../main/java/brooklyn/util/math/BitList.java   | 271 ------
 .../main/java/brooklyn/util/math/BitUtils.java  |  70 --
 .../java/brooklyn/util/math/MathFunctions.java  | 123 ---
 .../java/brooklyn/util/math/MathPredicates.java | 106 --
 .../java/brooklyn/util/maven/MavenArtifact.java | 223 -----
 .../brooklyn/util/maven/MavenRetriever.java     | 125 ---
 .../src/main/java/brooklyn/util/net/Cidr.java   | 242 -----
 .../brooklyn/util/net/HasNetworkAddresses.java  |  48 -
 .../util/net/NetworkMultiAddressUtils.java      |  79 --
 .../main/java/brooklyn/util/net/Networking.java | 548 -----------
 .../main/java/brooklyn/util/net/Protocol.java   |  38 -
 .../java/brooklyn/util/net/URLParamEncoder.java |  61 --
 .../src/main/java/brooklyn/util/net/Urls.java   | 246 -----
 .../brooklyn/util/net/UserAndHostAndPort.java   |  84 --
 .../src/main/java/brooklyn/util/os/Os.java      | 572 -----------
 .../main/java/brooklyn/util/pool/BasicPool.java | 203 ----
 .../src/main/java/brooklyn/util/pool/Lease.java |  29 -
 .../src/main/java/brooklyn/util/pool/Pool.java  |  74 --
 .../java/brooklyn/util/repeat/Repeater.java     | 401 --------
 .../java/brooklyn/util/ssh/BashCommands.java    | 712 --------------
 .../brooklyn/util/ssh/IptablesCommands.java     | 261 -----
 .../util/stream/DelegatingPrintStream.java      | 174 ----
 .../util/stream/IllegalOutputStream.java        |  31 -
 .../util/stream/InputStreamSupplier.java        |  49 -
 .../util/stream/KnownSizeInputStream.java       | 113 ---
 .../brooklyn/util/stream/ReaderInputStream.java | 202 ----
 .../brooklyn/util/stream/StreamGobbler.java     | 137 ---
 .../main/java/brooklyn/util/stream/Streams.java | 177 ----
 .../util/stream/ThreadLocalPrintStream.java     | 137 ---
 .../brooklyn/util/text/ByteSizeStrings.java     | 416 --------
 .../brooklyn/util/text/ComparableVersion.java   |  89 --
 .../brooklyn/util/text/FormattedString.java     |  47 -
 .../java/brooklyn/util/text/Identifiers.java    | 210 ----
 .../java/brooklyn/util/text/KeyValueParser.java | 124 ---
 .../util/text/NaturalOrderComparator.java       | 165 ----
 .../util/text/QuotedStringTokenizer.java        | 196 ----
 .../java/brooklyn/util/text/StringEscapes.java  | 413 --------
 .../brooklyn/util/text/StringFunctions.java     | 157 ---
 .../brooklyn/util/text/StringPredicates.java    | 310 ------
 .../brooklyn/util/text/StringShortener.java     | 150 ---
 .../main/java/brooklyn/util/text/Strings.java   | 945 ------------------
 .../java/brooklyn/util/text/WildcardGlobs.java  | 382 --------
 .../java/brooklyn/util/time/CountdownTimer.java | 119 ---
 .../main/java/brooklyn/util/time/Duration.java  | 317 ------
 .../main/java/brooklyn/util/time/Durations.java |  70 --
 .../src/main/java/brooklyn/util/time/Time.java  | 962 -------------------
 .../src/main/java/brooklyn/util/yaml/Yamls.java | 553 -----------
 .../brooklyn/config/ConfigInheritance.java      |  50 +
 .../org/apache/brooklyn/config/ConfigKey.java   |  94 ++
 .../org/apache/brooklyn/config/ConfigMap.java   |  86 ++
 .../apache/brooklyn/config/StringConfigMap.java |  35 +
 .../java/org/apache/brooklyn/test/Asserts.java  | 499 ++++++++++
 .../apache/brooklyn/util/CommandLineUtil.java   |  53 +
 .../brooklyn/util/JavaGroovyEquivalents.java    | 180 ++++
 .../org/apache/brooklyn/util/ShellUtils.java    | 180 ++++
 .../util/collections/CollectionFunctionals.java | 242 +++++
 .../brooklyn/util/collections/Jsonya.java       | 581 +++++++++++
 .../brooklyn/util/collections/MutableList.java  | 251 +++++
 .../brooklyn/util/collections/MutableMap.java   | 253 +++++
 .../brooklyn/util/collections/MutableSet.java   | 207 ++++
 .../brooklyn/util/collections/QuorumCheck.java  | 236 +++++
 .../util/collections/SetFromLiveMap.java        | 141 +++
 .../util/collections/TimeWindowedList.java      | 147 +++
 .../util/collections/TimestampedValue.java      |  59 ++
 .../util/concurrent/CallableFromRunnable.java   |  54 ++
 .../util/crypto/AuthorizedKeysParser.java       | 134 +++
 .../crypto/SecureKeysWithoutBouncyCastle.java   | 161 ++++
 .../brooklyn/util/crypto/SslTrustUtils.java     | 100 ++
 .../util/crypto/TrustingSslSocketFactory.java   | 105 ++
 .../exceptions/CompoundRuntimeException.java    |  59 ++
 .../brooklyn/util/exceptions/Exceptions.java    | 284 ++++++
 .../FatalConfigurationRuntimeException.java     |  33 +
 .../util/exceptions/FatalRuntimeException.java  |  34 +
 .../util/exceptions/NotManagedException.java    |  36 +
 .../exceptions/PropagatedRuntimeException.java  |  70 ++
 .../util/exceptions/ReferenceWithError.java     | 101 ++
 .../exceptions/RuntimeInterruptedException.java |  50 +
 .../exceptions/RuntimeTimeoutException.java     |  36 +
 .../util/exceptions/UserFacingException.java    |  39 +
 .../apache/brooklyn/util/git/GithubUrls.java    |  42 +
 .../apache/brooklyn/util/guava/Functionals.java | 151 +++
 .../apache/brooklyn/util/guava/IfFunctions.java | 158 +++
 .../guava/IllegalStateExceptionSupplier.java    |  43 +
 .../util/guava/KeyTransformingLoadingCache.java | 152 +++
 .../org/apache/brooklyn/util/guava/Maybe.java   | 296 ++++++
 .../brooklyn/util/guava/MaybeFunctions.java     |  52 +
 .../util/guava/SerializablePredicate.java       |  26 +
 .../apache/brooklyn/util/guava/TypeTokens.java  |  72 ++
 .../internal/BasicDelegatingSystemProperty.java |  36 +
 .../util/internal/BooleanSystemProperty.java    |  29 +
 .../util/internal/BrooklynSystemProperties.java |  39 +
 .../util/internal/DoubleSystemProperty.java     |  28 +
 .../util/internal/IntegerSystemProperty.java    |  28 +
 .../util/internal/StringSystemProperty.java     |  50 +
 .../org/apache/brooklyn/util/io/FileUtil.java   | 202 ++++
 .../util/javalang/AggregateClassLoader.java     | 173 ++++
 .../util/javalang/AtomicReferences.java         |  48 +
 .../apache/brooklyn/util/javalang/Boxing.java   | 102 ++
 .../apache/brooklyn/util/javalang/Enums.java    | 170 ++++
 .../apache/brooklyn/util/javalang/Equals.java   |  93 ++
 .../brooklyn/util/javalang/JavaClassNames.java  | 162 ++++
 .../util/javalang/LoadedClassLoader.java        |  44 +
 .../util/javalang/MemoryUsageTracker.java       |  72 ++
 .../brooklyn/util/javalang/Reflections.java     | 788 +++++++++++++++
 .../brooklyn/util/javalang/Serializers.java     | 121 +++
 .../util/javalang/StackTraceSimplifier.java     | 202 ++++
 .../apache/brooklyn/util/javalang/Threads.java  |  61 ++
 .../brooklyn/util/logging/LoggingSetup.java     |  39 +
 .../util/logging/SimpleOneLineLogFormatter.java | 140 +++
 .../org/apache/brooklyn/util/math/BitList.java  | 271 ++++++
 .../org/apache/brooklyn/util/math/BitUtils.java |  70 ++
 .../brooklyn/util/math/MathFunctions.java       | 123 +++
 .../brooklyn/util/math/MathPredicates.java      | 106 ++
 .../brooklyn/util/maven/MavenArtifact.java      | 222 +++++
 .../brooklyn/util/maven/MavenRetriever.java     | 125 +++
 .../java/org/apache/brooklyn/util/net/Cidr.java | 242 +++++
 .../brooklyn/util/net/HasNetworkAddresses.java  |  48 +
 .../util/net/NetworkMultiAddressUtils.java      |  79 ++
 .../apache/brooklyn/util/net/Networking.java    | 547 +++++++++++
 .../org/apache/brooklyn/util/net/Protocol.java  |  38 +
 .../brooklyn/util/net/URLParamEncoder.java      |  61 ++
 .../java/org/apache/brooklyn/util/net/Urls.java | 246 +++++
 .../brooklyn/util/net/UserAndHostAndPort.java   |  84 ++
 .../java/org/apache/brooklyn/util/os/Os.java    | 572 +++++++++++
 .../apache/brooklyn/util/pool/BasicPool.java    | 202 ++++
 .../org/apache/brooklyn/util/pool/Lease.java    |  29 +
 .../org/apache/brooklyn/util/pool/Pool.java     |  74 ++
 .../apache/brooklyn/util/repeat/Repeater.java   | 401 ++++++++
 .../apache/brooklyn/util/ssh/BashCommands.java  | 711 ++++++++++++++
 .../brooklyn/util/ssh/IptablesCommands.java     | 261 +++++
 .../util/stream/DelegatingPrintStream.java      | 174 ++++
 .../util/stream/IllegalOutputStream.java        |  31 +
 .../util/stream/InputStreamSupplier.java        |  49 +
 .../util/stream/KnownSizeInputStream.java       | 113 +++
 .../brooklyn/util/stream/ReaderInputStream.java | 202 ++++
 .../brooklyn/util/stream/StreamGobbler.java     | 137 +++
 .../apache/brooklyn/util/stream/Streams.java    | 176 ++++
 .../util/stream/ThreadLocalPrintStream.java     | 137 +++
 .../brooklyn/util/text/ByteSizeStrings.java     | 416 ++++++++
 .../brooklyn/util/text/ComparableVersion.java   |  89 ++
 .../brooklyn/util/text/FormattedString.java     |  47 +
 .../apache/brooklyn/util/text/Identifiers.java  | 210 ++++
 .../brooklyn/util/text/KeyValueParser.java      | 124 +++
 .../util/text/NaturalOrderComparator.java       | 165 ++++
 .../util/text/QuotedStringTokenizer.java        | 196 ++++
 .../brooklyn/util/text/StringEscapes.java       | 412 ++++++++
 .../brooklyn/util/text/StringFunctions.java     | 157 +++
 .../brooklyn/util/text/StringPredicates.java    | 310 ++++++
 .../brooklyn/util/text/StringShortener.java     | 150 +++
 .../org/apache/brooklyn/util/text/Strings.java  | 945 ++++++++++++++++++
 .../brooklyn/util/text/WildcardGlobs.java       | 382 ++++++++
 .../brooklyn/util/time/CountdownTimer.java      | 119 +++
 .../org/apache/brooklyn/util/time/Duration.java | 317 ++++++
 .../apache/brooklyn/util/time/Durations.java    |  70 ++
 .../org/apache/brooklyn/util/time/Time.java     | 961 ++++++++++++++++++
 .../org/apache/brooklyn/util/yaml/Yamls.java    | 553 +++++++++++
 .../test/java/brooklyn/test/AssertsTest.java    |  95 --
 .../java/brooklyn/test/FixedLocaleTest.java     |  49 -
 .../collections/CollectionFunctionalsTest.java  |  57 --
 .../brooklyn/util/collections/JsonyaTest.java   | 191 ----
 .../util/collections/MutableListTest.java       | 119 ---
 .../util/collections/MutableMapTest.java        |  59 --
 .../util/collections/QuorumChecksTest.java      | 105 --
 .../util/collections/TimeWindowedListTest.java  | 142 ---
 .../util/exceptions/ExceptionsTest.java         |  92 --
 .../brooklyn/util/guava/FunctionalsTest.java    |  58 --
 .../brooklyn/util/guava/IfFunctionsTest.java    | 106 --
 .../guava/KeyTransformingLoadingCacheTest.java  | 132 ---
 .../util/internal/CommandLineUtilTest.java      |  65 --
 .../util/internal/JavaClassNamesCallerTest.java |  46 -
 .../java/brooklyn/util/io/FileUtilTest.java     | 118 ---
 .../java/brooklyn/util/javalang/BoxingTest.java |  37 -
 .../java/brooklyn/util/javalang/EnumsTest.java  |  66 --
 .../util/javalang/JavaClassNamesTest.java       |  75 --
 .../util/javalang/MemoryUsageTrackerTest.java   |  89 --
 .../brooklyn/util/javalang/ReflectionsTest.java | 147 ---
 .../util/javalang/StackTraceSimplifierTest.java |  82 --
 .../java/brooklyn/util/math/BitListTest.java    | 121 ---
 .../java/brooklyn/util/math/BitUtilsTest.java   |  49 -
 .../brooklyn/util/math/MathFunctionsTest.java   |  44 -
 .../brooklyn/util/math/MathPredicatesTest.java  |  55 --
 .../brooklyn/util/maven/MavenArtifactTest.java  | 215 -----
 .../test/java/brooklyn/util/net/CidrTest.java   | 175 ----
 .../brooklyn/util/net/NetworkingUtilsTest.java  | 229 -----
 .../test/java/brooklyn/util/net/UrlsTest.java   |  83 --
 .../util/net/UserAndHostAndPortTest.java        |  50 -
 .../src/test/java/brooklyn/util/os/OsTest.java  | 167 ----
 .../java/brooklyn/util/pool/BasicPoolTest.java  | 196 ----
 .../java/brooklyn/util/repeat/RepeaterTest.java | 240 -----
 .../util/ssh/IptablesCommandsFirewalldTest.java | 104 --
 .../brooklyn/util/ssh/IptablesCommandsTest.java |  81 --
 .../brooklyn/util/stream/StreamGobblerTest.java |  90 --
 .../stream/ThreadLocalStdoutStderrTest.java     |  90 --
 .../brooklyn/util/text/ByteSizeStringsTest.java | 163 ----
 .../util/text/ComparableVersionTest.java        |  55 --
 .../brooklyn/util/text/IdentifiersTest.java     |  87 --
 .../brooklyn/util/text/KeyValueParserTest.java  | 148 ---
 .../util/text/NaturalOrderComparatorTest.java   |  81 --
 .../util/text/QuotedStringTokenizerTest.java    | 110 ---
 .../brooklyn/util/text/StringEscapesTest.java   | 118 ---
 .../brooklyn/util/text/StringFunctionsTest.java |  56 --
 .../util/text/StringPredicatesTest.java         |  74 --
 .../brooklyn/util/text/StringShortenerTest.java |  64 --
 .../java/brooklyn/util/text/StringsTest.java    | 364 -------
 .../brooklyn/util/text/WildcardGlobsTest.java   | 236 -----
 .../brooklyn/util/time/CountdownTimerTest.java  |  93 --
 .../java/brooklyn/util/time/DurationTest.java   | 107 ---
 .../test/java/brooklyn/util/time/TimeTest.java  | 338 -------
 .../test/java/brooklyn/util/yaml/YamlsTest.java | 194 ----
 .../org/apache/brooklyn/test/AssertsTest.java   |  95 ++
 .../apache/brooklyn/test/FixedLocaleTest.java   |  49 +
 .../collections/CollectionFunctionalsTest.java  |  58 ++
 .../brooklyn/util/collections/JsonyaTest.java   | 193 ++++
 .../util/collections/MutableListTest.java       | 120 +++
 .../util/collections/MutableMapTest.java        |  60 ++
 .../util/collections/QuorumChecksTest.java      | 105 ++
 .../util/collections/TimeWindowedListTest.java  | 144 +++
 .../util/exceptions/ExceptionsTest.java         |  94 ++
 .../brooklyn/util/guava/FunctionalsTest.java    |  58 ++
 .../brooklyn/util/guava/IfFunctionsTest.java    | 106 ++
 .../guava/KeyTransformingLoadingCacheTest.java  | 133 +++
 .../util/internal/CommandLineUtilTest.java      |  64 ++
 .../util/internal/JavaClassNamesCallerTest.java |  45 +
 .../apache/brooklyn/util/io/FileUtilTest.java   | 118 +++
 .../brooklyn/util/javalang/BoxingTest.java      |  38 +
 .../brooklyn/util/javalang/EnumsTest.java       |  67 ++
 .../util/javalang/JavaClassNamesTest.java       |  76 ++
 .../util/javalang/MemoryUsageTrackerTest.java   |  89 ++
 .../brooklyn/util/javalang/ReflectionsTest.java | 148 +++
 .../util/javalang/StackTraceSimplifierTest.java |  82 ++
 .../apache/brooklyn/util/math/BitListTest.java  | 123 +++
 .../apache/brooklyn/util/math/BitUtilsTest.java |  50 +
 .../brooklyn/util/math/MathFunctionsTest.java   |  44 +
 .../brooklyn/util/math/MathPredicatesTest.java  |  56 ++
 .../brooklyn/util/maven/MavenArtifactTest.java  | 217 +++++
 .../org/apache/brooklyn/util/net/CidrTest.java  | 176 ++++
 .../brooklyn/util/net/NetworkingUtilsTest.java  | 229 +++++
 .../org/apache/brooklyn/util/net/UrlsTest.java  |  84 ++
 .../util/net/UserAndHostAndPortTest.java        |  51 +
 .../org/apache/brooklyn/util/os/OsTest.java     | 168 ++++
 .../brooklyn/util/pool/BasicPoolTest.java       | 199 ++++
 .../brooklyn/util/repeat/RepeaterTest.java      | 240 +++++
 .../util/ssh/IptablesCommandsFirewalldTest.java | 104 ++
 .../brooklyn/util/ssh/IptablesCommandsTest.java |  81 ++
 .../brooklyn/util/stream/StreamGobblerTest.java |  90 ++
 .../stream/ThreadLocalStdoutStderrTest.java     |  90 ++
 .../brooklyn/util/text/ByteSizeStringsTest.java | 164 ++++
 .../util/text/ComparableVersionTest.java        |  54 ++
 .../brooklyn/util/text/IdentifiersTest.java     |  89 ++
 .../brooklyn/util/text/KeyValueParserTest.java  | 149 +++
 .../util/text/NaturalOrderComparatorTest.java   |  81 ++
 .../util/text/QuotedStringTokenizerTest.java    | 111 +++
 .../brooklyn/util/text/StringEscapesTest.java   | 118 +++
 .../brooklyn/util/text/StringFunctionsTest.java |  57 ++
 .../util/text/StringPredicatesTest.java         |  75 ++
 .../brooklyn/util/text/StringShortenerTest.java |  65 ++
 .../apache/brooklyn/util/text/StringsTest.java  | 366 +++++++
 .../brooklyn/util/text/WildcardGlobsTest.java   | 236 +++++
 .../brooklyn/util/time/CountdownTimerTest.java  |  95 ++
 .../apache/brooklyn/util/time/DurationTest.java | 108 +++
 .../org/apache/brooklyn/util/time/TimeTest.java | 340 +++++++
 .../apache/brooklyn/util/yaml/YamlsTest.java    | 195 ++++
 .../java/brooklyn/util/GroovyJavaMethods.groovy |   2 +-
 .../brooklyn/util/internal/LanguageUtils.groovy |   4 +-
 .../brooklyn/util/internal/TimeExtras.groovy    |   2 +-
 .../brooklyn/util/jmx/jmxmp/JmxmpClient.java    |   3 +-
 1470 files changed, 28915 insertions(+), 29281 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/basic/AbstractBrooklynObjectSpec.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/basic/AbstractBrooklynObjectSpec.java b/api/src/main/java/org/apache/brooklyn/api/basic/AbstractBrooklynObjectSpec.java
index df41378..8e2fd5f 100644
--- a/api/src/main/java/org/apache/brooklyn/api/basic/AbstractBrooklynObjectSpec.java
+++ b/api/src/main/java/org/apache/brooklyn/api/basic/AbstractBrooklynObjectSpec.java
@@ -23,9 +23,8 @@ import java.lang.reflect.Modifier;
 import java.util.Set;
 
 import org.apache.brooklyn.api.basic.internal.ApiObjectsFactory;
-
-import brooklyn.util.collections.MutableSet;
-import brooklyn.util.exceptions.Exceptions;
+import org.apache.brooklyn.util.collections.MutableSet;
+import org.apache.brooklyn.util.exceptions.Exceptions;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableSet;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/basic/BrooklynType.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/basic/BrooklynType.java b/api/src/main/java/org/apache/brooklyn/api/basic/BrooklynType.java
index d967cbd..1112c09 100644
--- a/api/src/main/java/org/apache/brooklyn/api/basic/BrooklynType.java
+++ b/api/src/main/java/org/apache/brooklyn/api/basic/BrooklynType.java
@@ -21,7 +21,7 @@ package org.apache.brooklyn.api.basic;
 import java.io.Serializable;
 import java.util.Set;
 
-import brooklyn.config.ConfigKey;
+import org.apache.brooklyn.config.ConfigKey;
 
 /**
  * Gives type information for a {@link BrooklynObject}. It is an immutable snapshot.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/cf2f7a93/api/src/main/java/org/apache/brooklyn/api/basic/internal/ApiObjectsFactory.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/basic/internal/ApiObjectsFactory.java b/api/src/main/java/org/apache/brooklyn/api/basic/internal/ApiObjectsFactory.java
index f1e7e14..d32a75a 100644
--- a/api/src/main/java/org/apache/brooklyn/api/basic/internal/ApiObjectsFactory.java
+++ b/api/src/main/java/org/apache/brooklyn/api/basic/internal/ApiObjectsFactory.java
@@ -20,7 +20,7 @@ package org.apache.brooklyn.api.basic.internal;
 
 import java.util.ServiceLoader;
 
-import brooklyn.util.guava.Maybe;
+import org.apache.brooklyn.util.guava.Maybe;
 
 import com.google.common.annotations.Beta;
 



Mime
View raw message