This is an automated email from the ASF dual-hosted git repository.
geomacy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git.
from f6c290f Merge pull request #1114 from ahgittin/post-init
new a943761 outline of catalog bundle resolver code
new b27e095 more refactoring for CatalogBundleResolver
new d17588a register the CatalogBundleResolver services
new 18b66a2 persist the format for subsequent re-use. start switch to
always resolving bundles.
new f0f3895 use a renewable input stream source instead of a single-use
input stream
new 5da3561 use previous installation preparation logic to allow
installing bundles by OSGi references
new 41f273a tidy up, fixing misc minor bugs and tests
new 16831ad Merge branch 'master' into catalog-bundle-resolvers
new 52cf1ba address pull request comments
new ae5a75f Merge pull request #1115 from
ahgittin/catalog-bundle-resolvers
The 12617 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../mgmt/rebind/mementos/ManagedBundleMemento.java | 2 +
.../apache/brooklyn/api/typereg/ManagedBundle.java | 5 +-
.../spi/creation/CampTypePlanTransformer.java | 12 -
.../brooklyn/camp/brooklyn/AbstractYamlTest.java | 7 +-
.../brooklyn/CustomTypeConfigYamlOsgiTest.java | 15 +-
.../catalog/CatalogMakeOsgiBundleTest.java | 5 +-
.../CatalogOsgiVersionMoreEntityRebindTest.java | 24 +-
.../catalog/CatalogOsgiVersionMoreEntityTest.java | 2 +-
.../catalog/CatalogOsgiYamlEntityTest.java | 14 +-
.../camp/brooklyn/catalog/CatalogScanOsgiTest.java | 3 +-
.../camp/brooklyn/test/lite/CampYamlLiteTest.java | 2 +-
.../catalog/internal/BasicBrooklynCatalog.java | 75 +---
.../core/catalog/internal/CatalogBundleLoader.java | 18 +-
.../catalog/internal/CatalogInitialization.java | 12 +-
.../catalog/internal/CatalogUpgradeScanner.java | 8 +-
.../apache/brooklyn/core/config/ConfigUtils.java | 23 ++
...r.java => BrooklynBomOsgiArchiveInstaller.java} | 401 ++++++++++++---------
.../apache/brooklyn/core/mgmt/ha/OsgiManager.java | 98 +++--
.../BasicExternalConfigSupplierRegistry.java | 9 +-
.../core/mgmt/rebind/RebindContextImpl.java | 3 +-
.../brooklyn/core/mgmt/rebind/RebindIteration.java | 15 +-
.../mgmt/rebind/dto/BasicManagedBundleMemento.java | 17 +-
.../core/mgmt/rebind/dto/MementosGenerators.java | 3 +-
.../jackson/BeanWithTypePlanTransformer.java | 10 -
.../typereg/AbstractCatalogBundleResolver.java | 216 +++++++++++
.../brooklyn/core/typereg/BasicManagedBundle.java | 24 +-
.../BrooklynBomBundleCatalogBundleResolver.java | 75 ++++
.../BrooklynBomYamlCatalogBundleResolver.java | 132 +++++++
.../typereg/BrooklynCatalogBundleResolver.java | 126 +++++++
.../typereg/BrooklynCatalogBundleResolvers.java | 193 ++++++++++
.../core/typereg/BrooklynTypePlanTransformer.java | 19 +-
.../typereg/JavaClassNameTypePlanTransformer.java | 12 -
.../core/typereg/TypePlanTransformers.java | 39 +-
...java => UnsupportedCatalogBundleException.java} | 10 +-
.../apache/brooklyn/util/core/ResourceUtils.java | 12 +
...klyn.core.typereg.BrooklynCatalogBundleResolver | 3 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 11 +
.../internal/StaticTypePlanTransformer.java | 12 -
...va => BrooklynBomOsgiArchiveInstallerTest.java} | 22 +-
.../typereg/ExampleXmlTypePlanTransformer.java | 13 -
.../AbstractBrooklynLauncherRebindTest.java | 4 +-
.../BrooklynLauncherRebindCatalogOsgiTest.java | 9 +-
.../brooklyn/rest/resources/BundleResource.java | 14 +-
.../brooklyn/rest/resources/CatalogResource.java | 14 +-
.../brooklyn/rest/transform/TypeTransformer.java | 3 +
.../brooklyn/util/collections/MutableList.java | 14 +-
.../apache/brooklyn/util/osgi/VersionedName.java | 2 +-
.../brooklyn/util/stream/InputStreamSource.java | 109 ++++++
48 files changed, 1387 insertions(+), 484 deletions(-)
rename
core/src/main/java/org/apache/brooklyn/core/mgmt/ha/{OsgiArchiveInstaller.java
=> BrooklynBomOsgiArchiveInstaller.java} (73%)
create mode 100644
core/src/main/java/org/apache/brooklyn/core/typereg/AbstractCatalogBundleResolver.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/typereg/BrooklynBomBundleCatalogBundleResolver.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/typereg/BrooklynBomYamlCatalogBundleResolver.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/typereg/BrooklynCatalogBundleResolver.java
create mode 100644
core/src/main/java/org/apache/brooklyn/core/typereg/BrooklynCatalogBundleResolvers.java
copy
core/src/main/java/org/apache/brooklyn/core/typereg/{UnsupportedTypePlanException.java
=> UnsupportedCatalogBundleException.java} (74%)
copy
camp/camp-brooklyn/src/main/resources/META-INF/services/org.apache.brooklyn.core.plan.PlanToSpecTransformer
=>
core/src/main/resources/META-INF/services/org.apache.brooklyn.core.typereg.BrooklynCatalogBundleResolver
(86%)
rename
core/src/test/java/org/apache/brooklyn/core/mgmt/ha/{OsgiArchiveInstallerTest.java
=> BrooklynBomOsgiArchiveInstallerTest.java} (71%)
create mode 100644
utils/common/src/main/java/org/apache/brooklyn/util/stream/InputStreamSource.java
