This closes #799
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/36de666d Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/36de666d Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/36de666d Branch: refs/heads/master Commit: 36de666d2d095484a2e1ffda3df980a4abbb0404 Parents: 3d650c9 7986ed1 Author: Alex Heneveld <[email protected]> Authored: Thu Sep 7 16:47:21 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Thu Sep 7 16:47:21 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/catalog/BrooklynCatalog.java | 13 +- .../camp/brooklyn/AbstractYamlTest.java | 50 +++++- .../brooklyn/camp/brooklyn/RebindOsgiTest.java | 47 ++++- .../camp/brooklyn/ReferencedYamlOsgiTest.java | 2 +- .../catalog/CatalogMakeOsgiBundleTest.java | 3 +- .../CatalogOsgiVersionMoreEntityRebindTest.java | 17 +- .../CatalogYamlEntityOsgiTypeRegistryTest.java | 36 +++- .../brooklyn/catalog/CatalogYamlEntityTest.java | 68 +++++++ .../catalog/internal/BasicBrooklynCatalog.java | 131 +++++++++----- .../catalog/internal/CatalogBundleLoader.java | 59 ++++--- .../core/catalog/internal/CatalogUtils.java | 25 ++- .../core/mgmt/ha/OsgiArchiveInstaller.java | 110 ++++++++++-- .../brooklyn/core/mgmt/ha/OsgiManager.java | 177 +++++++++++++------ .../BrooklynMementoPersisterToObjectStore.java | 20 +-- .../core/typereg/BasicBrooklynTypeRegistry.java | 41 +++-- .../core/typereg/BasicManagedBundle.java | 23 ++- .../brooklyn/launcher/osgi/OsgiLauncher.java | 2 +- .../rest/domain/CatalogEnricherSummary.java | 3 +- .../rest/domain/CatalogEntitySummary.java | 4 +- .../rest/domain/CatalogItemSummary.java | 11 +- .../rest/domain/CatalogLocationSummary.java | 3 +- .../rest/domain/CatalogPolicySummary.java | 3 +- .../rest/resources/CatalogResource.java | 1 + .../rest/transform/CatalogTransformer.java | 20 +-- .../rest/resources/CatalogResourceTest.java | 5 +- .../rest/testing/BrooklynRestApiTest.java | 5 +- .../java/org/apache/brooklyn/test/Asserts.java | 6 +- 27 files changed, 651 insertions(+), 234 deletions(-) ----------------------------------------------------------------------
