This is an automated email from the ASF dual-hosted git repository.
heneveld pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
from 86dfbb0932 support (partially) openssh key format
new 6b9837a768 use containing bundle as part of the search path, and
prefer the search path
new 2f429a1c0d allow kind to change during validation
new c961ccbc85 updates to tests where same-bundle and library wasn't used
for searching
The 3 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:
.../classloading/BrooklynClassLoadingContext.java | 5 +
.../catalog/CatalogMakeOsgiBundleTest.java | 4 +-
.../catalog/CatalogOsgiVersionMoreEntityTest.java | 14 +-
.../catalog/CatalogOsgiYamlLocationTest.java | 5 +-
.../camp/brooklyn/catalog/CatalogScanOsgiTest.java | 40 +++---
.../catalog/NestedRefsCatalogYamlTest.java | 151 +++++++++++++++------
.../camp/brooklyn/test/lite/CampYamlLiteTest.java | 22 +--
...ml => nested-refs-catalog-yaml-test-2.bom.yaml} | 13 +-
...ml => nested-refs-catalog-yaml-test-3.bom.yaml} | 6 +-
.../catalog/internal/BasicBrooklynCatalog.java | 104 ++++++++------
.../BrooklynClassLoadingContextSequential.java | 21 ++-
.../JavaBrooklynClassLoadingContext.java | 10 +-
.../OsgiBrooklynClassLoadingContext.java | 2 +
.../resolve/entity/CatalogEntitySpecResolver.java | 4 +-
...BrooklynRegisteredTypeJacksonSerialization.java | 3 +-
.../core/typereg/BasicBrooklynTypeRegistry.java | 2 +-
.../brooklyn/core/typereg/RegisteredTypes.java | 31 ++++-
.../rest/resources/BundleAndTypeResourcesTest.java | 12 +-
.../rest/resources/CatalogResourceTest.java | 4 +-
.../rt/felix/EmbeddedFelixFrameworkTest.java | 7 +-
20 files changed, 301 insertions(+), 159 deletions(-)
copy
camp/camp-brooklyn/src/test/resources/{nested-refs-catalog-yaml-test.bom.yaml
=> nested-refs-catalog-yaml-test-2.bom.yaml} (95%)
copy
camp/camp-brooklyn/src/test/resources/{nested-refs-catalog-yaml-test.bom.yaml
=> nested-refs-catalog-yaml-test-3.bom.yaml} (95%)