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 2015/11/10 18:13:00 UTC
[2/2] incubator-brooklyn git commit: This closes #1010
This closes #1010
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2aa01c0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2aa01c0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2aa01c0f
Branch: refs/heads/master
Commit: 2aa01c0f90c5acdf284f990cf7b7f1b4cae28dbb
Parents: 015b5cd 805aae2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 10 17:08:14 2015 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Nov 10 17:08:14 2015 +0000
----------------------------------------------------------------------
.../BrooklynComponentTemplateResolver.java | 21 +++++------
.../brooklyn/catalog/CatalogYamlAppTest.java | 38 +++++++++++++++++++-
2 files changed, 48 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2aa01c0f/usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
----------------------------------------------------------------------
diff --cc usage/camp/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/creation/BrooklynComponentTemplateResolver.java
index c150ddc,db6a78e..69c9109
--- 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
@@@ -233,9 -232,8 +232,9 @@@ public class BrooklynComponentTemplateR
new BrooklynEntityDecorationResolver.PolicySpecResolver(yamlLoader).decorate(spec, attrs);
new BrooklynEntityDecorationResolver.EnricherSpecResolver(yamlLoader).decorate(spec, attrs);
new BrooklynEntityDecorationResolver.InitializerResolver(yamlLoader).decorate(spec, attrs);
+ new BrooklynEntityDecorationResolver.SpecParameterResolver(yamlLoader).decorate(spec, attrs);
- configureEntityConfig(spec);
+ configureEntityConfig(spec, encounteredRegisteredTypeIds);
}
@SuppressWarnings({ "unchecked", "rawtypes" })