brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject [42/42] incubator-brooklyn git commit: [BROOKLYN-162] Refactor package in ./core/util
Date Mon, 17 Aug 2015 19:18:13 GMT
[BROOKLYN-162] Refactor package in ./core/util


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

Branch: refs/heads/master
Commit: a4c0e5fdee499265f80cf6d8feb0e6159cd04c30
Parents: ff7f580
Author: Hadrian Zbarcea <hadrian@apache.org>
Authored: Mon Aug 17 01:00:29 2015 -0400
Committer: Hadrian Zbarcea <hadrian@apache.org>
Committed: Mon Aug 17 14:52:04 2015 -0400

----------------------------------------------------------------------
 .../src/main/java/brooklyn/BrooklynVersion.java |    6 +-
 .../brooklyn/basic/AbstractBrooklynObject.java  |    4 +-
 .../brooklyn/basic/BasicConfigurableObject.java |    4 +-
 .../brooklyn/basic/BrooklynDynamicType.java     |    2 +-
 .../brooklyn/basic/BrooklynObjectInternal.java  |    2 +-
 .../basic/internal/ApiObjectsFactoryImpl.java   |    2 +-
 .../brooklyn/config/BrooklynProperties.java     |    6 +-
 .../brooklyn/config/BrooklynServerPaths.java    |    2 +-
 .../config/internal/AbstractConfigMapImpl.java  |    4 +-
 .../enricher/CustomAggregatingEnricher.java     |    2 +-
 .../main/java/brooklyn/enricher/Enrichers.java  |    2 +-
 .../enricher/basic/AbstractEnricher.java        |    2 +-
 .../basic/AbstractMultipleSensorAggregator.java |    2 +-
 .../basic/AbstractTypeTransformingEnricher.java |    2 +-
 .../brooklyn/enricher/basic/Aggregator.java     |    2 +-
 .../java/brooklyn/enricher/basic/Joiner.java    |    2 +-
 .../brooklyn/enricher/basic/Propagator.java     |    6 +-
 .../brooklyn/enricher/basic/Transformer.java    |    4 +-
 .../brooklyn/enricher/basic/UpdatingMap.java    |    2 +-
 .../basic/YamlTimeWeightedDeltaEnricher.java    |    2 +-
 .../brooklyn/entity/basic/AbstractEffector.java |    4 +-
 .../brooklyn/entity/basic/AbstractEntity.java   |    8 +-
 .../java/brooklyn/entity/basic/BasicGroup.java  |    2 +-
 .../entity/basic/BrooklynConfigKeys.java        |    4 +-
 .../entity/basic/BrooklynShutdownHooks.java     |    2 +-
 .../brooklyn/entity/basic/BrooklynTaskTags.java |    6 +-
 .../java/brooklyn/entity/basic/ConfigKeys.java  |    2 +-
 .../java/brooklyn/entity/basic/DataEntity.java  |    2 +-
 .../brooklyn/entity/basic/DynamicGroup.java     |    2 +-
 .../brooklyn/entity/basic/DynamicGroupImpl.java |    2 +-
 .../entity/basic/EffectorStartableImpl.java     |    3 +-
 .../java/brooklyn/entity/basic/Entities.java    |   18 +-
 .../brooklyn/entity/basic/EntityConfigMap.java  |   10 +-
 .../brooklyn/entity/basic/EntityFunctions.java  |    2 +-
 .../brooklyn/entity/basic/EntityInternal.java   |    2 +-
 .../basic/EntityTransientCopyInternal.java      |    2 +-
 .../java/brooklyn/entity/basic/Lifecycle.java   |    2 +-
 .../brooklyn/entity/basic/MethodEffector.java   |    2 +-
 .../java/brooklyn/entity/basic/Sanitizer.java   |    2 +-
 .../entity/basic/ServiceStateLogic.java         |    2 +-
 .../entity/effector/AddChildrenEffector.java    |    2 +-
 .../brooklyn/entity/effector/AddEffector.java   |    2 +-
 .../brooklyn/entity/effector/AddSensor.java     |    2 +-
 .../brooklyn/entity/effector/EffectorBody.java  |   10 +-
 .../brooklyn/entity/effector/EffectorTasks.java |   10 +-
 .../brooklyn/entity/effector/Effectors.java     |    4 +-
 .../java/brooklyn/entity/group/Cluster.java     |    2 +-
 .../brooklyn/entity/group/DynamicCluster.java   |    2 +-
 .../entity/group/DynamicClusterImpl.java        |    8 +-
 .../brooklyn/entity/group/DynamicFabric.java    |    2 +-
 .../entity/group/DynamicMultiGroup.java         |    2 +-
 .../entity/group/QuarantineGroupImpl.java       |    4 +-
 .../entity/proxying/EntityProxyImpl.java        |    6 +-
 .../entity/proxying/InternalEntityFactory.java  |    4 +-
 .../proxying/InternalLocationFactory.java       |    4 +-
 .../entity/proxying/InternalPolicyFactory.java  |    2 +-
 .../rebind/BasicCatalogItemRebindSupport.java   |    2 +-
 .../rebind/BasicEnricherRebindSupport.java      |    4 +-
 .../entity/rebind/BasicFeedRebindSupport.java   |    4 +-
 .../rebind/BasicLocationRebindSupport.java      |    4 +-
 .../entity/rebind/BasicPolicyRebindSupport.java |    4 +-
 .../rebind/PeriodicDeltaChangeListener.java     |    4 +-
 .../brooklyn/entity/rebind/RebindIteration.java |    2 +-
 .../entity/rebind/RebindManagerImpl.java        |    6 +-
 .../entity/rebind/dto/BasicLocationMemento.java |    2 +-
 .../entity/rebind/dto/MementosGenerators.java   |    4 +-
 .../BrooklynMementoPersisterToObjectStore.java  |    2 +-
 .../persister/BrooklynPersistenceUtils.java     |    2 +-
 .../rebind/persister/FileBasedObjectStore.java  |    2 +-
 .../rebind/persister/XmlMementoSerializer.java  |    2 +-
 .../rebind/transformer/CompoundTransformer.java |    4 +-
 .../transformer/CompoundTransformerLoader.java  |    4 +-
 .../java/brooklyn/entity/trait/Startable.java   |    4 +-
 .../brooklyn/entity/trait/StartableMethods.java |    6 +-
 .../java/brooklyn/event/basic/AttributeMap.java |    2 +-
 .../basic/AttributeSensorAndConfigKey.java      |    2 +-
 .../brooklyn/event/basic/BasicConfigKey.java    |    4 +-
 .../event/basic/DependentConfiguration.java     |   16 +-
 .../basic/PortAttributeSensorAndConfigKey.java  |    2 +-
 ...platedStringAttributeSensorAndConfigKey.java |    2 +-
 .../event/feed/AttributePollHandler.java        |    4 +-
 .../main/java/brooklyn/event/feed/Poller.java   |    6 +-
 .../java/brooklyn/event/feed/http/HttpFeed.java |    6 +-
 .../event/feed/http/HttpPollConfig.java         |    4 +-
 .../brooklyn/event/feed/http/HttpPollValue.java |    2 +-
 .../brooklyn/event/feed/http/HttpPolls.java     |    5 +-
 .../event/feed/http/HttpValueFunctions.java     |    3 +-
 .../brooklyn/event/feed/shell/ShellFeed.java    |    6 +-
 .../java/brooklyn/event/feed/ssh/SshFeed.java   |    6 +-
 .../windows/WindowsPerformanceCounterFeed.java  |    4 +-
 .../policy/basic/AbstractEntityAdjunct.java     |    8 +-
 .../brooklyn/policy/basic/ConfigMapImpl.java    |    4 +-
 .../util/BrooklynLanguageExtensions.java        |   48 -
 .../brooklyn/util/BrooklynMavenArtifacts.java   |   58 -
 .../brooklyn/util/BrooklynNetworkUtils.java     |   41 -
 .../main/java/brooklyn/util/ResourceUtils.java  |  639 ----------
 .../java/brooklyn/util/config/ConfigBag.java    |  588 ----------
 .../brooklyn/util/crypto/FluentKeySigner.java   |  192 ---
 .../java/brooklyn/util/crypto/SecureKeys.java   |  184 ---
 .../java/brooklyn/util/file/ArchiveBuilder.java |  423 -------
 .../java/brooklyn/util/file/ArchiveTasks.java   |   58 -
 .../java/brooklyn/util/file/ArchiveUtils.java   |  351 ------
 .../util/flags/ClassCoercionException.java      |   39 -
 .../java/brooklyn/util/flags/FlagUtils.java     |  587 ----------
 .../brooklyn/util/flags/MethodCoercions.java    |  183 ---
 .../java/brooklyn/util/flags/SetFromFlag.java   |   71 --
 .../java/brooklyn/util/flags/TypeCoercions.java |  879 --------------
 .../main/java/brooklyn/util/http/HttpTool.java  |  387 -------
 .../brooklyn/util/http/HttpToolResponse.java    |  185 ---
 .../util/internal/ConfigKeySelfExtracting.java  |   41 -
 .../java/brooklyn/util/internal/Repeater.java   |  369 ------
 .../ssh/BackoffLimitedRetryHandler.java         |   74 --
 .../util/internal/ssh/ShellAbstractTool.java    |  442 -------
 .../brooklyn/util/internal/ssh/ShellTool.java   |  113 --
 .../util/internal/ssh/SshAbstractTool.java      |  172 ---
 .../util/internal/ssh/SshException.java         |   32 -
 .../brooklyn/util/internal/ssh/SshTool.java     |  174 ---
 .../util/internal/ssh/cli/SshCliTool.java       |  316 -----
 .../util/internal/ssh/process/ProcessTool.java  |  214 ----
 .../internal/ssh/sshj/SshjClientConnection.java |  282 -----
 .../util/internal/ssh/sshj/SshjTool.java        | 1091 ------------------
 .../util/javalang/ReflectionScanner.java        |  135 ---
 .../brooklyn/util/javalang/UrlClassLoader.java  |   69 --
 .../java/brooklyn/util/mutex/MutexSupport.java  |  120 --
 .../brooklyn/util/mutex/SemaphoreForTasks.java  |  112 --
 .../util/mutex/SemaphoreWithOwners.java         |  231 ----
 .../java/brooklyn/util/mutex/WithMutexes.java   |   45 -
 .../src/main/java/brooklyn/util/osgi/Osgis.java |  719 ------------
 .../util/task/AbstractExecutionContext.java     |   75 --
 .../util/task/BasicExecutionContext.java        |  221 ----
 .../util/task/BasicExecutionManager.java        |  755 ------------
 .../main/java/brooklyn/util/task/BasicTask.java |  892 --------------
 .../java/brooklyn/util/task/CanSetName.java     |   25 -
 .../java/brooklyn/util/task/CompoundTask.java   |  131 ---
 .../brooklyn/util/task/DeferredSupplier.java    |   38 -
 .../util/task/DynamicSequentialTask.java        |  480 --------
 .../java/brooklyn/util/task/DynamicTasks.java   |  337 ------
 .../brooklyn/util/task/ExecutionListener.java   |   31 -
 .../java/brooklyn/util/task/ExecutionUtils.java |   49 -
 .../java/brooklyn/util/task/ForwardingTask.java |  325 ------
 .../util/task/ListenableForwardingFuture.java   |   50 -
 .../java/brooklyn/util/task/ParallelTask.java   |   85 --
 .../java/brooklyn/util/task/ScheduledTask.java  |  185 ---
 .../java/brooklyn/util/task/SequentialTask.java |   58 -
 .../util/task/SingleThreadedScheduler.java      |  216 ----
 .../java/brooklyn/util/task/TaskBuilder.java    |  184 ---
 .../java/brooklyn/util/task/TaskInternal.java   |  125 --
 .../java/brooklyn/util/task/TaskScheduler.java  |   41 -
 .../main/java/brooklyn/util/task/TaskTags.java  |   71 --
 .../src/main/java/brooklyn/util/task/Tasks.java |  488 --------
 .../java/brooklyn/util/task/ValueResolver.java  |  426 -------
 .../util/task/ssh/SshFetchTaskFactory.java      |   89 --
 .../util/task/ssh/SshFetchTaskWrapper.java      |  135 ---
 .../util/task/ssh/SshPutTaskFactory.java        |  123 --
 .../brooklyn/util/task/ssh/SshPutTaskStub.java  |   69 --
 .../util/task/ssh/SshPutTaskWrapper.java        |  190 ---
 .../java/brooklyn/util/task/ssh/SshTasks.java   |  236 ----
 .../internal/AbstractSshExecTaskFactory.java    |   58 -
 .../ssh/internal/PlainSshExecTaskFactory.java   |   71 --
 .../util/task/system/ProcessTaskFactory.java    |   65 --
 .../util/task/system/ProcessTaskStub.java       |  101 --
 .../util/task/system/ProcessTaskWrapper.java    |  187 ---
 .../brooklyn/util/task/system/SystemTasks.java  |   29 -
 .../internal/AbstractProcessTaskFactory.java    |  214 ----
 .../system/internal/ExecWithLoggingHelpers.java |  200 ----
 .../internal/SystemProcessTaskFactory.java      |  131 ---
 .../brooklyn/util/text/DataUriSchemeParser.java |  267 -----
 .../brooklyn/util/text/TemplateProcessor.java   |  397 -------
 ...ompilerIndependentOuterClassFieldMapper.java |  166 ---
 .../xstream/EnumCaseForgivingConverter.java     |   60 -
 .../EnumCaseForgivingSingleValueConverter.java  |   35 -
 .../util/xstream/ImmutableListConverter.java    |   54 -
 .../util/xstream/ImmutableMapConverter.java     |   56 -
 .../util/xstream/ImmutableSetConverter.java     |   54 -
 .../util/xstream/Inet4AddressConverter.java     |   65 --
 .../brooklyn/util/xstream/MapConverter.java     |  104 --
 .../util/xstream/MutableSetConverter.java       |   44 -
 .../util/xstream/StringKeyMapConverter.java     |  134 ---
 .../brooklyn/util/xstream/XmlSerializer.java    |   97 --
 .../java/brooklyn/util/xstream/XmlUtil.java     |   59 -
 .../catalog/internal/BasicBrooklynCatalog.java  |    2 +-
 .../catalog/internal/CatalogClasspathDo.java    |    6 +-
 .../core/catalog/internal/CatalogDto.java       |    2 +-
 .../core/catalog/internal/CatalogDtoUtils.java  |    2 +-
 .../catalog/internal/CatalogInitialization.java |    4 +-
 .../internal/CatalogItemDtoAbstract.java        |    4 +-
 .../catalog/internal/CatalogXmlSerializer.java  |    4 +-
 .../internal/BrooklynFeatureEnablement.java     |    2 +-
 .../core/internal/BrooklynInitialization.java   |    9 +-
 .../management/entitlement/Entitlements.java    |    2 +-
 .../ha/HighAvailabilityManagerImpl.java         |    4 +-
 .../core/management/ha/OsgiManager.java         |    4 +-
 .../internal/AbstractManagementContext.java     |    8 +-
 .../internal/AsyncCollectionChangeAdapter.java  |    4 +-
 .../internal/BrooklynGarbageCollector.java      |    6 +-
 .../core/management/internal/EffectorUtils.java |    4 +-
 .../internal/EntityManagementUtils.java         |    4 +-
 .../management/internal/LocalEntityManager.java |    2 +-
 .../internal/LocalLocationManager.java          |    4 +-
 .../internal/LocalManagementContext.java        |   10 +-
 .../internal/LocalSubscriptionManager.java      |    4 +-
 .../management/internal/LocalUsageManager.java  |    2 +-
 .../internal/ManagementContextInternal.java     |    2 +-
 .../core/util/BrooklynLanguageExtensions.java   |   48 +
 .../core/util/BrooklynMavenArtifacts.java       |   58 +
 .../core/util/BrooklynNetworkUtils.java         |   44 +
 .../brooklyn/core/util/ResourceUtils.java       |  639 ++++++++++
 .../brooklyn/core/util/config/ConfigBag.java    |  589 ++++++++++
 .../core/util/crypto/FluentKeySigner.java       |  192 +++
 .../brooklyn/core/util/crypto/SecureKeys.java   |  186 +++
 .../brooklyn/core/util/file/ArchiveBuilder.java |  424 +++++++
 .../brooklyn/core/util/file/ArchiveTasks.java   |   58 +
 .../brooklyn/core/util/file/ArchiveUtils.java   |  351 ++++++
 .../core/util/flags/ClassCoercionException.java |   39 +
 .../brooklyn/core/util/flags/FlagUtils.java     |  587 ++++++++++
 .../core/util/flags/MethodCoercions.java        |  183 +++
 .../brooklyn/core/util/flags/SetFromFlag.java   |   71 ++
 .../brooklyn/core/util/flags/TypeCoercions.java |  879 ++++++++++++++
 .../brooklyn/core/util/http/HttpTool.java       |  387 +++++++
 .../core/util/http/HttpToolResponse.java        |  185 +++
 .../util/internal/ConfigKeySelfExtracting.java  |   41 +
 .../brooklyn/core/util/internal/Repeater.java   |  370 ++++++
 .../ssh/BackoffLimitedRetryHandler.java         |   74 ++
 .../util/internal/ssh/ShellAbstractTool.java    |  442 +++++++
 .../core/util/internal/ssh/ShellTool.java       |  113 ++
 .../core/util/internal/ssh/SshAbstractTool.java |  172 +++
 .../core/util/internal/ssh/SshException.java    |   32 +
 .../core/util/internal/ssh/SshTool.java         |  174 +++
 .../core/util/internal/ssh/cli/SshCliTool.java  |  317 +++++
 .../util/internal/ssh/process/ProcessTool.java  |  215 ++++
 .../internal/ssh/sshj/SshjClientConnection.java |  282 +++++
 .../core/util/internal/ssh/sshj/SshjTool.java   | 1091 ++++++++++++++++++
 .../core/util/javalang/ReflectionScanner.java   |  135 +++
 .../core/util/javalang/UrlClassLoader.java      |   70 ++
 .../brooklyn/core/util/mutex/MutexSupport.java  |  119 ++
 .../core/util/mutex/SemaphoreForTasks.java      |  112 ++
 .../core/util/mutex/SemaphoreWithOwners.java    |  231 ++++
 .../brooklyn/core/util/mutex/WithMutexes.java   |   45 +
 .../apache/brooklyn/core/util/osgi/Osgis.java   |  720 ++++++++++++
 .../util/task/AbstractExecutionContext.java     |   75 ++
 .../core/util/task/BasicExecutionContext.java   |  221 ++++
 .../core/util/task/BasicExecutionManager.java   |  755 ++++++++++++
 .../brooklyn/core/util/task/BasicTask.java      |  892 ++++++++++++++
 .../brooklyn/core/util/task/CanSetName.java     |   25 +
 .../brooklyn/core/util/task/CompoundTask.java   |  131 +++
 .../core/util/task/DeferredSupplier.java        |   38 +
 .../core/util/task/DynamicSequentialTask.java   |  480 ++++++++
 .../brooklyn/core/util/task/DynamicTasks.java   |  337 ++++++
 .../core/util/task/ExecutionListener.java       |   31 +
 .../brooklyn/core/util/task/ExecutionUtils.java |   49 +
 .../brooklyn/core/util/task/ForwardingTask.java |  325 ++++++
 .../util/task/ListenableForwardingFuture.java   |   50 +
 .../brooklyn/core/util/task/ParallelTask.java   |   85 ++
 .../brooklyn/core/util/task/ScheduledTask.java  |  185 +++
 .../brooklyn/core/util/task/SequentialTask.java |   58 +
 .../core/util/task/SingleThreadedScheduler.java |  216 ++++
 .../brooklyn/core/util/task/TaskBuilder.java    |  184 +++
 .../brooklyn/core/util/task/TaskInternal.java   |  125 ++
 .../brooklyn/core/util/task/TaskScheduler.java  |   41 +
 .../brooklyn/core/util/task/TaskTags.java       |   71 ++
 .../apache/brooklyn/core/util/task/Tasks.java   |  488 ++++++++
 .../brooklyn/core/util/task/ValueResolver.java  |  426 +++++++
 .../core/util/task/ssh/SshFetchTaskFactory.java |   88 ++
 .../core/util/task/ssh/SshFetchTaskWrapper.java |  135 +++
 .../core/util/task/ssh/SshPutTaskFactory.java   |  123 ++
 .../core/util/task/ssh/SshPutTaskStub.java      |   69 ++
 .../core/util/task/ssh/SshPutTaskWrapper.java   |  189 +++
 .../brooklyn/core/util/task/ssh/SshTasks.java   |  236 ++++
 .../internal/AbstractSshExecTaskFactory.java    |   58 +
 .../ssh/internal/PlainSshExecTaskFactory.java   |   71 ++
 .../util/task/system/ProcessTaskFactory.java    |   66 ++
 .../core/util/task/system/ProcessTaskStub.java  |  102 ++
 .../util/task/system/ProcessTaskWrapper.java    |  187 +++
 .../core/util/task/system/SystemTasks.java      |   29 +
 .../internal/AbstractProcessTaskFactory.java    |  216 ++++
 .../system/internal/ExecWithLoggingHelpers.java |  202 ++++
 .../internal/SystemProcessTaskFactory.java      |  131 +++
 .../core/util/text/DataUriSchemeParser.java     |  267 +++++
 .../core/util/text/TemplateProcessor.java       |  398 +++++++
 ...ompilerIndependentOuterClassFieldMapper.java |  166 +++
 .../xstream/EnumCaseForgivingConverter.java     |   60 +
 .../EnumCaseForgivingSingleValueConverter.java  |   35 +
 .../util/xstream/ImmutableListConverter.java    |   54 +
 .../util/xstream/ImmutableMapConverter.java     |   56 +
 .../util/xstream/ImmutableSetConverter.java     |   54 +
 .../util/xstream/Inet4AddressConverter.java     |   65 ++
 .../core/util/xstream/MapConverter.java         |  104 ++
 .../core/util/xstream/MutableSetConverter.java  |   44 +
 .../util/xstream/StringKeyMapConverter.java     |  134 +++
 .../core/util/xstream/XmlSerializer.java        |   97 ++
 .../brooklyn/core/util/xstream/XmlUtil.java     |   59 +
 .../location/access/BrooklynAccessUtils.java    |    8 +-
 .../PortForwardManagerLocationResolver.java     |    3 +-
 .../location/basic/AbstractLocation.java        |    6 +-
 .../basic/AbstractLocationResolver.java         |    2 +-
 .../AggregatingMachineProvisioningLocation.java |    2 +-
 .../location/basic/BasicLocationRegistry.java   |    2 +-
 .../location/basic/BasicMachineDetails.java     |   10 +-
 .../location/basic/ByonLocationResolver.java    |    4 +-
 .../FixedListMachineProvisioningLocation.java   |    4 +-
 .../location/basic/HostLocationResolver.java    |    2 +-
 .../basic/LocalhostLocationResolver.java        |    3 +-
 .../LocalhostMachineProvisioningLocation.java   |   10 +-
 ...calhostPropertiesFromBrooklynProperties.java |    3 +-
 .../location/basic/LocationConfigUtils.java     |    8 +-
 .../location/basic/LocationInternal.java        |    2 +-
 ...ocationPropertiesFromBrooklynProperties.java |    4 +-
 .../brooklyn/location/basic/MultiLocation.java  |    2 +-
 .../location/basic/NamedLocationResolver.java   |    2 +-
 .../brooklyn/location/basic/PortRanges.java     |    3 +-
 .../basic/SingleMachineLocationResolver.java    |    2 +-
 .../SingleMachineProvisioningLocation.java      |    3 +-
 .../location/basic/SshMachineLocation.java      |   32 +-
 ...bstractCloudMachineProvisioningLocation.java |    4 +-
 .../location/cloud/CloudLocationConfig.java     |    3 +-
 .../cloud/names/AbstractCloudMachineNamer.java  |    4 +-
 .../cloud/names/BasicCloudMachineNamer.java     |    4 +-
 .../location/cloud/names/CloudMachineNamer.java |    3 +-
 .../cloud/names/CustomMachineNamer.java         |    6 +-
 .../location/dynamic/DynamicLocation.java       |    2 +-
 .../location/dynamic/LocationOwner.java         |    2 +-
 .../brooklyn/location/geo/HostGeoInfo.java      |    2 +-
 .../location/geo/LocalhostExternalIpLoader.java |    2 +-
 .../brooklyn/camp/lite/CampYamlLiteTest.java    |    4 +-
 .../camp/lite/TestAppAssemblyInstantiator.java  |    2 +-
 .../enricher/basic/BasicEnricherTest.java       |    2 +-
 .../java/brooklyn/entity/EffectorSayHiTest.java |    2 +-
 .../java/brooklyn/entity/SetFromFlagTest.java   |    2 +-
 .../brooklyn/entity/basic/ConfigMapTest.java    |    4 +-
 .../basic/DependentConfigurationTest.java       |    2 +-
 .../brooklyn/entity/basic/EntityConfigTest.java |    2 +-
 .../brooklyn/entity/basic/EntitySpecTest.java   |    2 +-
 ...apListAndOtherStructuredConfigKeyTest.groovy |    2 +-
 .../brooklyn/entity/basic/SanitizerTest.java    |    3 +-
 .../entity/effector/EffectorBasicTest.java      |    2 +-
 .../effector/EffectorConcatenateTest.java       |    4 +-
 .../entity/effector/EffectorTaskTest.java       |   10 +-
 .../java/brooklyn/entity/rebind/Dumpers.java    |    2 +-
 .../entity/rebind/RebindCatalogEntityTest.java  |    3 +-
 .../entity/rebind/RebindEnricherTest.java       |    2 +-
 .../rebind/RebindEntityDynamicTypeInfoTest.java |    2 +-
 .../entity/rebind/RebindEntityTest.java         |    2 +-
 .../entity/rebind/RebindFailuresTest.java       |    2 +-
 .../brooklyn/entity/rebind/RebindFeedTest.java  |    4 +-
 .../entity/rebind/RebindFeedWithHaTest.java     |    4 +-
 .../entity/rebind/RebindLocationTest.java       |    2 +-
 .../entity/rebind/RebindManagerTest.java        |    5 +-
 .../entity/rebind/RebindPolicyTest.java         |    2 +-
 .../entity/rebind/RebindTestFixture.java        |    2 +-
 .../transformer/impl/XsltTransformerTest.java   |    4 +-
 .../brooklyn/entity/trait/FailingEntity.java    |    2 +-
 .../entity/trait/FailingEntityImpl.java         |    2 +-
 .../entity/trait/StartableMethodsTest.java      |    3 +-
 .../java/brooklyn/event/feed/PollerTest.java    |    2 +-
 .../brooklyn/event/feed/http/HttpFeedTest.java  |    4 +-
 .../event/feed/http/HttpValueFunctionsTest.java |    3 +-
 .../brooklyn/policy/basic/BasicPolicyTest.java  |    2 +-
 .../EntityCleanupLongevityTestFixture.java      |    4 +-
 .../FilePersistencePerformanceTest.java         |    2 +-
 .../qa/performance/TaskPerformanceTest.java     |    4 +-
 .../test/java/brooklyn/test/HttpService.java    |    4 +-
 .../java/brooklyn/test/policy/TestEnricher.java |    2 +-
 .../java/brooklyn/test/policy/TestPolicy.java   |    2 +-
 .../util/BrooklynMavenArtifactsTest.java        |   96 --
 .../brooklyn/util/ResourceUtilsHttpTest.java    |  196 ----
 .../java/brooklyn/util/ResourceUtilsTest.java   |  189 ---
 .../brooklyn/util/config/ConfigBagTest.java     |  191 ---
 .../util/crypto/SecureKeysAndSignerTest.java    |  166 ---
 .../brooklyn/util/file/ArchiveBuilderTest.java  |  193 ----
 .../brooklyn/util/file/ArchiveUtilsTest.java    |  135 ---
 .../util/flags/MethodCoercionsTest.java         |  146 ---
 .../brooklyn/util/http/BetterMockWebServer.java |  138 ---
 .../util/http/HttpToolIntegrationTest.java      |   98 --
 .../brooklyn/util/internal/FlagUtilsTest.java   |  314 -----
 .../brooklyn/util/internal/RepeaterTest.groovy  |  255 ----
 .../util/internal/TypeCoercionsTest.java        |  360 ------
 .../util/internal/ssh/RecordingSshTool.java     |   95 --
 .../internal/ssh/ShellToolAbstractTest.java     |  439 -------
 .../ssh/SshToolAbstractIntegrationTest.java     |  301 -----
 .../ssh/SshToolAbstractPerformanceTest.java     |  137 ---
 .../ssh/cli/SshCliToolIntegrationTest.java      |  119 --
 .../ssh/cli/SshCliToolPerformanceTest.java      |   44 -
 .../ssh/process/ProcessToolIntegrationTest.java |   69 --
 .../ssh/process/ProcessToolStaticsTest.java     |   79 --
 .../sshj/SshjToolAsyncStubIntegrationTest.java  |  177 ---
 .../ssh/sshj/SshjToolIntegrationTest.java       |  313 -----
 .../ssh/sshj/SshjToolPerformanceTest.java       |   44 -
 .../brooklyn/util/mutex/WithMutexesTest.java    |  126 --
 .../test/java/brooklyn/util/osgi/OsgisTest.java |   41 -
 .../util/ssh/BashCommandsIntegrationTest.java   |  501 --------
 .../task/BasicTaskExecutionPerformanceTest.java |  206 ----
 .../util/task/BasicTaskExecutionTest.java       |  460 --------
 .../util/task/BasicTasksFutureTest.java         |  224 ----
 .../util/task/CompoundTaskExecutionTest.java    |  252 ----
 .../util/task/DynamicSequentialTaskTest.java    |  365 ------
 .../util/task/NonBasicTaskExecutionTest.java    |  126 --
 .../util/task/ScheduledExecutionTest.java       |  287 -----
 .../util/task/SingleThreadedSchedulerTest.java  |  192 ---
 .../util/task/TaskFinalizationTest.java         |   62 -
 .../test/java/brooklyn/util/task/TasksTest.java |  181 ---
 .../brooklyn/util/task/ValueResolverTest.java   |  132 ---
 .../brooklyn/util/task/ssh/SshTasksTest.java    |  207 ----
 .../util/task/system/SystemTasksTest.java       |  134 ---
 .../util/text/DataUriSchemeParserTest.java      |   52 -
 .../util/text/TemplateProcessorTest.java        |  179 ---
 .../util/xstream/CompilerCompatibilityTest.java |  154 ---
 .../util/xstream/ConverterTestFixture.java      |   40 -
 .../xstream/EnumCaseForgivingConverterTest.java |   52 -
 .../xstream/ImmutableListConverterTest.java     |   59 -
 .../util/xstream/InetAddressConverterTest.java  |   41 -
 .../util/xstream/StringKeyMapConverterTest.java |   77 --
 .../java/brooklyn/util/xstream/XmlUtilTest.java |   33 -
 .../core/catalog/internal/CatalogDtoTest.java   |    2 +-
 .../core/catalog/internal/CatalogLoadTest.java  |    3 +-
 .../core/catalog/internal/CatalogScanTest.java  |    2 +-
 .../AcmeEntitlementManagerTestFixture.java      |    2 +-
 .../entitlement/EntityEntitlementTest.java      |    2 +-
 .../internal/EntityExecutionManagerTest.java    |    8 +-
 .../management/osgi/OsgiStandaloneTest.java     |    6 +-
 .../osgi/OsgiVersionMoreEntityTest.java         |    2 +-
 .../core/util/BrooklynMavenArtifactsTest.java   |   98 ++
 .../core/util/ResourceUtilsHttpTest.java        |  197 ++++
 .../brooklyn/core/util/ResourceUtilsTest.java   |  190 +++
 .../core/util/config/ConfigBagTest.java         |  193 ++++
 .../util/crypto/SecureKeysAndSignerTest.java    |  169 +++
 .../core/util/file/ArchiveBuilderTest.java      |  194 ++++
 .../core/util/file/ArchiveUtilsTest.java        |  139 +++
 .../core/util/flags/MethodCoercionsTest.java    |  149 +++
 .../core/util/http/BetterMockWebServer.java     |  138 +++
 .../core/util/http/HttpToolIntegrationTest.java |  100 ++
 .../core/util/internal/FlagUtilsTest.java       |  314 +++++
 .../core/util/internal/RepeaterTest.groovy      |  257 +++++
 .../core/util/internal/TypeCoercionsTest.java   |  360 ++++++
 .../util/internal/ssh/RecordingSshTool.java     |   97 ++
 .../internal/ssh/ShellToolAbstractTest.java     |  441 +++++++
 .../ssh/SshToolAbstractIntegrationTest.java     |  304 +++++
 .../ssh/SshToolAbstractPerformanceTest.java     |  138 +++
 .../ssh/cli/SshCliToolIntegrationTest.java      |  119 ++
 .../ssh/cli/SshCliToolPerformanceTest.java      |   44 +
 .../ssh/process/ProcessToolIntegrationTest.java |   69 ++
 .../ssh/process/ProcessToolStaticsTest.java     |   80 ++
 .../sshj/SshjToolAsyncStubIntegrationTest.java  |  178 +++
 .../ssh/sshj/SshjToolIntegrationTest.java       |  314 +++++
 .../ssh/sshj/SshjToolPerformanceTest.java       |   44 +
 .../core/util/mutex/WithMutexesTest.java        |  129 +++
 .../brooklyn/core/util/osgi/OsgisTest.java      |   41 +
 .../util/ssh/BashCommandsIntegrationTest.java   |  504 ++++++++
 .../task/BasicTaskExecutionPerformanceTest.java |  209 ++++
 .../core/util/task/BasicTaskExecutionTest.java  |  462 ++++++++
 .../core/util/task/BasicTasksFutureTest.java    |  227 ++++
 .../util/task/CompoundTaskExecutionTest.java    |  258 +++++
 .../util/task/DynamicSequentialTaskTest.java    |  371 ++++++
 .../util/task/NonBasicTaskExecutionTest.java    |  130 +++
 .../core/util/task/ScheduledExecutionTest.java  |  291 +++++
 .../util/task/SingleThreadedSchedulerTest.java  |  195 ++++
 .../core/util/task/TaskFinalizationTest.java    |   63 +
 .../brooklyn/core/util/task/TasksTest.java      |  184 +++
 .../core/util/task/ValueResolverTest.java       |  134 +++
 .../core/util/task/ssh/SshTasksTest.java        |  213 ++++
 .../core/util/task/system/SystemTasksTest.java  |  137 +++
 .../core/util/text/DataUriSchemeParserTest.java |   53 +
 .../core/util/text/TemplateProcessorTest.java   |  180 +++
 .../util/xstream/CompilerCompatibilityTest.java |  158 +++
 .../core/util/xstream/ConverterTestFixture.java |   40 +
 .../xstream/EnumCaseForgivingConverterTest.java |   53 +
 .../xstream/ImmutableListConverterTest.java     |   60 +
 .../util/xstream/InetAddressConverterTest.java  |   42 +
 .../util/xstream/StringKeyMapConverterTest.java |   78 ++
 .../brooklyn/core/util/xstream/XmlUtilTest.java |   34 +
 .../location/basic/AbstractLocationTest.java    |    2 +-
 .../basic/LegacyAbstractLocationTest.java       |    2 +-
 .../location/basic/LocationConfigTest.java      |    2 +-
 .../location/basic/LocationConfigUtilsTest.java |    3 +-
 .../brooklyn/location/basic/PortRangesTest.java |    3 +-
 .../SshMachineLocationIntegrationTest.java      |    9 +-
 .../SshMachineLocationPerformanceTest.java      |    2 +-
 .../SshMachineLocationReuseIntegrationTest.java |    4 +-
 .../location/basic/SshMachineLocationTest.java  |   14 +-
 .../location/cloud/CloudMachineNamerTest.java   |    4 +-
 .../location/cloud/CustomMachineNamerTest.java  |    3 +-
 .../brooklyn/test/entity/BlockingEntity.java    |    2 +-
 .../apache/brooklyn/test/entity/TestEntity.java |    2 +-
 .../rebind/compiler_compatibility_eclipse.xml   |   20 +-
 .../rebind/compiler_compatibility_oracle.xml    |   18 +-
 .../brooklyn/demo/GlobalWebFabricExample.java   |    6 +-
 .../brooklyn/demo/CumulusRDFApplication.java    |    8 +-
 .../demo/WebClusterDatabaseExampleApp.java      |    6 +-
 .../brooklyn/policy/os/CreateUserPolicy.java    |    4 +-
 .../location/jclouds/BrooklynMachinePool.java   |    2 +-
 .../jclouds/ComputeServiceRegistry.java         |    3 +-
 .../jclouds/ComputeServiceRegistryImpl.java     |    2 +-
 .../jclouds/JcloudsByonLocationResolver.java    |    2 +-
 .../location/jclouds/JcloudsLocation.java       |   18 +-
 .../location/jclouds/JcloudsLocationConfig.java |    3 +-
 .../jclouds/JcloudsLocationCustomizer.java      |    3 +-
 .../location/jclouds/JcloudsMachineNamer.java   |    2 +-
 ...JcloudsPropertiesFromBrooklynProperties.java |    4 +-
 .../jclouds/JcloudsSshMachineLocation.java      |    2 +-
 .../brooklyn/location/jclouds/JcloudsUtil.java  |    2 +-
 .../jclouds/JcloudsWinRmMachineLocation.java    |    2 +-
 .../jclouds/SudoTtyFixingCustomizer.java        |    7 +-
 .../JcloudsLocationSecurityGroupCustomizer.java |    4 +-
 .../persister/jclouds/BlobStoreExpiryTest.java  |    6 +-
 .../policy/os/CreateUserPolicyLiveTest.java     |    2 +-
 .../policy/os/CreateUserPolicyTest.java         |    3 +-
 .../jclouds/AbstractJcloudsStubbedLiveTest.java |    3 +-
 .../jclouds/BailOutJcloudsLocation.java         |    2 +-
 ...ationTemplateOptionsCustomisersLiveTest.java |    4 +-
 .../location/jclouds/JcloudsLocationTest.java   |    2 +-
 .../jclouds/JcloudsMachineNamerTest.java        |    2 +-
 .../jclouds/RebindJcloudsLocationLiveTest.java  |    2 +-
 .../jclouds/RebindJcloudsLocationTest.java      |    3 +-
 .../java/brooklyn/enricher/DeltaEnricher.java   |    2 +-
 .../brooklyn/enricher/HttpLatencyDetector.java  |    2 +-
 .../brooklyn/enricher/RollingMeanEnricher.java  |    2 +-
 .../enricher/RollingTimeWindowMeanEnricher.java |    2 +-
 .../enricher/TimeFractionDeltaEnricher.java     |    2 +-
 .../enricher/TimeWeightedDeltaEnricher.java     |    2 +-
 .../entity/brooklyn/BrooklynMetrics.java        |    2 +-
 .../entity/brooklyn/BrooklynMetricsImpl.java    |    2 +-
 .../policy/autoscaling/AutoScalerPolicy.java    |    6 +-
 .../policy/followthesun/FollowTheSunPolicy.java |    2 +-
 .../policy/ha/AbstractFailureDetector.java      |    6 +-
 .../policy/ha/ConditionalSuspendPolicy.java     |    2 +-
 .../policy/ha/ConnectionFailureDetector.java    |    2 +-
 .../policy/ha/ServiceFailureDetector.java       |    8 +-
 .../brooklyn/policy/ha/ServiceReplacer.java     |    4 +-
 .../brooklyn/policy/ha/ServiceRestarter.java    |    4 +-
 .../policy/ha/SshMachineFailureDetector.java    |    4 +-
 .../loadbalancing/ItemsInContainersGroup.java   |    2 +-
 .../loadbalancing/LoadBalancingPolicy.java      |    2 +-
 .../brooklyn/policy/loadbalancing/Movable.java  |    2 +-
 .../enricher/HttpLatencyDetectorTest.java       |    4 +-
 .../brooklyn/enricher/RebindEnricherTest.java   |    2 +-
 .../brooklyn/policy/ha/ServiceReplacerTest.java |    2 +-
 .../policy/ha/ServiceRestarterTest.java         |    2 +-
 .../loadbalancing/MockContainerEntity.java      |    2 +-
 .../basic/AbstractSoftwareProcessDriver.java    |    8 +-
 .../basic/AbstractSoftwareProcessSshDriver.java |   12 +-
 .../SameServerDriverLifecycleEffectorTasks.java |    4 +-
 .../brooklyn/entity/basic/SameServerEntity.java |    2 +-
 .../entity/basic/SameServerEntityImpl.java      |    6 +-
 .../brooklyn/entity/basic/SoftwareProcess.java  |    2 +-
 ...wareProcessDriverLifecycleEffectorTasks.java |    4 +-
 .../entity/basic/SoftwareProcessImpl.java       |    8 +-
 .../basic/VanillaSoftwareProcessSshDriver.java  |    4 +-
 .../basic/lifecycle/NaiveScriptRunner.java      |    2 +-
 .../entity/basic/lifecycle/ScriptHelper.java    |   12 +-
 .../brooklynnode/BrooklynEntityMirrorImpl.java  |    8 +-
 .../entity/brooklynnode/BrooklynNode.java       |    2 +-
 .../entity/brooklynnode/BrooklynNodeImpl.java   |   12 +-
 .../brooklynnode/BrooklynNodeSshDriver.java     |   10 +-
 .../entity/brooklynnode/EntityHttpClient.java   |    4 +-
 .../brooklynnode/EntityHttpClientImpl.java      |    6 +-
 .../brooklynnode/RemoteEffectorBuilder.java     |    2 +-
 .../BrooklynClusterUpgradeEffectorBody.java     |    6 +-
 .../BrooklynNodeUpgradeEffectorBody.java        |    6 +-
 .../effector/SelectMasterEffectorBody.java      |    4 +-
 .../SetHighAvailabilityModeEffectorBody.java    |    4 +-
 ...SetHighAvailabilityPriorityEffectorBody.java |    4 +-
 .../brooklyn/entity/chef/ChefAttributeFeed.java |    4 +-
 .../java/brooklyn/entity/chef/ChefConfig.java   |    3 +-
 .../entity/chef/ChefLifecycleEffectorTasks.java |   10 +-
 .../brooklyn/entity/chef/ChefServerTasks.java   |    2 +-
 .../brooklyn/entity/chef/ChefSoloDriver.java    |    3 +-
 .../java/brooklyn/entity/chef/ChefTasks.java    |   10 +-
 .../entity/chef/KnifeConvergeTaskFactory.java   |    4 +-
 .../brooklyn/entity/chef/KnifeTaskFactory.java  |   10 +-
 .../java/JavaSoftwareProcessSshDriver.java      |   16 +-
 .../java/brooklyn/entity/java/JmxSupport.java   |    8 +-
 .../brooklyn/entity/java/JmxmpSslSupport.java   |    7 +-
 .../java/brooklyn/entity/java/UsesJava.java     |    3 +-
 .../brooklyn/entity/java/UsesJavaMXBeans.java   |    2 +-
 .../main/java/brooklyn/entity/java/UsesJmx.java |    3 +-
 .../brooklyn/entity/java/VanillaJavaApp.java    |    2 +-
 .../entity/java/VanillaJavaAppImpl.java         |    2 +-
 .../entity/java/VanillaJavaAppSshDriver.java    |   10 +-
 .../entity/machine/MachineEntityImpl.java       |    6 +-
 .../brooklyn/entity/pool/ServerPoolImpl.java    |    2 +-
 .../entity/pool/ServerPoolLocation.java         |    3 +-
 .../entity/service/EntityLaunchListener.java    |    2 +-
 .../entity/service/InitdServiceInstaller.java   |   12 +-
 .../entity/service/SystemServiceEnricher.java   |   14 +-
 .../entity/software/MachineInitTasks.java       |    8 +-
 .../software/MachineLifecycleEffectorTasks.java |    8 +-
 .../software/ProvidesProvisioningFlags.java     |    3 +-
 .../entity/software/SshEffectorTasks.java       |   24 +-
 .../brooklyn/entity/software/StaticSensor.java  |    6 +-
 .../entity/software/http/HttpRequestSensor.java |    2 +-
 .../software/java/JmxAttributeSensor.java       |    6 +-
 .../entity/software/ssh/SshCommandEffector.java |    2 +-
 .../entity/software/ssh/SshCommandSensor.java   |    4 +-
 .../winrm/WindowsPerformanceCounterSensors.java |    2 +-
 .../java/brooklyn/event/feed/jmx/JmxHelper.java |    2 +-
 .../basic/SoftwareProcessEntityLatchTest.java   |    2 +-
 .../basic/SoftwareProcessEntityRebindTest.java  |    3 +-
 .../entity/basic/SoftwareProcessEntityTest.java |    6 +-
 ...SoftwareProcessSshDriverIntegrationTest.java |    2 +-
 ...ftwareProcessAndChildrenIntegrationTest.java |    2 +-
 .../entity/basic/lifecycle/MyEntityImpl.java    |    6 +-
 .../basic/lifecycle/NaiveScriptRunnerTest.java  |    6 +-
 .../basic/lifecycle/StartStopSshDriverTest.java |    8 +-
 .../BrooklynNodeIntegrationTest.java            |    8 +-
 .../brooklynnode/CallbackEntityHttpClient.java  |    4 +-
 .../entity/chef/ChefLiveTestSupport.java        |    2 +-
 .../chef/ChefServerTasksIntegrationTest.java    |    2 +-
 .../ChefSoloDriverMySqlEntityLiveTest.java      |    2 +-
 .../java/brooklyn/entity/java/JavaOptsTest.java |    6 +-
 .../brooklyn/entity/java/JmxSupportTest.java    |    4 +-
 .../brooklyn/entity/java/SslKeyConfigTest.java  |    5 +-
 .../entity/java/VanillaJavaAppRebindTest.java   |    2 +-
 .../entity/java/VanillaJavaAppTest.java         |    8 +-
 .../MachineLifecycleEffectorTasksTest.java      |    4 +-
 .../entity/software/SoftwareEffectorTest.java   |    5 +-
 .../entity/software/SshEffectorTasksTest.java   |    6 +-
 .../entity/software/StaticSensorTest.java       |    2 +-
 .../software/http/HttpRequestSensorTest.java    |    2 +-
 .../mysql/AbstractToyMySqlEntityTest.java       |    2 +-
 .../mysql/DynamicToyMySqlEntityBuilder.java     |    8 +-
 .../software/ssh/SshCommandIntegrationTest.java |    2 +-
 .../entity/database/DatastoreMixins.java        |    4 +-
 .../entity/database/crate/CrateNode.java        |    3 +-
 .../entity/database/mariadb/MariaDbDriver.java  |    3 +-
 .../entity/database/mariadb/MariaDbNode.java    |    3 +-
 .../database/mariadb/MariaDbNodeImpl.java       |    4 +-
 .../database/mariadb/MariaDbSshDriver.java      |    4 +-
 .../entity/database/mysql/MySqlClusterImpl.java |    4 +-
 .../entity/database/mysql/MySqlDriver.java      |    3 +-
 .../entity/database/mysql/MySqlNode.java        |    3 +-
 .../entity/database/mysql/MySqlNodeImpl.java    |    4 +-
 .../entity/database/mysql/MySqlSshDriver.java   |    4 +-
 .../database/postgresql/PostgreSqlDriver.java   |    3 +-
 .../database/postgresql/PostgreSqlNode.java     |    3 +-
 .../PostgreSqlNodeChefImplFromScratch.java      |    8 +-
 .../database/postgresql/PostgreSqlNodeImpl.java |    2 +-
 .../postgresql/PostgreSqlSshDriver.java         |    8 +-
 .../entity/database/rubyrep/RubyRepNode.java    |    2 +-
 .../database/postgresql/PostgreSqlChefTest.java |    2 +-
 .../messaging/activemq/ActiveMQBroker.java      |    2 +-
 .../entity/messaging/amqp/AmqpExchange.java     |    2 +-
 .../brooklyn/entity/messaging/kafka/Kafka.java  |    3 +-
 .../entity/messaging/kafka/KafkaBroker.java     |    4 +-
 .../entity/messaging/kafka/KafkaCluster.java    |    2 +-
 .../entity/messaging/kafka/KafkaZooKeeper.java  |    2 +-
 .../entity/messaging/qpid/QpidBroker.java       |    2 +-
 .../messaging/qpid/QpidDestinationImpl.java     |    2 +-
 .../entity/messaging/rabbit/RabbitBroker.java   |    2 +-
 .../brooklyn/entity/messaging/storm/Storm.java  |    2 +-
 .../entity/messaging/storm/StormDeployment.java |    2 +-
 .../messaging/storm/StormDeploymentImpl.java    |    2 +-
 .../entity/zookeeper/ZooKeeperEnsemble.java     |    2 +-
 .../entity/zookeeper/ZooKeeperNode.java         |    2 +-
 .../storm/StormAbstractCloudLiveTest.java       |    4 +-
 .../entity/monitoring/monit/MonitNode.java      |    2 +-
 .../entity/network/bind/BindDnsServer.java      |    4 +-
 .../nosql/cassandra/CassandraDatacenter.java    |    2 +-
 .../cassandra/CassandraDatacenterImpl.java      |    4 +-
 .../entity/nosql/cassandra/CassandraNode.java   |    4 +-
 .../nosql/cassandra/CassandraNodeDriver.java    |    3 +-
 .../nosql/cassandra/CassandraNodeImpl.java      |    4 +-
 .../nosql/cassandra/CassandraNodeSshDriver.java |    8 +-
 .../nosql/couchbase/CouchbaseCluster.java       |    2 +-
 .../nosql/couchbase/CouchbaseClusterImpl.java   |   10 +-
 .../entity/nosql/couchbase/CouchbaseNode.java   |    2 +-
 .../nosql/couchbase/CouchbaseNodeImpl.java      |    8 +-
 .../nosql/couchbase/CouchbaseNodeSshDriver.java |   12 +-
 .../nosql/couchbase/CouchbaseSyncGateway.java   |    2 +-
 .../entity/nosql/couchdb/CouchDBCluster.java    |    2 +-
 .../entity/nosql/couchdb/CouchDBNode.java       |    2 +-
 .../entity/nosql/couchdb/CouchDBNodeImpl.java   |    2 +-
 .../elasticsearch/ElasticSearchCluster.java     |    2 +-
 .../nosql/elasticsearch/ElasticSearchNode.java  |    3 +-
 .../elasticsearch/ElasticSearchNodeImpl.java    |    4 +-
 .../nosql/mongodb/AbstractMongoDBServer.java    |    2 +-
 .../entity/nosql/mongodb/MongoDBClient.java     |    3 +-
 .../entity/nosql/mongodb/MongoDBReplicaSet.java |    2 +-
 .../entity/nosql/mongodb/MongoDBServer.java     |    2 +-
 .../sharding/CoLocatedMongoDBRouter.java        |    2 +-
 .../sharding/MongoDBShardedDeployment.java      |    2 +-
 .../brooklyn/entity/nosql/redis/RedisSlave.java |    2 +-
 .../brooklyn/entity/nosql/redis/RedisStore.java |    2 +-
 .../brooklyn/entity/nosql/riak/RiakCluster.java |    2 +-
 .../entity/nosql/riak/RiakClusterImpl.java      |    2 +-
 .../brooklyn/entity/nosql/riak/RiakNode.java    |    2 +-
 .../entity/nosql/riak/RiakNodeImpl.java         |    2 +-
 .../entity/nosql/riak/RiakNodeSshDriver.java    |    4 +-
 .../brooklyn/entity/nosql/solr/SolrServer.java  |    4 +-
 .../entity/nosql/solr/SolrServerSshDriver.java  |    2 +-
 .../cassandra/CassandraDatacenterTest.java      |    4 +-
 .../ElasticSearchClusterIntegrationTest.java    |    4 +-
 .../ElasticSearchNodeIntegrationTest.java       |    5 +-
 .../entity/osgi/karaf/KarafContainer.java       |    2 +-
 .../entity/dns/AbstractGeoDnsServiceImpl.java   |    2 +-
 .../dns/geoscaling/GeoscalingDnsService.java    |    2 +-
 .../geoscaling/GeoscalingDnsServiceImpl.java    |    4 +-
 .../geoscaling/GeoscalingScriptGenerator.java   |    3 +-
 .../dns/geoscaling/GeoscalingWebClient.java     |    2 +-
 .../entity/proxy/AbstractController.java        |    2 +-
 .../entity/proxy/AbstractControllerImpl.java    |    2 +-
 .../brooklyn/entity/proxy/LoadBalancer.java     |    2 +-
 .../brooklyn/entity/proxy/ProxySslConfig.java   |    5 +-
 .../entity/proxy/nginx/NginxController.java     |    2 +-
 .../entity/proxy/nginx/NginxControllerImpl.java |    8 +-
 .../entity/proxy/nginx/NginxSshDriver.java      |    8 +-
 .../nginx/NginxTemplateConfigGenerator.java     |    4 +-
 .../brooklyn/entity/proxy/nginx/UrlMapping.java |    2 +-
 .../webapp/ControlledDynamicWebAppCluster.java  |    2 +-
 .../entity/webapp/DynamicWebAppClusterImpl.java |    8 +-
 .../entity/webapp/JavaWebAppService.java        |    2 +-
 .../entity/webapp/JavaWebAppSshDriver.java      |    8 +-
 .../entity/webapp/WebAppServiceConstants.java   |    2 +-
 .../entity/webapp/jboss/JBoss6Server.java       |    2 +-
 .../entity/webapp/jboss/JBoss7Server.java       |    2 +-
 .../entity/webapp/jetty/Jetty6Server.java       |    2 +-
 .../webapp/nodejs/NodeJsWebAppService.java      |    3 +-
 .../webapp/nodejs/NodeJsWebAppSshDriver.java    |    4 +-
 .../entity/webapp/tomcat/Tomcat8Server.java     |    2 +-
 .../entity/webapp/tomcat/TomcatServer.java      |    4 +-
 .../GeoscalingScriptGeneratorTest.java          |    3 +-
 .../dns/geoscaling/GeoscalingWebClientTest.java |    2 +-
 .../entity/proxy/AbstractControllerTest.java    |    2 +-
 .../entity/proxy/ProxySslConfigTest.java        |    2 +-
 .../nginx/NginxRebindWithHaIntegrationTest.java |    4 +-
 .../AbstractWebAppFixtureIntegrationTest.java   |    4 +-
 .../entity/webapp/HttpsSslConfigTest.java       |    2 +-
 .../webapp/WebAppConcurrentDeployTest.java      |    4 +-
 .../test/entity/TestJavaWebAppEntity.java       |    2 +-
 .../test/entity/TestJavaWebAppEntityImpl.java   |    2 +-
 .../app/SampleLocalhostIntegrationTest.java     |    2 +-
 .../camp/brooklyn/YamlLauncherAbstract.java     |    2 +-
 .../BrooklynAssemblyTemplateInstantiator.java   |    4 +-
 .../BrooklynComponentTemplateResolver.java      |   10 +-
 .../BrooklynEntityDecorationResolver.java       |    2 +-
 .../creation/BrooklynYamlTypeInstantiator.java  |    2 +-
 .../spi/dsl/BrooklynDslDeferredSupplier.java    |    2 +-
 .../camp/brooklyn/spi/dsl/DslUtils.java         |    2 +-
 .../spi/dsl/methods/BrooklynDslCommon.java      |   10 +-
 .../brooklyn/spi/dsl/methods/DslComponent.java  |    4 +-
 .../camp/brooklyn/AbstractYamlRebindTest.java   |    4 +-
 .../camp/brooklyn/AbstractYamlTest.java         |    4 +-
 .../camp/brooklyn/DslAndRebindYamlTest.java     |    2 +-
 .../camp/brooklyn/EntitiesYamlTest.java         |    2 +-
 ...aWebAppWithDslYamlRebindIntegrationTest.java |    2 +-
 .../brooklyn/JavaWebAppsIntegrationTest.java    |    2 +-
 .../camp/brooklyn/JavaWebAppsMatchingTest.java  |    4 +-
 .../camp/brooklyn/MapReferenceYamlTest.java     |    2 +-
 .../brooklyn/camp/brooklyn/ObjectsYamlTest.java |    6 +-
 .../brooklyn/ReloadBrooklynPropertiesTest.java  |    2 +-
 .../TestSensorAndEffectorInitializer.java       |    2 +-
 .../catalog/AbstractCatalogXmlTest.java         |    2 +-
 .../CatalogOsgiVersionMoreEntityTest.java       |    2 +-
 .../brooklyn/catalog/CatalogYamlEntityTest.java |    2 +-
 .../org/apache/brooklyn/cli/ItemLister.java     |    4 +-
 .../main/java/org/apache/brooklyn/cli/Main.java |    2 +-
 .../apache/brooklyn/cli/lister/ClassFinder.java |    4 +-
 .../java/org/apache/brooklyn/cli/CliTest.java   |    2 +-
 .../brooklyn/launcher/BrooklynWebServer.java    |   14 +-
 .../launcher/config/CustomResourceLocator.java  |    2 +-
 .../entity/basic/VanillaSoftwareYamlTest.java   |    2 +-
 .../brooklynnode/BrooklynNodeRestTest.java      |    6 +-
 .../database/mssql/MssqlBlueprintLiveTest.java  |    5 +-
 .../BrooklynLauncherRebindCatalogTest.java      |    2 +-
 .../launcher/BrooklynWebServerTest.java         |    4 +-
 .../blueprints/AbstractBlueprintTest.java       |    2 +-
 .../qa/load/SimulatedMySqlNodeImpl.java         |    6 +-
 .../brooklyn/qa/longevity/MonitorUtils.java     |    4 +-
 .../SoftlayerObtainPrivateLiveTest.java         |    2 +-
 .../resources/AbstractBrooklynRestResource.java |    2 +-
 .../rest/resources/ApplicationResource.java     |    2 +-
 .../rest/resources/CatalogResource.java         |    2 +-
 .../rest/resources/EntityConfigResource.java    |    4 +-
 .../brooklyn/rest/resources/EntityResource.java |    2 +-
 .../rest/resources/PolicyConfigResource.java    |    3 +-
 .../brooklyn/rest/resources/SensorResource.java |    2 +-
 .../brooklyn/rest/resources/ServerResource.java |    6 +-
 .../rest/transform/EffectorTransformer.java     |    4 +-
 .../rest/transform/LocationTransformer.java     |    2 +-
 .../rest/transform/TaskTransformer.java         |    2 +-
 .../rest/util/BrooklynRestResourceUtils.java    |    2 +-
 .../rest/util/DefaultExceptionMapper.java       |    2 +-
 .../BrooklynPropertiesSecurityFilterTest.java   |    6 +-
 .../brooklyn/rest/HaMasterCheckFilterTest.java  |    4 +-
 .../rest/resources/CatalogResetTest.java        |    2 +-
 .../SensorResourceIntegrationTest.java          |    4 +-
 .../ServerResourceIntegrationTest.java          |    7 +-
 .../testing/mocks/RestMockSimpleEntity.java     |    3 +-
 .../testing/mocks/RestMockSimplePolicy.java     |    2 +-
 .../json/BrooklynJacksonSerializerTest.java     |    2 +-
 .../util/jmx/jmxmp/JmxmpAgentSslTest.java       |    5 +-
 .../brooklyn/util/jmx/jmxmp/JmxmpClient.java    |    3 +-
 .../brooklyn/osgi/tests/SimpleLocation.java     |    3 +-
 .../java/brooklyn/osgi/tests/SimplePolicy.java  |    3 +-
 .../osgi/tests/more/MoreEntityImpl.java         |    3 +-
 .../osgi/tests/more/MoreEntityImpl.java         |    2 +-
 .../osgi/tests/more/MoreEntityImpl.java         |    2 +-
 795 files changed, 28078 insertions(+), 27902 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/BrooklynVersion.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/BrooklynVersion.java b/core/src/main/java/brooklyn/BrooklynVersion.java
