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 f7aec33 Merge pull request #1112 from
ahgittin/better-errors-on-bean-transforms
new 329ef40 add failing osgi bean load test, and new-syntax loop
detection test, plus some misc code tidies
new 49d4edd fix the osgi bean load problem (test now passes)
new 5b4e670 fix remaining tests for OSGi
new 1fd7950 add bean score logging
new ae01182 add BeanWithType to blueprint.xml
new 4b31f01 fix path where source is found for osgi bundles and reference
to old repo
new 8ead72f add JAR with bean and failing test case
new 08ad852 fix the bug, by passing the loader through the bean-with-type
instantiation flow
new 9b1a8d6 fix remaining tests, remove extra logging
new 0698f13 This closes #1113
The 10 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:
.../BrooklynComponentTemplateResolver.java | 2 +-
.../creation/BrooklynEntityDecorationResolver.java | 2 +-
...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 ++
...ooklyn.core.typereg.BrooklynTypePlanTransformer | 4 ++
.../brooklyn/CustomTypeConfigYamlOsgiTest.java | 70 +++++++++++++++++++++
.../camp/brooklyn/CustomTypeConfigYamlTest.java | 53 +++++++++-------
.../catalog/CatalogOsgiYamlEntityTest.java | 6 +-
.../brooklyn/catalog/CatalogYamlEntityTest.java | 23 ++++++-
.../catalog/internal/BasicBrooklynCatalog.java | 26 ++++++--
.../jackson/BeanWithTypePlanTransformer.java | 10 ++-
.../core/resolve/jackson/BeanWithTypeUtils.java | 13 ++--
...BrooklynRegisteredTypeJacksonSerialization.java | 35 ++++++-----
.../typereg/RegisteredTypeLoadingContexts.java | 11 +++-
.../core/typereg/TypePlanTransformers.java | 3 +
...rooklyn.api.internal.ApiObjectsFactoryInterface | 4 ++
...g.apache.brooklyn.api.location.LocationResolver | 4 ++
...apache.brooklyn.core.plan.PlanToSpecTransformer | 4 ++
...brooklyn.core.resolve.entity.EntitySpecResolver | 4 ++
...ooklyn.core.typereg.BrooklynTypePlanTransformer | 4 ++
.../resources/OSGI-INF/blueprint/blueprint.xml | 7 +++
.../BrooklynMiscJacksonSerializationTest.java | 8 +--
...klynRegisteredTypeJacksonSerializationTest.java | 2 +-
.../resolve/jackson/PerverseSerializationTest.java | 2 +-
.../jackson/WrappedValuesSerializationTest.java | 6 +-
...g.apache.brooklyn.api.location.LocationResolver | 4 ++
...g.apache.brooklyn.api.location.LocationResolver | 4 ++
...g.apache.brooklyn.api.location.LocationResolver | 4 ++
...brooklyn.core.resolve.entity.EntitySpecResolver | 4 ++
.../META-INF/services/org.testng.ITestNGListener | 24 ++++++-
.../dependencies/osgi/{entities => beans}/pom.xml | 8 +--
.../org/apache/brooklyn/test/osgi/SampleBean.java | 8 ++-
.../osgi/beans/src/main}/resources/catalog.bom | 8 ++-
.../brooklyn/util/osgi/OsgiTestResources.java | 6 +-
.../brooklyn/osgi/brooklyn-osgi-test-a_0.1.0.txt | 2 +-
.../brooklyn/osgi/brooklyn-test-osgi-beans.jar | Bin 0 -> 11696 bytes
...st-a_0.1.0.txt => brooklyn-test-osgi-beans.txt} | 8 +--
.../brooklyn/osgi/brooklyn-test-osgi-entities.txt | 4 +-
.../brooklyn-test-osgi-more-entities_0.1.0.txt | 4 +-
.../brooklyn-test-osgi-more-entities_0.2.0.txt | 4 +-
...lyn-test-osgi-more-entities_evil-twin_0.2.0.txt | 4 +-
.../org.apache.brooklyn.util.osgi.SystemFramework | 4 ++
41 files changed, 316 insertions(+), 91 deletions(-)
create mode 100644
camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/CustomTypeConfigYamlOsgiTest.java
copy utils/common/dependencies/osgi/{entities => beans}/pom.xml (93%)
copy api/src/main/java/org/apache/brooklyn/api/objs/Identifiable.java =>
utils/common/dependencies/osgi/beans/src/main/java/org/apache/brooklyn/test/osgi/SampleBean.java
(89%)
copy {core/src/test =>
utils/common/dependencies/osgi/beans/src/main}/resources/catalog.bom (86%)
create mode 100644
utils/common/src/test/resources/brooklyn/osgi/brooklyn-test-osgi-beans.jar
copy
utils/common/src/test/resources/brooklyn/osgi/{brooklyn-osgi-test-a_0.1.0.txt
=> brooklyn-test-osgi-beans.txt} (82%)
