This closes #810
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/05ae90a7 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/05ae90a7 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/05ae90a7 Branch: refs/heads/master Commit: 05ae90a71ce260c72e72ca059d3d4e1a659a73a8 Parents: 3ac961d 54fb9c6 Author: Alex Heneveld <[email protected]> Authored: Mon Sep 25 10:29:14 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Mon Sep 25 10:29:14 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/catalog/BrooklynCatalog.java | 3 + .../typereg/RegisteredTypeLoadingContext.java | 2 +- .../catalog/internal/BasicBrooklynCatalog.java | 106 +- .../core/mgmt/entitlement/Entitlements.java | 1 + .../core/mgmt/ha/OsgiArchiveInstaller.java | 18 +- .../mgmt/ha/OsgiBundleInstallationResult.java | 21 +- .../brooklyn/core/mgmt/ha/OsgiManager.java | 89 +- .../core/typereg/RegisteredTypePredicates.java | 98 +- .../brooklyn/core/typereg/RegisteredTypes.java | 43 +- .../org/apache/brooklyn/rest/api/BundleApi.java | 147 +++ .../apache/brooklyn/rest/api/CatalogApi.java | 53 + .../org/apache/brooklyn/rest/api/TypeApi.java | 100 ++ .../domain/BundleInstallationRestResult.java | 67 ++ .../brooklyn/rest/domain/BundleSummary.java | 106 ++ .../brooklyn/rest/domain/ConfigSummary.java | 79 +- .../rest/domain/EnricherConfigSummary.java | 52 +- .../rest/domain/EntityConfigSummary.java | 67 +- .../rest/domain/LocationConfigSummary.java | 40 +- .../rest/domain/PolicyConfigSummary.java | 53 +- .../brooklyn/rest/domain/TaskSummary.java | 9 +- .../apache/brooklyn/rest/domain/TypeDetail.java | 87 ++ .../brooklyn/rest/domain/TypeSummary.java | 293 +++++ .../apache/brooklyn/rest/BrooklynRestApi.java | 6 +- .../brooklyn/rest/resources/BundleResource.java | 169 +++ .../rest/resources/CatalogResource.java | 40 +- .../brooklyn/rest/resources/TypeResource.java | 207 ++++ .../rest/transform/EntityTransformer.java | 26 +- .../rest/transform/PolicyTransformer.java | 3 +- .../rest/transform/TypeTransformer.java | 197 ++++ .../resources/BundleAndTypeResourcesTest.java | 1098 ++++++++++++++++++ .../brooklyn/util/osgi/VersionedName.java | 24 +- 31 files changed, 2982 insertions(+), 322 deletions(-) ----------------------------------------------------------------------
