Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B9E50200D14 for ; Tue, 3 Oct 2017 16:23:39 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B8790160BE3; Tue, 3 Oct 2017 14:23:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 103E11609D2 for ; Tue, 3 Oct 2017 16:23:38 +0200 (CEST) Received: (qmail 436 invoked by uid 500); 3 Oct 2017 14:23:38 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 427 invoked by uid 99); 3 Oct 2017 14:23:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Oct 2017 14:23:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 25FFEE96ED; Tue, 3 Oct 2017 14:23:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: heneveld@apache.org To: commits@brooklyn.apache.org Date: Tue, 03 Oct 2017 14:23:38 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/35] brooklyn-server git commit: Merge branch 'bundle-rest-api' into adjunct-rest-api-and-highlights-2 archived-at: Tue, 03 Oct 2017 14:23:39 -0000 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 Authored: Wed Sep 13 16:52:14 2017 +0100 Committer: Alex Heneveld 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(-) ----------------------------------------------------------------------