index dbc7869..bf45a99 100644
--- a/core/src/main/java/brooklyn/BrooklynVersion.java
+++ b/core/src/main/java/brooklyn/BrooklynVersion.java
@@ -45,11 +45,11 @@ import com.google.common.collect.Maps;
 import org.apache.brooklyn.api.catalog.CatalogItem;
 import org.apache.brooklyn.api.management.ManagementContext;
 import org.apache.brooklyn.core.management.classloading.OsgiBrooklynClassLoadingContext;
+import org.apache.brooklyn.core.util.ResourceUtils;
+import org.apache.brooklyn.core.util.osgi.Osgis;
+import org.apache.brooklyn.core.util.osgi.Osgis.ManifestHelper;
 
-import brooklyn.util.ResourceUtils;
 import brooklyn.util.exceptions.Exceptions;
-import brooklyn.util.osgi.Osgis;
-import brooklyn.util.osgi.Osgis.ManifestHelper;
 import brooklyn.util.stream.Streams;
 import brooklyn.util.text.Strings;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java b/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
index c990ed9..76641bf 100644
--- a/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
+++ b/core/src/main/java/brooklyn/basic/AbstractBrooklynObject.java
@@ -25,14 +25,14 @@ import java.util.Set;
 import org.apache.brooklyn.api.basic.internal.ApiObjectsFactory;
 import org.apache.brooklyn.api.management.ManagementContext;
 import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.util.config.ConfigBag;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.basic.AbstractEntity;
 import brooklyn.entity.proxying.InternalFactory;
 import brooklyn.entity.rebind.RebindManagerImpl;
