Repository: incubator-brooklyn Updated Branches: refs/heads/master be46512ac -> 6c4b5170d
Fix test, top-level plan name take priority over entity's name Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/5a122bab Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/5a122bab Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/5a122bab Branch: refs/heads/master Commit: 5a122babd6cc07a31da1a5acf9df0010330f9bf5 Parents: be46512 Author: Svetoslav Neykov <[email protected]> Authored: Mon Nov 9 15:42:27 2015 +0200 Committer: Svetoslav Neykov <[email protected]> Committed: Mon Nov 9 16:16:24 2015 +0200 ---------------------------------------------------------------------- .../apache/brooklyn/camp/brooklyn/spi/creation/CampUtils.java | 1 + .../org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5a122bab/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampUtils.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampUtils.java b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampUtils.java index b396f37..637a8eb 100644 --- a/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampUtils.java +++ b/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/CampUtils.java @@ -87,6 +87,7 @@ public class CampUtils { BrooklynComponentTemplateResolver resolver = BrooklynComponentTemplateResolver.Factory.newInstance( loader, buildWrapperAppTemplate(template)); EntitySpec<Application> wrapperSpec = resolver.resolveSpec(ImmutableSet.<String>of()); + // Clear out default parameters (coming from the wrapper app's class) so they don't overwrite the entity's params on unwrap. if (!hasExplicitParams(template)) { wrapperSpec.parameters(ImmutableList.<SpecParameter<?>>of()); } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/5a122bab/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java ---------------------------------------------------------------------- diff --git a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java index 923f9ca..68aef52 100644 --- a/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java +++ b/usage/camp/src/test/java/org/apache/brooklyn/camp/brooklyn/ReferencedYamlTest.java @@ -49,7 +49,7 @@ public class ReferencedYamlTest extends AbstractYamlTest { "services:", "- type: classpath://yaml-ref-entity.yaml"); - checkChildEntitySpec(app, "service"); + checkChildEntitySpec(app, "Basic entity"); } @Test @@ -87,7 +87,7 @@ public class ReferencedYamlTest extends AbstractYamlTest { " brooklyn.children:", " - type: classpath://yaml-ref-entity.yaml"); - checkGrandchildEntitySpec(createAndStartApplication, "service"); + checkGrandchildEntitySpec(createAndStartApplication, "Basic entity"); } @Test
