You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/10/06 08:09:30 UTC
[1/6] brooklyn-server git commit: Merge branch 'tasks-better-tree'
into adj10
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 <al...@cloudsoftcorp.com>
Authored: Mon Sep 25 13:16:26 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
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(-)
----------------------------------------------------------------------
[2/6] brooklyn-server git commit: REST API for entity adjunct
activities
Posted by he...@apache.org.
REST API for entity adjunct activities
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d1ab00c0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d1ab00c0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d1ab00c0
Branch: refs/heads/master
Commit: d1ab00c0f65c9444fd655bbf8759c982fe1d02ab
Parents: cf56492
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Sep 19 14:04:06 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 25 13:16:42 2017 +0100
----------------------------------------------------------------------
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 4 +++
.../apache/brooklyn/rest/api/AdjunctApi.java | 19 +++++++++++
.../rest/resources/AdjunctResource.java | 12 +++++++
.../brooklyn/rest/resources/EntityResource.java | 26 ++-------------
.../rest/transform/TaskTransformer.java | 33 ++++++++++++++++++++
5 files changed, 71 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1ab00c0/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
index 7d35ac4..f889b5a 100644
--- a/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
+++ b/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTaskTags.java
@@ -235,6 +235,10 @@ public class BrooklynTaskTags extends TaskTags {
return em.getTasksWithTag(tagForContextEntity(e));
}
+ public static Set<Task<?>> getTasksInAdjunctContext(ExecutionManager em, EntityAdjunct a) {
+ return em.getTasksWithTag(tagForContextAdjunct(a));
+ }
+
public static ManagementContext getManagementContext(Task<?> task) {
for (Object tag : getTagsFast(task))
if ((tag instanceof ManagementContext))
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1ab00c0/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/AdjunctApi.java
----------------------------------------------------------------------
diff --git a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/AdjunctApi.java b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/AdjunctApi.java
index 1886f63..f07759d 100644
--- a/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/AdjunctApi.java
+++ b/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/AdjunctApi.java
@@ -23,6 +23,7 @@ import java.util.Map;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
@@ -36,6 +37,7 @@ import org.apache.brooklyn.rest.domain.AdjunctDetail;
import org.apache.brooklyn.rest.domain.AdjunctSummary;
import org.apache.brooklyn.rest.domain.ConfigSummary;
import org.apache.brooklyn.rest.domain.Status;
+import org.apache.brooklyn.rest.domain.TaskSummary;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -230,4 +232,21 @@ public interface AdjunctApi {
@PathParam("config") String configKeyName,
@ApiParam(name = "value", value = "New value for the configuration", required = true)
Object value);
+
+
+ @GET
+ @Path("/{adjunct}/activities")
+ @ApiOperation(value = "Fetch list of tasks for this adjunct")
+ @ApiResponses(value = {
+ @ApiResponse(code = 404, message = "Could not find application, entity, or adjunct")
+ })
+ public List<TaskSummary> listTasks(
+ @ApiParam(value = "Application ID or name", required = true) @PathParam("application") String applicationId,
+ @ApiParam(value = "Entity ID or name", required = true) @PathParam("entity") String entityId,
+ @ApiParam(value = "Adjunct ID or name", required = true) @PathParam("adjunct") String adjunctToken,
+ @ApiParam(value = "Max number of tasks, or -1 for all (default 200)", required = false)
+ @QueryParam("limit") @DefaultValue("200") int limit,
+ @ApiParam(value = "Whether to include subtasks recursively across different entities (default false)", required = false)
+ @QueryParam("recurse") @DefaultValue("false") Boolean recurse);
+
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1ab00c0/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java
index 08f3698..ec9444b 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java
@@ -40,6 +40,7 @@ import org.apache.brooklyn.api.typereg.RegisteredType;
import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.ConfigPredicates;
import org.apache.brooklyn.core.entity.EntityInternal;
+import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
import org.apache.brooklyn.core.mgmt.entitlement.Entitlements;
import org.apache.brooklyn.rest.api.AdjunctApi;
import org.apache.brooklyn.rest.domain.AdjunctDetail;
@@ -47,12 +48,15 @@ import org.apache.brooklyn.rest.domain.AdjunctSummary;
import org.apache.brooklyn.rest.domain.ConfigSummary;
import org.apache.brooklyn.rest.domain.Status;
import org.apache.brooklyn.rest.domain.SummaryComparators;
+import org.apache.brooklyn.rest.domain.TaskSummary;
import org.apache.brooklyn.rest.filter.HaHotStateRequired;
import org.apache.brooklyn.rest.transform.AdjunctTransformer;
import org.apache.brooklyn.rest.transform.ConfigTransformer;
import org.apache.brooklyn.rest.transform.EntityTransformer;
+import org.apache.brooklyn.rest.transform.TaskTransformer;
import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils;
import org.apache.brooklyn.rest.util.WebResourceUtils;
+import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.core.ClassLoaderUtils;
import org.apache.brooklyn.util.core.flags.TypeCoercions;
import org.apache.brooklyn.util.exceptions.Exceptions;
@@ -260,5 +264,13 @@ public class AdjunctResource extends AbstractBrooklynRestResource implements Adj
public static String getStringValueForDisplay(BrooklynRestResourceUtils utils, EntityAdjunct policy, Object value) {
return utils.getStringValueForDisplay(value);
}
+
+ @Override
+ public List<TaskSummary> listTasks(String applicationId, String entityId, String adjunctToken, int limit, Boolean recurse) {
+ Entity entity = brooklyn().getEntity(applicationId, entityId);
+ EntityAdjunct adjunct = brooklyn().getAdjunct(entity, adjunctToken);
+ return TaskTransformer.fromTasks(MutableList.copyOf(BrooklynTaskTags.getTasksInAdjunctContext(mgmt().getExecutionManager(), adjunct)),
+ limit, recurse, entity, ui);
+ }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1ab00c0/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java
index 7d764a4..39eb42b 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/EntityResource.java
@@ -135,31 +135,11 @@ public class EntityResource extends AbstractBrooklynRestResource implements Enti
@Override
public List<TaskSummary> listTasks(String applicationId, String entityId, int limit, Boolean recurse) {
- int sizeRemaining = limit;
Entity entity = brooklyn().getEntity(applicationId, entityId);
- List<Task<?>> tasksToScan = MutableList.copyOf(BrooklynTaskTags.getTasksInEntityContext(mgmt().getExecutionManager(), entity));
- if (limit>0) {
- tasksToScan = MutableList.copyOf(Ordering.from(new InterestingTasksFirstComparator(entity)).leastOf(tasksToScan, limit));
- }
- Map<String,Task<?>> tasksLoaded = MutableMap.of();
-
- while (!tasksToScan.isEmpty()) {
- Task<?> t = tasksToScan.remove(0);
- if (tasksLoaded.put(t.getId(), t)==null) {
- if (--sizeRemaining==0) {
- break;
- }
- if (Boolean.TRUE.equals(recurse)) {
- if (t instanceof HasTaskChildren) {
- Iterables.addAll(tasksToScan, ((HasTaskChildren) t).getChildren() );
- }
- }
- }
- }
- return new LinkedList<TaskSummary>(Collections2.transform(tasksLoaded.values(),
- TaskTransformer.fromTask(ui.getBaseUriBuilder())));
+ return TaskTransformer.fromTasks(MutableList.copyOf(BrooklynTaskTags.getTasksInEntityContext(mgmt().getExecutionManager(), entity)),
+ limit, recurse, entity, ui);
}
-
+
/** API does not guarantee order, but this is a the one we use (when there are lots of tasks):
* prefer top-level tasks and to recent tasks,
* balanced such that the following are equal:
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1ab00c0/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
----------------------------------------------------------------------
diff --git a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
index 7abb71a..b4e1f08 100644
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/transform/TaskTransformer.java
@@ -22,6 +22,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -36,7 +37,9 @@ import org.apache.brooklyn.core.mgmt.BrooklynTaskTags;
import org.apache.brooklyn.core.mgmt.BrooklynTaskTags.WrappedStream;
import org.apache.brooklyn.rest.domain.LinkWithMetadata;
import org.apache.brooklyn.rest.domain.TaskSummary;
+import org.apache.brooklyn.rest.resources.EntityResource.InterestingTasksFirstComparator;
import org.apache.brooklyn.rest.util.WebResourceUtils;
+import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.core.task.TaskInternal;
import org.apache.brooklyn.util.exceptions.Exceptions;
@@ -44,7 +47,13 @@ import org.apache.brooklyn.util.text.Strings;
import com.google.common.base.Function;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Ordering;
+
import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
+
import org.apache.brooklyn.rest.api.ActivityApi;
import org.apache.brooklyn.rest.api.EntityApi;
import static org.apache.brooklyn.rest.util.WebResourceUtils.serviceUriBuilder;
@@ -150,4 +159,28 @@ public class TaskTransformer {
URI taskUri = serviceUriBuilder(ub, ActivityApi.class, "get").build(t.getId());
return new LinkWithMetadata(taskUri.toString(), data);
}
+
+ public static List<TaskSummary> fromTasks(List<Task<?>> tasksToScan, int limit, Boolean recurse, Entity entity, UriInfo ui) {
+ int sizeRemaining = limit;
+ if (limit>0) {
+ tasksToScan = MutableList.copyOf(Ordering.from(new InterestingTasksFirstComparator(entity)).leastOf(tasksToScan, limit));
+ }
+ Map<String,Task<?>> tasksLoaded = MutableMap.of();
+
+ while (!tasksToScan.isEmpty()) {
+ Task<?> t = tasksToScan.remove(0);
+ if (tasksLoaded.put(t.getId(), t)==null) {
+ if (--sizeRemaining==0) {
+ break;
+ }
+ if (Boolean.TRUE.equals(recurse)) {
+ if (t instanceof HasTaskChildren) {
+ Iterables.addAll(tasksToScan, ((HasTaskChildren) t).getChildren() );
+ }
+ }
+ }
+ }
+ return new LinkedList<TaskSummary>(Collections2.transform(tasksLoaded.values(),
+ TaskTransformer.fromTask(ui.getBaseUriBuilder())));
+ }
}
[3/6] brooklyn-server git commit: Merge branch 'tasks-better-tree'
into adjunct-activities-rest-api
Posted by he...@apache.org.
Merge branch 'tasks-better-tree' into adjunct-activities-rest-api
Conflict - tweaks to AdjunctResource, easily resolved
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/b0429892
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/b0429892
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/b0429892
Branch: refs/heads/master
Commit: b042989213591a295dd6664e98118d36b3b03d74
Parents: d1ab00c 0c2e1f6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 4 03:08:49 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 4 03:08:49 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/api/entity/Entity.java | 3 +
.../brooklyn/api/mgmt/ExecutionContext.java | 8 +-
.../brooklyn/api/mgmt/rebind/RebindManager.java | 14 +-
...loudsCustomizerInstantiationYamlDslTest.java | 156 +++++--
.../catalog/SpecParameterUnwrappingTest.java | 2 +-
.../brooklyn/core/catalog/CatalogLoadMode.java | 73 ----
.../catalog/internal/BasicBrooklynCatalog.java | 28 +-
.../catalog/internal/CatalogInitialization.java | 278 ++++++++-----
.../core/catalog/internal/CatalogUtils.java | 31 +-
.../brooklyn/core/entity/AbstractEntity.java | 29 +-
.../core/entity/BrooklynConfigKeys.java | 2 +-
.../brooklyn/core/entity/EntityAdjuncts.java | 28 +-
.../brooklyn/core/entity/EntityInternal.java | 14 +-
.../apache/brooklyn/core/feed/AbstractFeed.java | 2 +-
.../mgmt/ha/HighAvailabilityManagerImpl.java | 45 +-
.../core/mgmt/ha/OsgiArchiveInstaller.java | 210 +++++++---
.../brooklyn/core/mgmt/ha/OsgiManager.java | 36 +-
.../internal/AbstractManagementContext.java | 5 +-
.../core/mgmt/internal/LocalUsageManager.java | 31 +-
.../ManagementNodeStateListenerManager.java | 175 ++++++++
.../NonDeploymentManagementContext.java | 19 -
.../rebind/ImmediateDeltaChangeListener.java | 160 --------
.../core/mgmt/rebind/RebindIteration.java | 213 ++++------
.../core/mgmt/rebind/RebindManagerImpl.java | 30 --
.../mgmt/rebind/dto/BasicEntityMemento.java | 2 +-
.../mgmt/rebind/dto/MementosGenerators.java | 5 +-
.../mgmt/usage/ManagementNodeStateListener.java | 53 +++
.../core/objs/BasicConfigurableObject.java | 4 +-
.../apache/brooklyn/core/policy/Policies.java | 86 +---
.../core/server/BrooklynServerConfig.java | 28 +-
.../FixedListMachineProvisioningLocation.java | 3 +-
.../brooklyn/util/core/ClassLoaderUtils.java | 7 +-
.../brooklyn/util/core/flags/TypeCoercions.java | 21 +
.../brooklyn/util/core/osgi/BundleMaker.java | 38 +-
.../util/core/task/BasicExecutionContext.java | 30 +-
.../util/core/task/BasicExecutionManager.java | 11 +-
.../brooklyn/util/core/task/BasicTask.java | 26 +-
.../brooklyn/util/core/task/ForwardingTask.java | 4 +-
.../brooklyn/util/core/task/TaskInternal.java | 10 +-
.../task/TaskInternalCancellableWithMode.java | 32 ++
.../brooklyn/util/core/task/ValueResolver.java | 8 +-
.../core/effector/EffectorSayHiTest.java | 5 +-
.../core/entity/EntityConcurrencyTest.java | 2 +-
.../ha/HighAvailabilityManagerInMemoryTest.java | 5 -
.../ha/HighAvailabilityManagerTestFixture.java | 61 ++-
.../mgmt/rebind/RebindCatalogEntityTest.java | 2 +-
.../core/mgmt/rebind/RebindCatalogItemTest.java | 2 -
.../core/mgmt/rebind/RebindFailuresTest.java | 18 +-
.../core/mgmt/rebind/RebindFeedWithHaTest.java | 2 +-
.../usage/ManagementNodeStateListenerTest.java | 160 ++++++++
.../util/core/ClassLoaderUtilsTest.java | 6 +-
.../util/core/internal/TypeCoercionsTest.java | 31 ++
.../core/internal/ssh/RecordingSshTool.java | 7 +
.../util/core/osgi/BundleMakerTest.java | 8 +-
.../util/core/task/BasicTasksFutureTest.java | 23 +-
.../core/task/NonBasicTaskExecutionTest.java | 8 +-
.../bundlemaker/withmanifest/myemptyfile.txt | 0
.../launcher/osgi/OsgiLauncherImpl.java | 2 +-
.../init/src/main/resources/catalog-classes.bom | 364 ----------------
karaf/init/src/main/resources/catalog.bom | 25 ++
.../BrooklynLauncherRebindCatalogTest.java | 2 +-
.../brooklyn/launcher/BrooklynLauncherTest.java | 2 +-
.../launcher/CleanOrphanedAdjunctsTest.java | 6 +-
.../CleanOrphanedLocationsIntegrationTest.java | 2 +-
.../jclouds/LocationCustomizerDelegate.java | 8 +-
...ailabilityManagerJcloudsObjectStoreTest.java | 7 +-
.../apache/brooklyn/rest/api/AdjunctApi.java | 16 +-
.../apache/brooklyn/rest/api/CatalogApi.java | 34 +-
.../org/apache/brooklyn/rest/api/PolicyApi.java | 16 +-
.../brooklyn/rest/api/PolicyConfigApi.java | 10 +-
.../brooklyn/rest/domain/AdjunctSummary.java | 2 -
.../brooklyn/rest/domain/ApplicationSpec.java | 12 +-
.../rest/domain/CatalogEnricherSummary.java | 4 +-
.../rest/domain/CatalogEntitySummary.java | 4 +-
.../rest/domain/CatalogItemSummary.java | 4 +-
.../rest/domain/CatalogLocationSummary.java | 4 +-
.../rest/domain/CatalogPolicySummary.java | 4 +-
.../brooklyn/rest/domain/EffectorSummary.java | 9 +-
.../brooklyn/rest/domain/EntityDetail.java | 14 +-
.../brooklyn/rest/domain/EntitySummary.java | 11 +-
.../rest/domain/PolicyConfigSummary.java | 2 +-
.../brooklyn/rest/domain/PolicySummary.java | 2 +-
.../rest/domain/ScriptExecutionSummary.java | 11 +-
.../brooklyn/rest/domain/SensorSummary.java | 7 +-
.../rest/resources/AdjunctResource.java | 55 +--
.../brooklyn/rest/resources/PolicyResource.java | 1 -
.../rest/transform/AdjunctTransformer.java | 4 +-
.../rest/transform/CatalogTransformer.java | 2 +-
.../rest/transform/ConfigTransformer.java | 2 +
.../rest/transform/PolicyTransformer.java | 2 +-
.../rest/util/BrooklynRestResourceUtils.java | 13 +-
.../rest/resources/AdjunctResourceTest.java | 198 +++++++++
.../rest/testing/BrooklynRestResourceTest.java | 2 +-
.../main/java/org/apache/brooklyn/cli/Main.java | 21 +-
.../java/org/apache/brooklyn/cli/CliTest.java | 32 +-
.../brooklyn/entity/chef/ChefAttributeFeed.java | 411 -------------------
.../entity/chef/ChefAttributePollConfig.java | 61 ---
.../brooklyn/entity/chef/ChefBashCommands.java | 42 --
.../apache/brooklyn/entity/chef/ChefConfig.java | 94 -----
.../brooklyn/entity/chef/ChefConfigs.java | 102 -----
.../apache/brooklyn/entity/chef/ChefEntity.java | 26 --
.../brooklyn/entity/chef/ChefEntityImpl.java | 39 --
.../entity/chef/ChefLifecycleEffectorTasks.java | 364 ----------------
.../brooklyn/entity/chef/ChefServerTasks.java | 97 -----
.../brooklyn/entity/chef/ChefSoloDriver.java | 85 ----
.../brooklyn/entity/chef/ChefSoloTasks.java | 70 ----
.../apache/brooklyn/entity/chef/ChefTasks.java | 154 -------
.../entity/chef/KnifeConvergeTaskFactory.java | 249 -----------
.../brooklyn/entity/chef/KnifeTaskFactory.java | 241 -----------
.../entity/resolve/ChefEntitySpecResolver.java | 42 --
...oklyn.core.resolve.entity.EntitySpecResolver | 1 -
.../resources/OSGI-INF/blueprint/blueprint.xml | 5 -
software/base/src/main/resources/catalog.bom | 88 ----
.../brooklyn/entity/chef/ChefConfigsTest.java | 40 --
.../entity/chef/ChefLiveTestSupport.java | 99 -----
.../chef/ChefServerTasksIntegrationTest.java | 109 -----
.../AbstractChefToyMySqlEntityLiveTest.java | 41 --
.../ChefSoloDriverMySqlEntityLiveTest.java | 49 ---
.../mysql/ChefSoloDriverToyMySqlEntity.java | 89 ----
...micChefAutodetectToyMySqlEntityLiveTest.java | 43 --
...DynamicChefServerToyMySqlEntityLiveTest.java | 50 ---
.../DynamicChefSoloToyMySqlEntityLiveTest.java | 43 --
.../chef/mysql/DynamicToyMySqlEntityChef.java | 81 ----
.../chef/mysql/TypedToyMySqlEntityChef.java | 55 ---
.../org/apache/brooklyn/util/guava/Maybe.java | 2 +-
.../apache/brooklyn/util/repeat/Repeater.java | 7 +-
.../apache/brooklyn/util/stream/Streams.java | 39 +-
.../brooklyn/util/stream/StreamsTest.java | 17 +
128 files changed, 1850 insertions(+), 4301 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b0429892/rest/rest-api/src/main/java/org/apache/brooklyn/rest/api/AdjunctApi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/b0429892/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java
----------------------------------------------------------------------
diff --cc rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java
index ec9444b,1111193..dae7bb8
--- a/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java
+++ b/rest/rest-resources/src/main/java/org/apache/brooklyn/rest/resources/AdjunctResource.java
@@@ -53,10 -51,7 +53,9 @@@ import org.apache.brooklyn.rest.filter.
import org.apache.brooklyn.rest.transform.AdjunctTransformer;
import org.apache.brooklyn.rest.transform.ConfigTransformer;
import org.apache.brooklyn.rest.transform.EntityTransformer;
+import org.apache.brooklyn.rest.transform.TaskTransformer;
- import org.apache.brooklyn.rest.util.BrooklynRestResourceUtils;
import org.apache.brooklyn.rest.util.WebResourceUtils;
+import org.apache.brooklyn.util.collections.MutableList;
import org.apache.brooklyn.util.core.ClassLoaderUtils;
import org.apache.brooklyn.util.core.flags.TypeCoercions;
import org.apache.brooklyn.util.exceptions.Exceptions;
@@@ -261,16 -270,4 +274,12 @@@ public class AdjunctResource extends Ab
return Response.status(Response.Status.OK).build();
}
- public static String getStringValueForDisplay(BrooklynRestResourceUtils utils, EntityAdjunct policy, Object value) {
- return utils.getStringValueForDisplay(value);
- }
-
+ @Override
+ public List<TaskSummary> listTasks(String applicationId, String entityId, String adjunctToken, int limit, Boolean recurse) {
+ Entity entity = brooklyn().getEntity(applicationId, entityId);
+ EntityAdjunct adjunct = brooklyn().getAdjunct(entity, adjunctToken);
+ return TaskTransformer.fromTasks(MutableList.copyOf(BrooklynTaskTags.getTasksInAdjunctContext(mgmt().getExecutionManager(), adjunct)),
+ limit, recurse, entity, ui);
+ }
+
}
[5/6] brooklyn-server git commit: Merge branch 'master' into
adjunct-activities-rest-api
Posted by he...@apache.org.
Merge branch 'master' into adjunct-activities-rest-api
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/92b9cc63
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/92b9cc63
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/92b9cc63
Branch: refs/heads/master
Commit: 92b9cc638653b53effa20a696e69cb0d9c5c9a9c
Parents: cea2d34 a73ee17
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Oct 6 09:08:01 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Oct 6 09:08:01 2017 +0100
----------------------------------------------------------------------
.../apache/brooklyn/api/mgmt/ExecutionContext.java | 2 +-
.../apache/brooklyn/api/mgmt/ManagementContext.java | 3 +++
.../brooklyn/core/config/ConfigConstraints.java | 2 +-
.../mgmt/internal/AbstractManagementContext.java | 16 ++++++++++++++++
.../internal/NonDeploymentManagementContext.java | 9 +++++++++
.../core/mgmt/rebind/RebindManagerImpl.java | 3 ++-
.../brooklyn/core/objs/AbstractEntityAdjunct.java | 6 +-----
.../util/core/task/BasicExecutionManager.java | 5 ++++-
.../brooklyn/core/entity/EntityAssertsTest.java | 3 ++-
.../mgmt/internal/LocalSubscriptionManagerTest.java | 8 +++-----
.../brooklyn/location/jclouds/JcloudsLocation.java | 15 +++++----------
.../main/resources/OSGI-INF/blueprint/service.xml | 2 ++
rest/rest-server/src/main/webapp/WEB-INF/web.xml | 1 +
13 files changed, 50 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
[6/6] brooklyn-server git commit: This closes #836
Posted by he...@apache.org.
This closes #836
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d69f3a57
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d69f3a57
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d69f3a57
Branch: refs/heads/master
Commit: d69f3a57c5e052c89f2912200d06a7a8d7fa2de7
Parents: a73ee17 92b9cc6
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Oct 6 09:08:53 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Oct 6 09:08:53 2017 +0100
----------------------------------------------------------------------
.../brooklyn/core/mgmt/BrooklynTaskTags.java | 4 +++
.../apache/brooklyn/rest/api/AdjunctApi.java | 19 +++++++++++
.../rest/resources/AdjunctResource.java | 12 +++++++
.../brooklyn/rest/resources/EntityResource.java | 26 ++-------------
.../rest/transform/TaskTransformer.java | 33 ++++++++++++++++++++
5 files changed, 71 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[4/6] brooklyn-server git commit: Merge branch 'tasks-better-tree'
into adjunct-activities-rest-api
Posted by he...@apache.org.
Merge branch 'tasks-better-tree' into adjunct-activities-rest-api
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/cea2d347
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/cea2d347
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/cea2d347
Branch: refs/heads/master
Commit: cea2d347ff0bbace90d4787519e252553ae13cf8
Parents: b042989 9213f0e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Oct 4 16:06:21 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Oct 4 16:06:21 2017 +0100
----------------------------------------------------------------------
.../brooklyn/api/mgmt/ExecutionContext.java | 16 +--
.../brooklyn/api/mgmt/SubscriptionManager.java | 6 +-
.../brooklyn/core/entity/AbstractEntity.java | 1 +
.../core/entity/trait/StartableMethods.java | 6 +-
.../core/location/BasicMachineDetails.java | 5 +-
.../location/access/BrooklynAccessUtils.java | 2 +-
.../mgmt/internal/LocalSubscriptionManager.java | 108 +++++++++++++------
.../core/objs/proxy/EntityProxyImpl.java | 2 +-
.../brooklyn/core/sensor/AttributeMap.java | 15 ++-
.../entity/group/DynamicClusterImpl.java | 7 +-
.../brooklyn/util/core/task/DynamicTasks.java | 74 ++++++++-----
.../apache/brooklyn/util/core/task/Tasks.java | 6 +-
.../core/effector/EffectorSayHiTest.java | 2 +-
.../core/entity/EntitySubscriptionTest.java | 9 +-
.../apache/brooklyn/core/feed/PollerTest.java | 2 +-
.../internal/LocalSubscriptionManagerTest.java | 91 ++++++++++++++++
.../core/mgmt/rebind/RebindManagerTest.java | 13 +--
.../policy/basic/PolicySubscriptionTest.java | 35 ++++--
.../entity/group/DynamicClusterTest.java | 8 +-
.../SameServerDriverLifecycleEffectorTasks.java | 5 +-
.../java/org/apache/brooklyn/test/Asserts.java | 20 +++-
.../org/apache/brooklyn/test/AssertsTest.java | 17 +++
22 files changed, 331 insertions(+), 119 deletions(-)
----------------------------------------------------------------------