-import brooklyn.util.config.ConfigBag;
-import brooklyn.util.flags.SetFromFlag;
 import brooklyn.util.text.Identifiers;
 
 import com.google.common.collect.ImmutableSet;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java b/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java
index d02f1bd..0604f3a 100644
--- a/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java
+++ b/core/src/main/java/brooklyn/basic/BasicConfigurableObject.java
@@ -23,13 +23,13 @@ import org.apache.brooklyn.api.entity.trait.Identifiable;
 import org.apache.brooklyn.api.management.ManagementContext;
 import org.apache.brooklyn.api.management.Task;
 import org.apache.brooklyn.core.management.ManagementContextInjectable;
+import org.apache.brooklyn.core.util.config.ConfigBag;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
 
 import brooklyn.camp.brooklyn.api.HasBrooklynManagementContext;
 import brooklyn.config.ConfigKey;
 import brooklyn.config.ConfigKey.HasConfigKey;
 import brooklyn.config.ConfigMap;
-import brooklyn.util.config.ConfigBag;
-import brooklyn.util.flags.SetFromFlag;
 import brooklyn.util.text.Identifiers;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/basic/BrooklynDynamicType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/BrooklynDynamicType.java b/core/src/main/java/brooklyn/basic/BrooklynDynamicType.java
