You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2017/09/26 12:17:12 UTC
[7/9] brooklyn-server git commit: Merge branch 'master' into
bundles-brooklyn-import-osgi-already-managed
Merge branch 'master' into bundles-brooklyn-import-osgi-already-managed
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/2641f448
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/2641f448
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/2641f448
Branch: refs/heads/master
Commit: 2641f448ef314843d165d70a594f74176d9e7b83
Parents: a017a1c df83d44
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Mon Sep 25 13:20:24 2017 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Sep 25 13:20:24 2017 +0100
----------------------------------------------------------------------
.../brooklyn/api/catalog/BrooklynCatalog.java | 4 +
.../brooklyn/api/typereg/RegisteredType.java | 5 +-
.../CatalogOsgiVersionMoreEntityRebindTest.java | 10 +-
.../CatalogOsgiVersionMoreEntityTest.java | 3 +
.../core/mgmt/entitlement/Entitlements.java | 1 +
.../mgmt/ha/OsgiBundleInstallationResult.java | 4 +-
.../core/typereg/BasicBrooklynTypeRegistry.java | 20 +-
.../typereg/BasicTypeImplementationPlan.java | 4 +-
.../typereg/RegisteredTypeLoadingContexts.java | 6 +-
.../core/typereg/RegisteredTypePredicates.java | 78 +-
.../brooklyn/core/typereg/RegisteredTypes.java | 2 +-
.../core/policy/basic/EnricherTypeTest.java | 6 -
.../init/src/main/resources/catalog-classes.bom | 12 +-
.../JcloudsMaxConcurrencyStubbedTest.java | 10 +-
policy/src/main/resources/catalog.bom | 8 +-
.../AbstractLoadBalancingPolicyTest.java | 1 -
.../org/apache/brooklyn/rest/api/BundleApi.java | 37 +-
.../apache/brooklyn/rest/api/CatalogApi.java | 56 +-
.../apache/brooklyn/rest/api/SubtypeApi.java | 96 --
.../org/apache/brooklyn/rest/api/TypeApi.java | 16 +-
.../rest/domain/AdjunctConfigSummary.java | 85 --
.../brooklyn/rest/domain/BundleSummary.java | 7 +
.../brooklyn/rest/domain/ConfigSummary.java | 66 +-
.../rest/domain/EnricherConfigSummary.java | 12 +-
.../rest/domain/EntityConfigSummary.java | 67 +-
.../rest/domain/LocationConfigSummary.java | 40 +-
.../rest/domain/PolicyConfigSummary.java | 30 +-
.../apache/brooklyn/rest/domain/TypeDetail.java | 3 +-
.../brooklyn/rest/domain/TypeSummary.java | 12 +-
.../apache/brooklyn/rest/BrooklynRestApi.java | 2 -
.../brooklyn/rest/resources/BundleResource.java | 45 +-
.../rest/resources/SubtypeResource.java | 82 --
.../brooklyn/rest/resources/TypeResource.java | 23 +-
.../rest/transform/EntityTransformer.java | 11 +-
.../rest/transform/PolicyTransformer.java | 3 +-
.../rest/transform/TypeTransformer.java | 37 +-
.../BundleAndTypeAndSubtypeResourcesTest.java | 1093 -----------------
.../resources/BundleAndTypeResourcesTest.java | 1098 ++++++++++++++++++
test-framework/src/main/resources/catalog.bom | 4 +-
39 files changed, 1464 insertions(+), 1635 deletions(-)
----------------------------------------------------------------------