This closes #820
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ab3a3db1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ab3a3db1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ab3a3db1 Branch: refs/heads/master Commit: ab3a3db1b728f9e5f0f601b8d0344d4a873fd58e Parents: ff5ec44 c14fef5 Author: Alex Heneveld <[email protected]> Authored: Tue Aug 18 11:27:42 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Tue Aug 18 11:27:42 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/brooklyn/BrooklynVersion.java | 6 +- .../brooklyn/basic/AbstractBrooklynObject.java | 249 ---- .../brooklyn/basic/BasicConfigurableObject.java | 120 -- .../brooklyn/basic/BrooklynDynamicType.java | 284 ----- .../brooklyn/basic/BrooklynObjectInternal.java | 104 -- .../brooklyn/basic/BrooklynTypeSnapshot.java | 102 -- .../main/java/brooklyn/basic/BrooklynTypes.java | 132 --- .../basic/internal/ApiObjectsFactoryImpl.java | 42 - .../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 | 4 +- .../basic/AbstractMultipleSensorAggregator.java | 2 +- .../basic/AbstractTypeTransformingEnricher.java | 2 +- .../brooklyn/enricher/basic/Aggregator.java | 2 +- .../enricher/basic/EnricherDynamicType.java | 2 +- .../enricher/basic/EnricherTypeSnapshot.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 | 16 +- .../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 | 20 +- .../brooklyn/entity/basic/EntityConfigMap.java | 10 +- .../entity/basic/EntityDynamicType.java | 2 +- .../brooklyn/entity/basic/EntityFunctions.java | 2 +- .../brooklyn/entity/basic/EntityInternal.java | 4 +- .../basic/EntityTransientCopyInternal.java | 2 +- .../entity/basic/EntityTypeSnapshot.java | 2 +- .../java/brooklyn/entity/basic/EntityTypes.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 +- .../group/AbstractMembershipTrackingPolicy.java | 2 +- .../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 | 6 +- .../proxying/InternalLocationFactory.java | 4 +- .../entity/proxying/InternalPolicyFactory.java | 4 +- .../AbstractBrooklynObjectRebindSupport.java | 4 +- .../rebind/ActivePartialRebindIteration.java | 2 +- .../rebind/BasicCatalogItemRebindSupport.java | 2 +- .../rebind/BasicEnricherRebindSupport.java | 4 +- .../entity/rebind/BasicEntityRebindSupport.java | 2 +- .../entity/rebind/BasicFeedRebindSupport.java | 4 +- .../rebind/BasicLocationRebindSupport.java | 4 +- .../entity/rebind/BasicPolicyRebindSupport.java | 7 +- .../rebind/ImmediateDeltaChangeListener.java | 2 +- .../rebind/PeriodicDeltaChangeListener.java | 6 +- .../brooklyn/entity/rebind/RebindIteration.java | 8 +- .../entity/rebind/RebindManagerImpl.java | 6 +- .../entity/rebind/dto/BasicEntityMemento.java | 3 +- .../entity/rebind/dto/BasicLocationMemento.java | 2 +- .../entity/rebind/dto/MementosGenerators.java | 8 +- .../BrooklynMementoPersisterToObjectStore.java | 2 +- .../persister/BrooklynPersistenceUtils.java | 4 +- .../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 +- .../java/brooklyn/event/feed/AbstractFeed.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 | 510 -------- .../brooklyn/policy/basic/AbstractPolicy.java | 119 -- .../java/brooklyn/policy/basic/AdjunctType.java | 174 --- .../brooklyn/policy/basic/ConfigMapImpl.java | 140 --- .../policy/basic/GeneralPurposePolicy.java | 36 - .../java/brooklyn/policy/basic/Policies.java | 73 -- .../policy/basic/PolicyDynamicType.java | 44 - .../policy/basic/PolicyTypeSnapshot.java | 40 - .../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 - .../brooklyn/basic/AbstractBrooklynObject.java | 249 ++++ .../brooklyn/basic/BasicConfigurableObject.java | 120 ++ .../brooklyn/basic/BrooklynDynamicType.java | 284 +++++ .../brooklyn/basic/BrooklynObjectInternal.java | 104 ++ .../brooklyn/basic/BrooklynTypeSnapshot.java | 102 ++ .../apache/brooklyn/basic/BrooklynTypes.java | 132 +++ .../basic/internal/ApiObjectsFactoryImpl.java | 42 + .../catalog/internal/BasicBrooklynCatalog.java | 4 +- .../catalog/internal/CatalogClasspathDo.java | 6 +- .../core/catalog/internal/CatalogDto.java | 2 +- .../core/catalog/internal/CatalogDtoUtils.java | 2 +- .../catalog/internal/CatalogInitialization.java | 4 +- .../core/catalog/internal/CatalogItemDo.java | 2 +- .../internal/CatalogItemDtoAbstract.java | 6 +- .../core/catalog/internal/CatalogUtils.java | 2 +- .../catalog/internal/CatalogXmlSerializer.java | 8 +- .../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 +- .../policy/basic/AbstractEntityAdjunct.java | 510 ++++++++ .../core/policy/basic/AbstractPolicy.java | 119 ++ .../brooklyn/core/policy/basic/AdjunctType.java | 174 +++ .../core/policy/basic/ConfigMapImpl.java | 140 +++ .../core/policy/basic/GeneralPurposePolicy.java | 36 + .../brooklyn/core/policy/basic/Policies.java | 73 ++ .../core/policy/basic/PolicyDynamicType.java | 44 + .../core/policy/basic/PolicyTypeSnapshot.java | 40 + .../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 | 8 +- .../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/LocationDynamicType.java | 2 +- .../location/basic/LocationInternal.java | 4 +- ...ocationPropertiesFromBrooklynProperties.java | 4 +- .../location/basic/LocationTypeSnapshot.java | 2 +- .../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 | 4 +- ...pi.basic.internal.ApiObjectsFactoryInterface | 2 +- .../brooklyn/camp/lite/CampYamlLiteTest.java | 4 +- .../camp/lite/TestAppAssemblyInstantiator.java | 2 +- .../enricher/basic/BasicEnricherTest.java | 2 +- .../java/brooklyn/entity/EffectorSayHiTest.java | 2 +- .../entity/EntityPreManagementTest.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 | 4 +- ...apListAndOtherStructuredConfigKeyTest.groovy | 2 +- .../entity/basic/PolicyRegistrationTest.java | 2 +- .../brooklyn/entity/basic/SanitizerTest.java | 3 +- .../entity/effector/EffectorBasicTest.java | 2 +- .../effector/EffectorConcatenateTest.java | 4 +- .../entity/effector/EffectorTaskTest.java | 10 +- .../entity/group/GroupPickUpEntitiesTest.java | 2 +- .../java/brooklyn/entity/rebind/Dumpers.java | 2 +- .../entity/rebind/RebindCatalogEntityTest.java | 3 +- .../entity/rebind/RebindCatalogItemTest.java | 3 +- .../entity/rebind/RebindEnricherTest.java | 2 +- .../rebind/RebindEntityDynamicTypeInfoTest.java | 2 +- .../entity/rebind/RebindEntityTest.java | 2 +- .../entity/rebind/RebindFailuresTest.java | 4 +- .../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 | 4 +- .../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 | 89 -- .../brooklyn/policy/basic/EnricherTypeTest.java | 59 - .../brooklyn/policy/basic/PolicyConfigTest.java | 202 ---- .../policy/basic/PolicySubscriptionTest.java | 125 -- .../brooklyn/policy/basic/PolicyTypeTest.java | 58 - .../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 | 4 +- .../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/policy/basic/BasicPolicyTest.java | 90 ++ .../core/policy/basic/EnricherTypeTest.java | 59 + .../core/policy/basic/PolicyConfigTest.java | 202 ++++ .../policy/basic/PolicySubscriptionTest.java | 128 ++ .../core/policy/basic/PolicyTypeTest.java | 59 + .../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/KafkaClusterExample.java | 2 +- .../demo/StandaloneQpidBrokerExample.java | 4 +- .../brooklyn/demo/CumulusRDFApplication.java | 8 +- .../apache/brooklyn/demo/StormSampleApp.java | 2 +- .../demo/WebClusterDatabaseExampleApp.java | 6 +- .../demo/WebClusterDatabaseExampleGroovy.groovy | 6 +- .../policy/os/AdvertiseWinrmLoginPolicy.java | 3 +- .../brooklyn/policy/os/CreateUserPolicy.java | 6 +- .../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 | 8 +- .../policy/followthesun/FollowTheSunPolicy.java | 4 +- .../policy/ha/AbstractFailureDetector.java | 8 +- .../policy/ha/ConditionalSuspendPolicy.java | 4 +- .../policy/ha/ConnectionFailureDetector.java | 2 +- .../policy/ha/ServiceFailureDetector.java | 8 +- .../brooklyn/policy/ha/ServiceReplacer.java | 6 +- .../brooklyn/policy/ha/ServiceRestarter.java | 6 +- .../policy/ha/SshMachineFailureDetector.java | 4 +- .../loadbalancing/ItemsInContainersGroup.java | 2 +- .../loadbalancing/LoadBalancingPolicy.java | 4 +- .../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 +- .../entity/database/derby/DerbyDatabase.java | 4 +- .../database/derby/DerbyDatabaseSshDriver.java | 4 +- .../entity/database/derby/DerbySchema.java | 8 +- .../postgresql/PostgreSqlNodeSaltImpl.java | 12 +- .../apache/brooklyn/entity/salt/SaltConfig.java | 11 +- .../brooklyn/entity/salt/SaltConfigs.java | 4 +- .../entity/salt/SaltLifecycleEffectorTasks.java | 8 +- .../brooklyn/entity/salt/SaltStackMaster.java | 9 +- .../entity/salt/SaltStackMasterSshDriver.java | 5 +- .../apache/brooklyn/entity/salt/SaltTasks.java | 13 +- .../postgresql/PostgreSqlSaltLiveTest.java | 11 +- .../brooklyn/entity/salt/SaltConfigsTest.java | 2 +- .../entity/salt/SaltLiveTestSupport.java | 8 +- .../entity/monitoring/zabbix/ZabbixFeed.java | 4 +- .../monitoring/zabbix/ZabbixMonitored.java | 2 +- .../monitoring/zabbix/ZabbixPollConfig.java | 2 +- .../entity/monitoring/zabbix/ZabbixServer.java | 2 +- .../nosql/hazelcast/HazelcastCluster.java | 9 +- .../nosql/hazelcast/HazelcastClusterImpl.java | 8 +- .../entity/nosql/hazelcast/HazelcastNode.java | 9 +- .../nosql/hazelcast/HazelcastNodeImpl.java | 2 +- .../nosql/hazelcast/HazelcastNodeSshDriver.java | 6 +- .../nosql/infinispan/Infinispan5Server.java | 4 +- .../nosql/infinispan/Infinispan5SshDriver.java | 4 +- .../hazelcast/HazelcastClusterEc2LiveTest.java | 4 +- .../HazelcastClusterSoftlayerLiveTest.java | 4 +- .../Infinispan5ServerIntegrationTest.groovy | 6 +- .../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 +- software/messaging/pom.xml | 10 +- .../entity/messaging/MessageBroker.java | 34 - .../java/brooklyn/entity/messaging/Queue.java | 51 - .../java/brooklyn/entity/messaging/Topic.java | 46 - .../messaging/activemq/ActiveMQBroker.java | 81 -- .../messaging/activemq/ActiveMQBrokerImpl.java | 124 -- .../messaging/activemq/ActiveMQDestination.java | 24 - .../activemq/ActiveMQDestinationImpl.java | 66 -- .../messaging/activemq/ActiveMQDriver.java | 28 - .../messaging/activemq/ActiveMQQueue.java | 27 - .../messaging/activemq/ActiveMQQueueImpl.java | 69 -- .../messaging/activemq/ActiveMQSpecs.java | 33 - .../messaging/activemq/ActiveMQSshDriver.java | 145 --- .../messaging/activemq/ActiveMQTopic.java | 27 - .../messaging/activemq/ActiveMQTopicImpl.java | 50 - .../entity/messaging/amqp/AmqpExchange.java | 45 - .../entity/messaging/amqp/AmqpServer.java | 53 - .../entity/messaging/jms/JMSBroker.java | 58 - .../entity/messaging/jms/JMSBrokerImpl.java | 168 --- .../entity/messaging/jms/JMSDestination.java | 29 - .../messaging/jms/JMSDestinationImpl.java | 51 - .../kafka/AbstractfKafkaSshDriver.java | 133 --- .../brooklyn/entity/messaging/kafka/Kafka.java | 44 - .../entity/messaging/kafka/KafkaBroker.java | 83 -- .../messaging/kafka/KafkaBrokerDriver.java | 27 - .../entity/messaging/kafka/KafkaBrokerImpl.java | 170 --- .../messaging/kafka/KafkaBrokerSshDriver.java | 97 -- .../entity/messaging/kafka/KafkaCluster.java | 92 -- .../messaging/kafka/KafkaClusterImpl.java | 206 ---- .../entity/messaging/kafka/KafkaZooKeeper.java | 58 - .../messaging/kafka/KafkaZooKeeperDriver.java | 28 - .../messaging/kafka/KafkaZooKeeperImpl.java | 47 - .../kafka/KafkaZooKeeperSshDriver.java | 82 -- .../entity/messaging/qpid/QpidBroker.java | 79 -- .../entity/messaging/qpid/QpidBrokerImpl.java | 147 --- .../entity/messaging/qpid/QpidDestination.java | 32 - .../messaging/qpid/QpidDestinationImpl.java | 101 -- .../entity/messaging/qpid/QpidDriver.java | 28 - .../entity/messaging/qpid/QpidQueue.java | 29 - .../entity/messaging/qpid/QpidQueueImpl.java | 66 -- .../entity/messaging/qpid/QpidSshDriver.java | 137 --- .../entity/messaging/qpid/QpidTopic.java | 27 - .../entity/messaging/qpid/QpidTopicImpl.java | 56 - .../entity/messaging/rabbit/RabbitBroker.java | 91 -- .../messaging/rabbit/RabbitBrokerImpl.java | 121 -- .../messaging/rabbit/RabbitDestination.java | 92 -- .../entity/messaging/rabbit/RabbitDriver.java | 32 - .../entity/messaging/rabbit/RabbitQueue.java | 85 -- .../messaging/rabbit/RabbitSshDriver.java | 208 ---- .../brooklyn/entity/messaging/storm/Storm.java | 105 -- .../entity/messaging/storm/StormDeployment.java | 42 - .../messaging/storm/StormDeploymentImpl.java | 77 -- .../entity/messaging/storm/StormDriver.java | 27 - .../entity/messaging/storm/StormImpl.java | 118 -- .../entity/messaging/storm/StormSshDriver.java | 272 ----- .../entity/zookeeper/AbstractZooKeeperImpl.java | 109 -- .../entity/zookeeper/ZooKeeperDriver.java | 27 - .../entity/zookeeper/ZooKeeperEnsemble.java | 53 - .../entity/zookeeper/ZooKeeperEnsembleImpl.java | 105 -- .../entity/zookeeper/ZooKeeperNode.java | 67 -- .../entity/zookeeper/ZooKeeperNodeImpl.java | 33 - .../entity/zookeeper/ZooKeeperSshDriver.java | 163 --- .../entity/messaging/MessageBroker.java | 34 + .../apache/brooklyn/entity/messaging/Queue.java | 51 + .../apache/brooklyn/entity/messaging/Topic.java | 46 + .../messaging/activemq/ActiveMQBroker.java | 81 ++ .../messaging/activemq/ActiveMQBrokerImpl.java | 124 ++ .../messaging/activemq/ActiveMQDestination.java | 24 + .../activemq/ActiveMQDestinationImpl.java | 66 ++ .../messaging/activemq/ActiveMQDriver.java | 28 + .../messaging/activemq/ActiveMQQueue.java | 27 + .../messaging/activemq/ActiveMQQueueImpl.java | 69 ++ .../messaging/activemq/ActiveMQSpecs.java | 33 + .../messaging/activemq/ActiveMQSshDriver.java | 145 +++ .../messaging/activemq/ActiveMQTopic.java | 27 + .../messaging/activemq/ActiveMQTopicImpl.java | 50 + .../entity/messaging/amqp/AmqpExchange.java | 45 + .../entity/messaging/amqp/AmqpServer.java | 53 + .../entity/messaging/jms/JMSBroker.java | 58 + .../entity/messaging/jms/JMSBrokerImpl.java | 168 +++ .../entity/messaging/jms/JMSDestination.java | 29 + .../messaging/jms/JMSDestinationImpl.java | 51 + .../kafka/AbstractfKafkaSshDriver.java | 133 +++ .../brooklyn/entity/messaging/kafka/Kafka.java | 45 + .../entity/messaging/kafka/KafkaBroker.java | 85 ++ .../messaging/kafka/KafkaBrokerDriver.java | 27 + .../entity/messaging/kafka/KafkaBrokerImpl.java | 170 +++ .../messaging/kafka/KafkaBrokerSshDriver.java | 97 ++ .../entity/messaging/kafka/KafkaCluster.java | 92 ++ .../messaging/kafka/KafkaClusterImpl.java | 206 ++++ .../entity/messaging/kafka/KafkaZooKeeper.java | 58 + .../messaging/kafka/KafkaZooKeeperDriver.java | 28 + .../messaging/kafka/KafkaZooKeeperImpl.java | 47 + .../kafka/KafkaZooKeeperSshDriver.java | 82 ++ .../entity/messaging/qpid/QpidBroker.java | 79 ++ .../entity/messaging/qpid/QpidBrokerImpl.java | 147 +++ .../entity/messaging/qpid/QpidDestination.java | 32 + .../messaging/qpid/QpidDestinationImpl.java | 101 ++ .../entity/messaging/qpid/QpidDriver.java | 28 + .../entity/messaging/qpid/QpidQueue.java | 29 + .../entity/messaging/qpid/QpidQueueImpl.java | 66 ++ .../entity/messaging/qpid/QpidSshDriver.java | 137 +++ .../entity/messaging/qpid/QpidTopic.java | 27 + .../entity/messaging/qpid/QpidTopicImpl.java | 56 + .../entity/messaging/rabbit/RabbitBroker.java | 91 ++ .../messaging/rabbit/RabbitBrokerImpl.java | 121 ++ .../messaging/rabbit/RabbitDestination.java | 92 ++ .../entity/messaging/rabbit/RabbitDriver.java | 32 + .../entity/messaging/rabbit/RabbitQueue.java | 85 ++ .../messaging/rabbit/RabbitSshDriver.java | 208 ++++ .../brooklyn/entity/messaging/storm/Storm.java | 105 ++ .../entity/messaging/storm/StormDeployment.java | 42 + .../messaging/storm/StormDeploymentImpl.java | 77 ++ .../entity/messaging/storm/StormDriver.java | 27 + .../entity/messaging/storm/StormImpl.java | 118 ++ .../entity/messaging/storm/StormSshDriver.java | 272 +++++ .../entity/zookeeper/AbstractZooKeeperImpl.java | 109 ++ .../entity/zookeeper/ZooKeeperDriver.java | 27 + .../entity/zookeeper/ZooKeeperEnsemble.java | 53 + .../entity/zookeeper/ZooKeeperEnsembleImpl.java | 105 ++ .../entity/zookeeper/ZooKeeperNode.java | 67 ++ .../entity/zookeeper/ZooKeeperNodeImpl.java | 33 + .../entity/zookeeper/ZooKeeperSshDriver.java | 163 +++ .../entity/messaging/activemq/activemq.xml | 154 --- .../messaging/kafka/kafka-google-doorway.jpg | Bin 15692 -> 0 bytes .../entity/messaging/kafka/server.properties | 112 -- .../entity/messaging/kafka/zookeeper.properties | 13 - .../entity/messaging/rabbit/rabbitmq.config | 5 - .../brooklyn/entity/messaging/storm/storm.yaml | 39 - .../brooklyn/entity/messaging/zookeeper/zoo.cfg | 42 - .../entity/messaging/activemq/activemq.xml | 154 +++ .../messaging/kafka/kafka-google-doorway.jpg | Bin 0 -> 15692 bytes .../entity/messaging/kafka/server.properties | 112 ++ .../entity/messaging/kafka/zookeeper.properties | 13 + .../entity/messaging/rabbit/rabbitmq.config | 5 + .../brooklyn/entity/messaging/storm/storm.yaml | 39 + .../brooklyn/entity/messaging/zookeeper/zoo.cfg | 42 + .../messaging/activemq/ActiveMQEc2LiveTest.java | 117 -- .../activemq/ActiveMQGoogleComputeLiveTest.java | 117 -- .../activemq/ActiveMQIntegrationTest.java | 258 ----- .../messaging/kafka/KafkaIntegrationTest.java | 142 --- .../entity/messaging/kafka/KafkaLiveTest.java | 68 -- .../entity/messaging/kafka/KafkaSupport.java | 109 -- .../entity/messaging/qpid/QpidEc2LiveTest.java | 46 - .../messaging/qpid/QpidIntegrationTest.java | 254 ---- .../messaging/rabbit/RabbitEc2LiveTest.java | 98 -- .../messaging/rabbit/RabbitIntegrationTest.java | 189 --- .../messaging/storm/LocalhostLiveTest.java | 32 - .../messaging/storm/SoftLayerLiveTest.java | 33 - .../storm/StormAbstractCloudLiveTest.java | 200 ---- .../messaging/storm/StormEc2LiveTest.java | 58 - .../messaging/storm/StormGceLiveTest.java | 51 - .../storm/topologies/ExclamationBolt.java | 51 - .../zookeeper/ZooKeeperEc2LiveTest.java | 48 - .../zookeeper/ZooKeeperEnsembleLiveTest.java | 127 -- .../messaging/activemq/ActiveMQEc2LiveTest.java | 117 ++ .../activemq/ActiveMQGoogleComputeLiveTest.java | 117 ++ .../activemq/ActiveMQIntegrationTest.java | 258 +++++ .../messaging/kafka/KafkaIntegrationTest.java | 142 +++ .../entity/messaging/kafka/KafkaLiveTest.java | 68 ++ .../entity/messaging/kafka/KafkaSupport.java | 109 ++ .../entity/messaging/qpid/QpidEc2LiveTest.java | 46 + .../messaging/qpid/QpidIntegrationTest.java | 254 ++++ .../messaging/rabbit/RabbitEc2LiveTest.java | 98 ++ .../messaging/rabbit/RabbitIntegrationTest.java | 189 +++ .../messaging/storm/LocalhostLiveTest.java | 32 + .../messaging/storm/SoftLayerLiveTest.java | 33 + .../storm/StormAbstractCloudLiveTest.java | 200 ++++ .../messaging/storm/StormEc2LiveTest.java | 58 + .../messaging/storm/StormGceLiveTest.java | 51 + .../storm/topologies/ExclamationBolt.java | 51 + .../zookeeper/ZooKeeperEc2LiveTest.java | 48 + .../zookeeper/ZooKeeperEnsembleLiveTest.java | 127 ++ .../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 +- .../camp/brooklyn/TestReferencingPolicy.java | 2 +- .../TestSensorAndEffectorInitializer.java | 2 +- .../catalog/AbstractCatalogXmlTest.java | 2 +- .../CatalogOsgiVersionMoreEntityTest.java | 4 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 2 +- .../org/apache/brooklyn/cli/ItemLister.java | 4 +- .../main/java/org/apache/brooklyn/cli/Main.java | 15 +- .../apache/brooklyn/cli/lister/ClassFinder.java | 6 +- .../brooklyn/cli/lister/ItemDescriptors.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 +- .../src/test/resources/opengamma-cluster.yaml | 2 +- .../src/test/resources/storm-blueprint.yaml | 2 +- .../qa/load/SimulatedMySqlNodeImpl.java | 6 +- .../brooklyn/qa/longevity/MonitorUtils.java | 4 +- .../SoftlayerObtainPrivateLiveTest.java | 4 +- .../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 | 5 +- .../brooklyn/rest/resources/PolicyResource.java | 4 +- .../brooklyn/rest/resources/SensorResource.java | 2 +- .../brooklyn/rest/resources/ServerResource.java | 6 +- .../rest/transform/CatalogTransformer.java | 2 +- .../rest/transform/EffectorTransformer.java | 4 +- .../rest/transform/LocationTransformer.java | 2 +- .../rest/transform/PolicyTransformer.java | 2 +- .../rest/transform/TaskTransformer.java | 2 +- .../rest/util/BrooklynRestResourceUtils.java | 6 +- .../rest/util/DefaultExceptionMapper.java | 2 +- .../BrooklynPropertiesSecurityFilterTest.java | 6 +- .../brooklyn/rest/HaMasterCheckFilterTest.java | 4 +- .../rest/resources/CatalogResetTest.java | 2 +- .../SensorResourceIntegrationTest.java | 4 +- .../ServerResourceIntegrationTest.java | 7 +- .../rest/testing/mocks/CapitalizePolicy.java | 3 +- .../testing/mocks/RestMockSimpleEntity.java | 3 +- .../testing/mocks/RestMockSimplePolicy.java | 4 +- .../util/BrooklynRestResourceUtilsTest.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 | 5 +- .../osgi/tests/more/MoreEntityImpl.java | 3 +- .../brooklyn/osgi/tests/more/MorePolicy.java | 3 +- .../osgi/tests/more/MoreEntityImpl.java | 2 +- .../osgi/tests/more/MoreEntityImpl.java | 2 +- .../brooklyn/osgi/tests/more/MorePolicy.java | 2 +- 1049 files changed, 38102 insertions(+), 37931 deletions(-) ----------------------------------------------------------------------