index dbf8bbc..52d1413 100644
--- a/core/src/main/java/brooklyn/basic/BrooklynDynamicType.java
+++ b/core/src/main/java/brooklyn/basic/BrooklynDynamicType.java
@@ -34,13 +34,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.brooklyn.api.basic.BrooklynObject;
 import org.apache.brooklyn.api.basic.BrooklynType;
+import org.apache.brooklyn.core.util.flags.FlagUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.config.ConfigKey;
 import brooklyn.config.ConfigKey.HasConfigKey;
 import brooklyn.event.basic.BasicConfigKey.BasicConfigKeyOverwriting;
-import brooklyn.util.flags.FlagUtils;
 import brooklyn.util.javalang.Reflections;
 import brooklyn.util.text.Strings;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java b/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java
index 038013f..ef9212a 100644
--- a/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java
+++ b/core/src/main/java/brooklyn/basic/BrooklynObjectInternal.java
@@ -24,10 +24,10 @@ import org.apache.brooklyn.api.basic.BrooklynObject;
 import org.apache.brooklyn.api.entity.rebind.RebindSupport;
 import org.apache.brooklyn.api.entity.rebind.Rebindable;
 import org.apache.brooklyn.api.entity.trait.Configurable;
+import org.apache.brooklyn.core.util.config.ConfigBag;
 
 import brooklyn.config.ConfigKey;
 import brooklyn.config.ConfigKey.HasConfigKey;
