This closes #532
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/477e2309 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/477e2309 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/477e2309 Branch: refs/heads/master Commit: 477e2309af19449d67be4d7d1dd4d3ec3e270c74 Parents: fc720ef 8523e11 Author: Sam Corbett <[email protected]> Authored: Thu Feb 26 11:08:57 2015 +0000 Committer: Sam Corbett <[email protected]> Committed: Thu Feb 26 11:08:57 2015 +0000 ---------------------------------------------------------------------- .../osgi/tests/SimpleApplicationImpl.java | 2 +- .../management/osgi/OsgiTestResources.java | 1 + .../osgi/brooklyn-test-osgi-entities.jar | Bin 12406 -> 12419 bytes .../BrooklynAssemblyTemplateInstantiator.java | 11 ++ .../BrooklynComponentTemplateResolver.java | 18 ++-- .../catalog/AbstractCatalogXmlTest.java | 107 +++++++++++++++++++ .../brooklyn/catalog/CatalogXmlOsgiTest.java | 37 +++++++ .../brooklyn/catalog/CatalogXmlVersionTest.java | 58 ++++++++++ .../camp/brooklyn/catalog/TestBasicApp.java | 27 +++++ .../camp/brooklyn/catalog/TestBasicAppImpl.java | 24 +++++ usage/camp/src/test/resources/osgi-catalog.xml | 29 +++++ .../camp/src/test/resources/simple-catalog.xml | 47 ++++++++ 12 files changed, 354 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
