Repository: brooklyn-server Updated Branches: refs/heads/master a73ee1728 -> d69f3a57c
Merge branch 'tasks-better-tree' into adj10 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/cf56492f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/cf56492f Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/cf56492f Branch: refs/heads/master Commit: cf56492f8b08054952e803bb730225a2ace7de2e Parents: 83c3d50 6dfe498 Author: Alex Heneveld <[email protected]> Authored: Mon Sep 25 13:16:26 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Mon Sep 25 13:16:26 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/mgmt/ExecutionContext.java | 41 +- .../brooklyn/api/mgmt/ExecutionManager.java | 14 +- .../brooklyn/api/mgmt/ManagementContext.java | 4 + .../java/org/apache/brooklyn/api/mgmt/Task.java | 18 +- .../camp/brooklyn/ConfigParametersYamlTest.java | 13 +- .../brooklyn/camp/brooklyn/spi/dsl/DslTest.java | 4 +- .../brooklyn/core/config/BasicConfigKey.java | 4 +- .../brooklyn/core/config/ConfigConstraints.java | 17 +- .../brooklyn/core/effector/Effectors.java | 2 +- .../org/apache/brooklyn/core/feed/Poller.java | 43 +-- .../brooklyn/core/mgmt/BrooklynTaskTags.java | 76 +++- .../core/mgmt/EntityManagementUtils.java | 7 +- .../mgmt/ha/HighAvailabilityManagerImpl.java | 2 +- .../internal/AbstractManagementContext.java | 14 +- .../internal/AbstractSubscriptionManager.java | 5 + .../mgmt/internal/BrooklynGarbageCollector.java | 118 ++++-- .../mgmt/internal/EntityManagementSupport.java | 40 +- .../mgmt/internal/LocalSubscriptionManager.java | 35 +- .../NonDeploymentManagementContext.java | 20 +- .../internal/QueueingSubscriptionManager.java | 3 + .../core/mgmt/internal/Subscription.java | 1 + .../rebind/PeriodicDeltaChangeListener.java | 4 +- .../core/mgmt/rebind/RebindManagerImpl.java | 12 +- .../AbstractConfigurationSupportInternal.java | 12 +- .../core/objs/AbstractEntityAdjunct.java | 32 +- .../brooklyn/core/objs/AdjunctConfigMap.java | 4 +- .../core/objs/BrooklynObjectInternal.java | 2 + .../core/objs/proxy/InternalEntityFactory.java | 4 +- .../SshCommandMembershipTrackingPolicy.java | 2 +- .../apache/brooklyn/feed/shell/ShellFeed.java | 2 +- .../location/ssh/SshMachineLocation.java | 6 +- .../core/task/AbstractExecutionContext.java | 10 +- .../util/core/task/BasicExecutionContext.java | 347 ++++++++++++----- .../util/core/task/BasicExecutionManager.java | 381 ++++++++++++------- .../brooklyn/util/core/task/BasicTask.java | 73 ++-- .../brooklyn/util/core/task/CompoundTask.java | 4 - .../util/core/task/DynamicSequentialTask.java | 1 + .../brooklyn/util/core/task/DynamicTasks.java | 15 +- .../brooklyn/util/core/task/ForwardingTask.java | 16 + .../core/task/ListenableForwardingFuture.java | 75 ---- .../brooklyn/util/core/task/ScheduledTask.java | 55 ++- .../brooklyn/util/core/task/TaskInternal.java | 10 +- .../brooklyn/util/core/task/TaskTags.java | 10 +- .../apache/brooklyn/util/core/task/Tasks.java | 4 +- .../brooklyn/util/core/task/ValueResolver.java | 8 +- .../core/config/DeferredConfigTest.java | 8 +- .../core/effector/EffectorSayHiTest.java | 19 +- .../entity/ApplicationLifecycleStateTest.java | 18 +- .../brooklyn/core/entity/EntityAssertsTest.java | 92 +---- .../brooklyn/core/entity/EntityConfigTest.java | 12 + .../core/entity/hello/LocalEntitiesTest.java | 20 +- .../internal/EntityExecutionManagerTest.java | 49 ++- .../mgmt/persist/XmlMementoSerializerTest.java | 2 +- .../core/mgmt/rebind/RebindFeedTest.java | 4 +- .../core/mgmt/rebind/RebindFeedWithHaTest.java | 9 +- .../qa/performance/TaskPerformanceTest.java | 6 +- .../ssh/SshMachineLocationIntegrationTest.java | 6 +- .../location/ssh/SshMachineLocationTest.java | 12 +- .../util/core/task/BasicTasksFutureTest.java | 55 ++- .../core/task/DynamicSequentialTaskTest.java | 17 +- .../util/core/task/ScheduledExecutionTest.java | 19 +- .../util/core/task/TaskPredicatesTest.java | 5 +- .../brooklyn/util/core/task/TasksTest.java | 4 +- .../util/core/task/ValueResolverTest.java | 96 ++++- .../policy/jclouds/os/CreateUserPolicy.java | 6 +- .../policy/ha/AbstractFailureDetector.java | 19 +- .../policy/ha/ServiceFailureDetector.java | 7 +- .../brooklyn/policy/ha/ServiceReplacer.java | 15 +- .../brooklyn/policy/ha/ServiceRestarter.java | 7 +- .../rest/resources/SensorResourceTest.java | 2 +- .../entity/brooklynnode/BrooklynNodeImpl.java | 12 +- .../brooklyn/entity/chef/ChefAttributeFeed.java | 16 +- .../windows/WindowsPerformanceCounterFeed.java | 21 +- .../java/org/apache/brooklyn/test/Asserts.java | 27 +- .../brooklyn/util/collections/MutableSet.java | 14 +- .../org/apache/brooklyn/util/guava/Maybe.java | 43 ++- .../apache/brooklyn/util/repeat/Repeater.java | 22 +- 77 files changed, 1433 insertions(+), 801 deletions(-) ----------------------------------------------------------------------