-import brooklyn.util.config.ConfigBag;
 import brooklyn.util.guava.Maybe;
 
 import com.google.common.annotations.Beta;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/basic/internal/ApiObjectsFactoryImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/internal/ApiObjectsFactoryImpl.java b/core/src/main/java/brooklyn/basic/internal/ApiObjectsFactoryImpl.java
index 8e0f5a4..654c51a 100644
--- a/core/src/main/java/brooklyn/basic/internal/ApiObjectsFactoryImpl.java
+++ b/core/src/main/java/brooklyn/basic/internal/ApiObjectsFactoryImpl.java
@@ -21,9 +21,9 @@ package brooklyn.basic.internal;
 import org.apache.brooklyn.api.basic.internal.ApiObjectsFactoryInterface;
 import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.management.Task;
+import org.apache.brooklyn.core.util.task.Tasks;
 
 import brooklyn.entity.basic.BrooklynTaskTags;
-import brooklyn.util.task.Tasks;
 
 public class ApiObjectsFactoryImpl implements ApiObjectsFactoryInterface {
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/config/BrooklynProperties.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/BrooklynProperties.java b/core/src/main/java/brooklyn/config/BrooklynProperties.java
index 2c76b21..921fe22 100644
--- a/core/src/main/java/brooklyn/config/BrooklynProperties.java
+++ b/core/src/main/java/brooklyn/config/BrooklynProperties.java
@@ -33,15 +33,15 @@ import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 
+import org.apache.brooklyn.core.util.ResourceUtils;
+import org.apache.brooklyn.core.util.config.ConfigBag;
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.config.ConfigKey.HasConfigKey;
 import brooklyn.event.basic.BasicConfigKey;
-import brooklyn.util.ResourceUtils;
 import brooklyn.util.collections.MutableMap;
-import brooklyn.util.config.ConfigBag;
-import brooklyn.util.flags.TypeCoercions;
 import brooklyn.util.guava.Maybe;
 import brooklyn.util.os.Os;
 import brooklyn.util.text.StringFunctions;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/config/BrooklynServerPaths.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/BrooklynServerPaths.java b/core/src/main/java/brooklyn/config/BrooklynServerPaths.java
index a865d5b..0e0a5c9 100644
--- a/core/src/main/java/brooklyn/config/BrooklynServerPaths.java
+++ b/core/src/main/java/brooklyn/config/BrooklynServerPaths.java
@@ -25,6 +25,7 @@ import javax.annotation.Nullable;
 
 import org.apache.brooklyn.api.management.ManagementContext;
 import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.util.text.TemplateProcessor;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,7 +37,6 @@ import brooklyn.util.net.Urls;
 import brooklyn.util.os.Os;
 import brooklyn.util.text.Identifiers;
 import brooklyn.util.text.Strings;
-import brooklyn.util.text.TemplateProcessor;
 import brooklyn.util.time.Time;
 
 import com.google.common.base.Objects;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java b/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java
index defb5bc..c648654 100644
--- a/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java
+++ b/core/src/main/java/brooklyn/config/internal/AbstractConfigMapImpl.java
@@ -23,6 +23,8 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.Future;
 
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
+import org.apache.brooklyn.core.util.task.DeferredSupplier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,8 +33,6 @@ import brooklyn.config.ConfigKey.HasConfigKey;
 import brooklyn.config.ConfigMap;
 import brooklyn.entity.basic.ConfigMapViewWithStringKeys;
 import brooklyn.event.basic.StructuredConfigKey;
-import brooklyn.util.flags.TypeCoercions;
-import brooklyn.util.task.DeferredSupplier;
 
 public abstract class AbstractConfigMapImpl implements ConfigMap {
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java b/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java
index 1089ae4..4924684 100644
--- a/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java
@@ -26,12 +26,12 @@ import java.util.Map;
 
 import org.apache.brooklyn.api.event.AttributeSensor;
 import org.apache.brooklyn.api.event.SensorEventListener;
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.enricher.basic.AbstractAggregatingEnricher;
 import brooklyn.util.GroovyJavaMethods;
-import brooklyn.util.flags.TypeCoercions;
 
 import com.google.common.base.Function;
 import com.google.common.base.Throwables;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/Enrichers.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/Enrichers.java b/core/src/main/java/brooklyn/enricher/Enrichers.java
index 54af8d1..00aa03f 100644
--- a/core/src/main/java/brooklyn/enricher/Enrichers.java
+++ b/core/src/main/java/brooklyn/enricher/Enrichers.java
@@ -32,6 +32,7 @@ import org.apache.brooklyn.api.event.Sensor;
 import org.apache.brooklyn.api.event.SensorEvent;
 import org.apache.brooklyn.api.policy.Enricher;
 import org.apache.brooklyn.api.policy.EnricherSpec;
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
 
 import brooklyn.enricher.basic.AbstractEnricher;
 import brooklyn.enricher.basic.Aggregator;
@@ -43,7 +44,6 @@ import brooklyn.enricher.basic.UpdatingMap;
 import brooklyn.util.collections.MutableList;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.collections.MutableSet;
-import brooklyn.util.flags.TypeCoercions;
 import brooklyn.util.text.StringPredicates;
 import brooklyn.util.text.Strings;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java b/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java
index da5e822..5bca143 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java
@@ -29,6 +29,7 @@ import org.apache.brooklyn.api.event.Sensor;
 import org.apache.brooklyn.api.mementos.EnricherMemento;
 import org.apache.brooklyn.api.policy.Enricher;
 import org.apache.brooklyn.api.policy.EnricherType;
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
 
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.basic.ConfigKeys;
@@ -36,7 +37,6 @@ import brooklyn.entity.basic.Entities;
 import brooklyn.entity.basic.EntityInternal;
 import brooklyn.entity.rebind.BasicEnricherRebindSupport;
 import brooklyn.policy.basic.AbstractEntityAdjunct;
-import brooklyn.util.flags.TypeCoercions;
 
 import com.google.common.base.Objects;
 import com.google.common.collect.Maps;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java b/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java
index af47c59..84db77f 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java
@@ -30,12 +30,12 @@ import org.apache.brooklyn.api.event.AttributeSensor;
 import org.apache.brooklyn.api.event.Sensor;
 import org.apache.brooklyn.api.event.SensorEvent;
 import org.apache.brooklyn.api.event.SensorEventListener;
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.config.BrooklynLogging;
 import brooklyn.util.collections.MutableMap;
-import brooklyn.util.flags.TypeCoercions;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java b/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java
index 7bf0ef6..cd9a33f 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java
@@ -23,9 +23,9 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal;
 import org.apache.brooklyn.api.event.AttributeSensor;
 import org.apache.brooklyn.api.event.Sensor;
 import org.apache.brooklyn.api.event.SensorEventListener;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
 
 import brooklyn.event.basic.BasicSensorEvent;
-import brooklyn.util.flags.SetFromFlag;
 
 /**
  * Convenience base for transforming a single sensor into a single new sensor of the same type

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/basic/Aggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/Aggregator.java b/core/src/main/java/brooklyn/enricher/basic/Aggregator.java
index c14487b..5512c28 100644
--- a/core/src/main/java/brooklyn/enricher/basic/Aggregator.java
+++ b/core/src/main/java/brooklyn/enricher/basic/Aggregator.java
@@ -30,6 +30,7 @@ import org.apache.brooklyn.api.event.AttributeSensor;
 import org.apache.brooklyn.api.event.Sensor;
 import org.apache.brooklyn.api.event.SensorEvent;
 import org.apache.brooklyn.api.event.SensorEventListener;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +41,6 @@ import brooklyn.entity.basic.ConfigKeys;
 import brooklyn.util.collections.MutableList;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.exceptions.Exceptions;
-import brooklyn.util.flags.SetFromFlag;
 import brooklyn.util.text.StringPredicates;
 
 import com.google.common.base.Function;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/basic/Joiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/Joiner.java b/core/src/main/java/brooklyn/enricher/basic/Joiner.java
index 8c65681..f9e9d4e 100644
--- a/core/src/main/java/brooklyn/enricher/basic/Joiner.java
+++ b/core/src/main/java/brooklyn/enricher/basic/Joiner.java
@@ -26,6 +26,7 @@ import org.apache.brooklyn.api.event.AttributeSensor;
 import org.apache.brooklyn.api.event.Sensor;
 import org.apache.brooklyn.api.event.SensorEvent;
 import org.apache.brooklyn.api.event.SensorEventListener;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,7 +34,6 @@ import brooklyn.config.ConfigKey;
 import brooklyn.entity.basic.ConfigKeys;
 import brooklyn.event.basic.BasicSensorEvent;
 import brooklyn.util.collections.MutableList;
-import brooklyn.util.flags.SetFromFlag;
 import brooklyn.util.text.StringEscapes;
 import brooklyn.util.text.Strings;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/basic/Propagator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/Propagator.java b/core/src/main/java/brooklyn/enricher/basic/Propagator.java
index 187ad8d..f6d2ee8 100644
--- a/core/src/main/java/brooklyn/enricher/basic/Propagator.java
+++ b/core/src/main/java/brooklyn/enricher/basic/Propagator.java
@@ -28,6 +28,9 @@ import org.apache.brooklyn.api.event.AttributeSensor;
 import org.apache.brooklyn.api.event.Sensor;
 import org.apache.brooklyn.api.event.SensorEvent;
 import org.apache.brooklyn.api.event.SensorEventListener;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
+import org.apache.brooklyn.core.util.task.Tasks;
+import org.apache.brooklyn.core.util.task.ValueResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,9 +38,6 @@ import brooklyn.config.ConfigKey;
 import brooklyn.entity.basic.Attributes;
 import brooklyn.entity.basic.ConfigKeys;
 import brooklyn.util.collections.MutableMap;
-import brooklyn.util.flags.SetFromFlag;
-import brooklyn.util.task.Tasks;
-import brooklyn.util.task.ValueResolver;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/basic/Transformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/Transformer.java b/core/src/main/java/brooklyn/enricher/basic/Transformer.java
index 7e331ba..705c626 100644
--- a/core/src/main/java/brooklyn/enricher/basic/Transformer.java
+++ b/core/src/main/java/brooklyn/enricher/basic/Transformer.java
@@ -21,14 +21,14 @@ package brooklyn.enricher.basic;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.core.util.task.Tasks;
+import org.apache.brooklyn.core.util.task.ValueResolver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.basic.ConfigKeys;
 import brooklyn.util.collections.MutableSet;
-import brooklyn.util.task.Tasks;
-import brooklyn.util.task.ValueResolver;
 
 import com.google.common.base.Function;
 import com.google.common.reflect.TypeToken;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java b/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java
index a973774..a396e6c 100644
--- a/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java
+++ b/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java
@@ -25,6 +25,7 @@ import org.apache.brooklyn.api.event.AttributeSensor;
 import org.apache.brooklyn.api.event.Sensor;
 import org.apache.brooklyn.api.event.SensorEvent;
 import org.apache.brooklyn.api.event.SensorEventListener;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,7 +34,6 @@ import brooklyn.entity.basic.ConfigKeys;
 import brooklyn.entity.basic.Entities;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.exceptions.Exceptions;
-import brooklyn.util.flags.SetFromFlag;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Maps;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java b/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java
index 65df607..f94c203 100644
--- a/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java
@@ -19,13 +19,13 @@
 package brooklyn.enricher.basic;
 
 import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.config.ConfigKey;
 import brooklyn.enricher.basic.AbstractTransformer;
 import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.util.flags.TypeCoercions;
 import brooklyn.util.time.Duration;
 
 import com.google.common.base.Function;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java b/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java
index bf29732..2988aeb 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEffector.java
@@ -27,14 +27,14 @@ import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.entity.ParameterType;
 import org.apache.brooklyn.api.management.Task;
 import org.apache.brooklyn.core.management.internal.EffectorUtils;
+import org.apache.brooklyn.core.util.config.ConfigBag;
+import org.apache.brooklyn.core.util.task.DynamicSequentialTask;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import brooklyn.entity.effector.EffectorBase;
 import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory;
 import brooklyn.entity.effector.EffectorWithBody;
-import brooklyn.util.config.ConfigBag;
-import brooklyn.util.task.DynamicSequentialTask;
 
 import com.google.common.collect.ImmutableMap;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
index 1d21a7e..4bdae46 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
@@ -60,6 +60,10 @@ import org.apache.brooklyn.core.management.internal.EffectorUtils;
 import org.apache.brooklyn.core.management.internal.EntityManagementSupport;
 import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
 import org.apache.brooklyn.core.management.internal.SubscriptionTracker;
+import org.apache.brooklyn.core.util.config.ConfigBag;
+import org.apache.brooklyn.core.util.flags.FlagUtils;
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
+import org.apache.brooklyn.core.util.task.DeferredSupplier;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,12 +95,8 @@ import brooklyn.util.collections.MutableList;
 import brooklyn.util.collections.MutableMap;
 import brooklyn.util.collections.MutableSet;
 import brooklyn.util.collections.SetFromLiveMap;
-import brooklyn.util.config.ConfigBag;
-import brooklyn.util.flags.FlagUtils;
-import brooklyn.util.flags.TypeCoercions;
 import brooklyn.util.guava.Maybe;
 import brooklyn.util.javalang.Equals;
-import brooklyn.util.task.DeferredSupplier;
 import brooklyn.util.text.Strings;
 
 import com.google.common.annotations.Beta;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/BasicGroup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/BasicGroup.java b/core/src/main/java/brooklyn/entity/basic/BasicGroup.java
index 0bb67b6..05606af 100644
--- a/core/src/main/java/brooklyn/entity/basic/BasicGroup.java
+++ b/core/src/main/java/brooklyn/entity/basic/BasicGroup.java
@@ -19,10 +19,10 @@
 package brooklyn.entity.basic;
 
 import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
 
 import brooklyn.config.ConfigKey;
 import brooklyn.event.basic.BasicConfigKey;
-import brooklyn.util.flags.SetFromFlag;
 
 @ImplementedBy(BasicGroupImpl.class)
 public interface BasicGroup extends AbstractGroup {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
index 7910267..d9e4903 100644
--- a/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
+++ b/core/src/main/java/brooklyn/entity/basic/BrooklynConfigKeys.java
@@ -26,9 +26,9 @@ import brooklyn.event.basic.AttributeSensorAndConfigKey;
 import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey;
 
 import org.apache.brooklyn.api.location.Location;
+import org.apache.brooklyn.core.util.internal.ssh.ShellTool;
+import org.apache.brooklyn.core.util.internal.ssh.SshTool;
 
-import brooklyn.util.internal.ssh.ShellTool;
-import brooklyn.util.internal.ssh.SshTool;
 import brooklyn.util.time.Duration;
 
 import com.google.common.base.Preconditions;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java b/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java
index 6032fff..79fe68f 100644
--- a/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java
+++ b/core/src/main/java/brooklyn/entity/basic/BrooklynShutdownHooks.java
@@ -27,6 +27,7 @@ import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.management.ManagementContext;
 import org.apache.brooklyn.api.management.Task;
 import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.util.task.Tasks;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +37,6 @@ import brooklyn.util.collections.MutableSet;
 import brooklyn.util.exceptions.Exceptions;
 import brooklyn.util.exceptions.RuntimeInterruptedException;
 import brooklyn.util.javalang.Threads;
-import brooklyn.util.task.Tasks;
 import brooklyn.util.time.CountdownTimer;
 import brooklyn.util.time.Duration;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java b/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java
index 3cdfc39..2904ff5 100644
--- a/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java
+++ b/core/src/main/java/brooklyn/entity/basic/BrooklynTaskTags.java
@@ -33,16 +33,16 @@ import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.management.ExecutionManager;
 import org.apache.brooklyn.api.management.Task;
 import org.apache.brooklyn.api.management.entitlement.EntitlementContext;
+import org.apache.brooklyn.core.util.config.ConfigBag;
+import org.apache.brooklyn.core.util.task.TaskTags;
+import org.apache.brooklyn.core.util.task.Tasks;
 import org.codehaus.jackson.annotate.JsonProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import brooklyn.util.config.ConfigBag;
 import brooklyn.util.guava.Maybe;
 import brooklyn.util.javalang.MemoryUsageTracker;
 import brooklyn.util.stream.Streams;
-import brooklyn.util.task.TaskTags;
-import brooklyn.util.task.Tasks;
 import brooklyn.util.text.StringEscapes.BashStringEscapes;
 import brooklyn.util.text.Strings;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java b/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java
index 2b22a90..a50c800 100644
--- a/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java
+++ b/core/src/main/java/brooklyn/entity/basic/ConfigKeys.java
@@ -22,6 +22,7 @@ import java.util.Map;
 
 import javax.annotation.Nonnull;
 
+import org.apache.brooklyn.core.util.config.ConfigBag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,7 +33,6 @@ import brooklyn.event.basic.BasicConfigKey;
 import brooklyn.event.basic.TemplatedStringAttributeSensorAndConfigKey;
 import brooklyn.event.basic.BasicConfigKey.BasicConfigKeyOverwriting;
 import brooklyn.event.basic.PortAttributeSensorAndConfigKey;
-import brooklyn.util.config.ConfigBag;
 import brooklyn.util.text.Strings;
 import brooklyn.util.time.Duration;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/DataEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DataEntity.java b/core/src/main/java/brooklyn/entity/basic/DataEntity.java
index 27f1c33..534e125 100644
--- a/core/src/main/java/brooklyn/entity/basic/DataEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/DataEntity.java
@@ -23,10 +23,10 @@ import java.util.Map;
 import org.apache.brooklyn.api.entity.Entity;
 import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
 import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
 
 import brooklyn.config.ConfigKey;
 import brooklyn.entity.trait.Startable;
-import brooklyn.util.flags.SetFromFlag;
 
 import com.google.common.base.Supplier;
 import com.google.common.reflect.TypeToken;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java b/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java
index 078fc88..9ad8c83 100644
--- a/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java
+++ b/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java
@@ -23,6 +23,7 @@ import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
 import org.apache.brooklyn.api.event.AttributeSensor;
 import org.apache.brooklyn.api.event.Sensor;
 import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
 
 import com.google.common.base.Predicate;
 import com.google.common.reflect.TypeToken;
@@ -31,7 +32,6 @@ import brooklyn.config.ConfigKey;
 import brooklyn.entity.annotation.Effector;
 import brooklyn.entity.trait.Startable;
 import brooklyn.event.basic.Sensors;
-import brooklyn.util.flags.SetFromFlag;
 import groovy.lang.Closure;
 
 @ImplementedBy(DynamicGroupImpl.class)

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
index 7ffe8a0..3b1eb47 100644
--- a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
+++ b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
@@ -30,6 +30,7 @@ import org.apache.brooklyn.api.event.SensorEventListener;
 import org.apache.brooklyn.api.management.Task;
 import org.apache.brooklyn.core.management.internal.CollectionChangeListener;
 import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
+import org.apache.brooklyn.core.util.task.Tasks;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +38,6 @@ import brooklyn.config.BrooklynLogging;
 import brooklyn.config.BrooklynLogging.LoggingLevel;
 import brooklyn.util.GroovyJavaMethods;
 import brooklyn.util.exceptions.Exceptions;
-import brooklyn.util.task.Tasks;
 
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java b/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java
index 0abb90c..f60f408 100644
--- a/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java
+++ b/core/src/main/java/brooklyn/entity/basic/EffectorStartableImpl.java
@@ -29,8 +29,7 @@ import brooklyn.entity.annotation.EffectorParam;
 import brooklyn.entity.trait.Startable;
 
 import org.apache.brooklyn.api.location.Location;
-
-import brooklyn.util.config.ConfigBag;
+import org.apache.brooklyn.core.util.config.ConfigBag;
 
 import com.google.common.reflect.TypeToken;
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/Entities.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/Entities.java b/core/src/main/java/brooklyn/entity/basic/Entities.java
index c768726..635e99c 100644
--- a/core/src/main/java/brooklyn/entity/basic/Entities.java
+++ b/core/src/main/java/brooklyn/entity/basic/Entities.java
@@ -64,6 +64,15 @@ import org.apache.brooklyn.core.management.internal.EntityManagerInternal;
 import org.apache.brooklyn.core.management.internal.LocalManagementContext;
 import org.apache.brooklyn.core.management.internal.ManagementContextInternal;
 import org.apache.brooklyn.core.management.internal.NonDeploymentManagementContext;
+import org.apache.brooklyn.core.util.ResourceUtils;
+import org.apache.brooklyn.core.util.config.ConfigBag;
+import org.apache.brooklyn.core.util.flags.FlagUtils;
+import org.apache.brooklyn.core.util.task.DynamicTasks;
+import org.apache.brooklyn.core.util.task.ParallelTask;
+import org.apache.brooklyn.core.util.task.TaskTags;
+import org.apache.brooklyn.core.util.task.Tasks;
+import org.apache.brooklyn.core.util.task.system.ProcessTaskWrapper;
+import org.apache.brooklyn.core.util.task.system.SystemTasks;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -80,20 +89,11 @@ import brooklyn.event.basic.DependentConfiguration;
 import org.apache.brooklyn.location.basic.LocationInternal;
 import org.apache.brooklyn.location.basic.Locations;
 
-import brooklyn.util.ResourceUtils;
 import brooklyn.util.collections.MutableMap;
-import brooklyn.util.config.ConfigBag;
 import brooklyn.util.exceptions.Exceptions;
-import brooklyn.util.flags.FlagUtils;
 import brooklyn.util.guava.Maybe;
 import brooklyn.util.repeat.Repeater;
 import brooklyn.util.stream.Streams;
-import brooklyn.util.task.DynamicTasks;
-import brooklyn.util.task.ParallelTask;
-import brooklyn.util.task.TaskTags;
-import brooklyn.util.task.Tasks;
-import brooklyn.util.task.system.ProcessTaskWrapper;
-import brooklyn.util.task.system.SystemTasks;
 import brooklyn.util.time.Duration;
 
 import com.google.common.annotations.Beta;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java b/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java
index 988d6d7..8a7a9f0 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityConfigMap.java
@@ -28,6 +28,11 @@ import java.util.Set;
 
 import org.apache.brooklyn.api.management.ExecutionContext;
 import org.apache.brooklyn.api.management.Task;
+import org.apache.brooklyn.core.util.config.ConfigBag;
+import org.apache.brooklyn.core.util.flags.FlagUtils;
+import org.apache.brooklyn.core.util.flags.SetFromFlag;
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
+import org.apache.brooklyn.core.util.internal.ConfigKeySelfExtracting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,12 +41,7 @@ import brooklyn.config.ConfigKey;
 import brooklyn.config.internal.AbstractConfigMapImpl;
 import brooklyn.event.basic.StructuredConfigKey;
 import brooklyn.util.collections.MutableMap;
-import brooklyn.util.config.ConfigBag;
-import brooklyn.util.flags.FlagUtils;
-import brooklyn.util.flags.SetFromFlag;
-import brooklyn.util.flags.TypeCoercions;
 import brooklyn.util.guava.Maybe;
-import brooklyn.util.internal.ConfigKeySelfExtracting;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Maps;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
index 4e02948..d9afc44 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
@@ -30,9 +30,9 @@ import org.apache.brooklyn.api.entity.trait.Identifiable;
 import org.apache.brooklyn.api.event.AttributeSensor;
 import org.apache.brooklyn.api.location.Location;
 import org.apache.brooklyn.api.management.ManagementContext;
+import org.apache.brooklyn.core.util.flags.TypeCoercions;
 
 import brooklyn.config.ConfigKey;
-import brooklyn.util.flags.TypeCoercions;
 import brooklyn.util.guava.Functionals;
 
 import com.google.common.base.Function;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a4c0e5fd/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
index 085079f..36e6907 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
@@ -33,10 +33,10 @@ import org.apache.brooklyn.api.management.ManagementContext;
 import org.apache.brooklyn.api.management.SubscriptionContext;
 import org.apache.brooklyn.api.mementos.EntityMemento;
 import org.apache.brooklyn.core.management.internal.EntityManagementSupport;
+import org.apache.brooklyn.core.util.config.ConfigBag;
 
 import brooklyn.basic.BrooklynObjectInternal;
 import brooklyn.config.ConfigKey;
-import brooklyn.util.config.ConfigBag;
 
 import com.google.common.annotations.Beta;
 



Mime
View raw message