Get back plan tagging in, so it's visible in UI
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d79fd90d Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d79fd90d Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d79fd90d Branch: refs/heads/master Commit: d79fd90d0121ab5fc81c43c153e54566ee46633a Parents: 1c72a20 Author: Svetoslav Neykov <[email protected]> Authored: Wed Oct 14 19:03:14 2015 +0300 Committer: Svetoslav Neykov <[email protected]> Committed: Wed Oct 14 19:03:14 2015 +0300 ---------------------------------------------------------------------- .../spi/creation/BrooklynComponentTemplateResolver.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/d79fd90d/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java index 381b76b..e6a866e 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java @@ -46,6 +46,7 @@ import org.apache.brooklyn.camp.spi.PlatformComponentTemplate; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.catalog.internal.CatalogUtils; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.mgmt.BrooklynTags; import org.apache.brooklyn.core.mgmt.BrooklynTaskTags; import org.apache.brooklyn.core.mgmt.ManagementContextInjectable; import org.apache.brooklyn.core.mgmt.classloading.BrooklynClassLoadingContext; @@ -64,7 +65,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Function; -import com.google.common.base.Splitter; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; @@ -188,10 +188,11 @@ public class BrooklynComponentTemplateResolver { @SuppressWarnings("unchecked") private <T extends Entity> void populateSpec(EntitySpec<T> spec, Set<String> encounteredCatalogTypes) { - String name, templateId=null, planId=null; + String name, source=null, templateId=null, planId=null; if (template.isPresent()) { name = template.get().getName(); templateId = template.get().getId(); + source = template.get().getSourceCode(); } else { name = (String)attrs.getStringKey("name"); } @@ -210,6 +211,10 @@ public class BrooklynComponentTemplateResolver { spec.child(childSpec); } } + + if (source!=null) + spec.tag(BrooklynTags.newYamlSpecTag(source)); + if (!Strings.isBlank(name)) spec.displayName(name); if (templateId != null)
