Repository: brooklyn-server Updated Branches: refs/heads/master ff5ba379e -> baf807097
Merge branch 'bundle-rest-api' into adjunct-rest-api-and-highlights-2 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/80a4c255 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/80a4c255 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/80a4c255 Branch: refs/heads/master Commit: 80a4c255d595d4df9a2af7199b9a03e9f2a5641d Parents: 459e892 1cd6bf4 Author: Alex Heneveld <[email protected]> Authored: Wed Sep 13 16:52:14 2017 +0100 Committer: Alex Heneveld <[email protected]> Committed: Wed Sep 13 16:52:14 2017 +0100 ---------------------------------------------------------------------- .../brooklyn/api/catalog/BrooklynCatalog.java | 1 - .../typereg/RegisteredTypeLoadingContext.java | 2 +- .../catalog/internal/BasicBrooklynCatalog.java | 106 +- .../core/mgmt/ha/OsgiArchiveInstaller.java | 18 +- .../mgmt/ha/OsgiBundleInstallationResult.java | 21 +- .../brooklyn/core/mgmt/ha/OsgiManager.java | 89 +- .../core/typereg/RegisteredTypePredicates.java | 54 +- .../brooklyn/core/typereg/RegisteredTypes.java | 43 +- .../org/apache/brooklyn/rest/api/BundleApi.java | 158 +++ .../apache/brooklyn/rest/api/CatalogApi.java | 3 + .../apache/brooklyn/rest/api/SubtypeApi.java | 96 ++ .../org/apache/brooklyn/rest/api/TypeApi.java | 94 ++ .../rest/domain/AdjunctConfigSummary.java | 85 ++ .../domain/BundleInstallationRestResult.java | 67 ++ .../brooklyn/rest/domain/BundleSummary.java | 99 ++ .../brooklyn/rest/domain/ConfigSummary.java | 17 +- .../rest/domain/EnricherConfigSummary.java | 54 +- .../rest/domain/PolicyConfigSummary.java | 53 +- .../brooklyn/rest/domain/TaskSummary.java | 9 +- .../apache/brooklyn/rest/domain/TypeDetail.java | 86 ++ .../brooklyn/rest/domain/TypeSummary.java | 287 +++++ .../apache/brooklyn/rest/BrooklynRestApi.java | 8 +- .../brooklyn/rest/resources/BundleResource.java | 186 +++ .../rest/resources/CatalogResource.java | 40 +- .../rest/resources/SubtypeResource.java | 82 ++ .../brooklyn/rest/resources/TypeResource.java | 186 +++ .../rest/transform/EntityTransformer.java | 25 +- .../rest/transform/TypeTransformer.java | 194 ++++ .../BundleAndTypeAndSubtypeResourcesTest.java | 1093 ++++++++++++++++++ .../brooklyn/util/osgi/VersionedName.java | 24 +- 30 files changed, 3062 insertions(+), 218 deletions(-) ----------------------------------------------------------------------
