This closes #1143
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d376516c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d376516c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d376516c Branch: refs/heads/master Commit: d376516c3048b244a0d1bc294e16b89ea9e2e79c Parents: ed289ec 50b3c22 Author: Alex Heneveld <[email protected]> Authored: Thu Jan 14 23:45:42 2016 +0000 Committer: Alex Heneveld <[email protected]> Committed: Thu Jan 14 23:45:42 2016 +0000 ---------------------------------------------------------------------- brooklyn-docs/guide/misc/release-notes.md | 12 +- .../apache/brooklyn/api/entity/EntitySpec.java | 7 + .../internal/AbstractBrooklynObjectSpec.java | 31 +++- .../brooklyn/camp/spi/AbstractResource.java | 3 +- .../brooklyn/camp/spi/pdp/DeploymentPlan.java | 10 +- .../interpret/PlanInterpretationContext.java | 4 +- .../interpret/PlanInterpretationNode.java | 16 +- .../BrooklynAssemblyTemplateInstantiator.java | 12 +- .../BrooklynComponentTemplateResolver.java | 23 ++- .../BrooklynEntityDecorationResolver.java | 3 + .../brooklyn/spi/creation/CampResolver.java | 14 +- .../camp/brooklyn/AbstractYamlTest.java | 6 +- .../camp/brooklyn/EntitiesYamlTest.java | 54 +++++-- .../camp/brooklyn/LocationsYamlTest.java | 43 +++--- .../catalog/CatalogYamlLocationTest.java | 3 +- .../catalog/CatalogYamlTemplateTest.java | 146 +++++++++++++++++++ .../resources/test-entity-basic-template.yaml | 2 +- .../catalog/internal/BasicBrooklynCatalog.java | 6 +- .../core/entity/AbstractApplication.java | 5 +- .../apache/brooklyn/core/entity/Entities.java | 10 ++ .../apache/brooklyn/core/mgmt/BrooklynTags.java | 14 +- .../core/mgmt/EntityManagementUtils.java | 141 +++++++++++------- .../core/mgmt/internal/EffectorUtils.java | 3 + .../rest/resources/CatalogResource.java | 7 +- .../rest/util/DefaultExceptionMapper.java | 5 +- .../main/resources/brooklyn/default.catalog.bom | 4 + .../brooklyn/util/exceptions/Exceptions.java | 19 ++- 27 files changed, 464 insertions(+), 139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d376516c/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTags.java ---------------------------------------------------------------------- diff --cc brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTags.java index a08eb56,ffed4f8..0ddc79a --- a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTags.java +++ b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/mgmt/BrooklynTags.java @@@ -19,9 -19,9 +19,10 @@@ package org.apache.brooklyn.core.mgmt; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; + import org.apache.brooklyn.util.collections.MutableList; import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.annotate.JsonProperty;
