This closes #670
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/54af9935 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/54af9935 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/54af9935 Branch: refs/heads/master Commit: 54af9935f1717a96ff0c2f0b2ff13ff03badffb7 Parents: 1dc48c8 524f702 Author: Alex Heneveld <[email protected]> Authored: Tue Jun 2 19:15:26 2015 +0200 Committer: Alex Heneveld <[email protected]> Committed: Tue Jun 2 19:15:26 2015 +0200 ---------------------------------------------------------------------- .../catalog/internal/BasicBrooklynCatalog.java | 60 ++++++++++++++--- .../brooklyn/osgi/tests/more/MoreLocation.java | 25 +++++++ .../brooklyn/osgi/tests/more/MorePolicy.java | 27 ++++++++ .../brooklyn/osgi/tests/more/MoreTemplate.java | 30 +++++++++ .../brooklyn/osgi/tests/more/MoreLocation.java | 27 ++++++++ .../brooklyn/osgi/tests/more/MorePolicy.java | 30 +++++++++ .../brooklyn/osgi/tests/more/MoreTemplate.java | 32 +++++++++ .../osgi/OsgiVersionMoreEntityTest.java | 5 +- .../brooklyn-test-osgi-more-entities_0.1.0.jar | Bin 12428 -> 14164 bytes .../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 13078 -> 14799 bytes .../CatalogOsgiVersionMoreEntityTest.java | 67 +++++++++++++++++++ .../more-policies-osgi-catalog-scan.yaml | 32 +++++++++ 12 files changed, 322 insertions(+), 13 deletions(-) ----------------------------------------------------------------------
