This closes #751
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/bfcb8c35 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/bfcb8c35 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/bfcb8c35 Branch: refs/heads/master Commit: bfcb8c35efe58d598bb0f9b790f965b173ab0e47 Parents: d01554a b1a730a Author: Aled Sage <[email protected]> Authored: Thu Jul 23 22:07:18 2015 -0700 Committer: Aled Sage <[email protected]> Committed: Thu Jul 23 22:07:18 2015 -0700 ---------------------------------------------------------------------- .../brooklyn/camp/spi/resolve/PdpProcessor.java | 14 +++- .../camp/brooklyn/BrooklynCampReservedKeys.java | 29 +++++++ .../BrooklynComponentTemplateResolver.java | 37 ++++++-- .../BrooklynEntityDecorationResolver.java | 7 +- .../spi/creation/BrooklynEntityMatcher.java | 88 +++++--------------- .../creation/BrooklynYamlTypeInstantiator.java | 3 +- .../spi/dsl/methods/BrooklynDslCommon.java | 3 +- .../camp/brooklyn/EntitiesYamlTest.java | 59 +++++++++++++ .../camp/brooklyn/JavaWebAppsMatchingTest.java | 6 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 79 ++++++++++++++++++ 10 files changed, 240 insertions(+), 85 deletions(-) ----------------------------------------------------------------------
