This closes #1001
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/be46512a Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/be46512a Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/be46512a Branch: refs/heads/master Commit: be46512ac9dff5dc76fb1e101503540dccbcd651 Parents: 1eb1519 b1b82f9 Author: Alex Heneveld <[email protected]> Authored: Mon Nov 9 12:54:52 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Nov 9 12:54:52 2015 +0000 ---------------------------------------------------------------------- .../brooklyn/api/catalog/CatalogItem.java | 15 +- .../apache/brooklyn/api/entity/EntitySpec.java | 50 +-- .../internal/AbstractBrooklynObjectSpec.java | 24 ++ .../rebind/mementos/CatalogItemMemento.java | 4 + .../apache/brooklyn/api/objs/SpecParameter.java | 32 ++ .../catalog/internal/BasicBrooklynCatalog.java | 41 ++- .../catalog/internal/CatalogClasspathDo.java | 14 +- .../catalog/internal/CatalogItemBuilder.java | 10 + .../core/catalog/internal/CatalogItemDo.java | 8 + .../internal/CatalogItemDtoAbstract.java | 25 +- .../internal/JavaCatalogToSpecTransformer.java | 14 +- .../brooklyn/core/entity/AbstractEntity.java | 19 ++ .../apache/brooklyn/core/entity/Entities.java | 11 + .../brooklyn/core/entity/EntityDynamicType.java | 37 +++ .../core/mgmt/EntityManagementUtils.java | 6 +- .../brooklyn/core/mgmt/ha/OsgiManager.java | 1 + .../rebind/BasicCatalogItemRebindSupport.java | 1 + .../rebind/dto/BasicCatalogItemMemento.java | 24 +- .../brooklyn/core/objs/BasicSpecParameter.java | 324 +++++++++++++++++++ .../core/objs/proxy/InternalEntityFactory.java | 12 + .../brooklyn/util/core/flags/FlagUtils.java | 30 +- .../core/catalog/internal/CatalogLoadTest.java | 2 +- .../internal/SpecParameterInMetaTest.java | 139 ++++++++ .../catalog/internal/TestToSpecTransformer.java | 118 +++++++ .../entity/DynamicEntityTypeConfigTest.java | 126 ++++++++ .../brooklyn/core/entity/EntityTypeTest.java | 15 +- .../objs/BasicSpecParameterFromClassTest.java | 109 +++++++ .../objs/BasicSpecParameterFromListTest.java | 186 +++++++++++ ...che.brooklyn.core.plan.PlanToSpecTransformer | 19 ++ docs/guide/ops/catalog/index.md | 25 ++ docs/guide/yaml/yaml-reference.md | 4 + .../camp/brooklyn/BrooklynCampPlatform.java | 1 + .../BrooklynCampPlatformLauncherNoServer.java | 1 + .../camp/brooklyn/BrooklynCampReservedKeys.java | 1 + .../BrooklynAssemblyTemplateInstantiator.java | 22 +- .../BrooklynComponentTemplateResolver.java | 2 + .../BrooklynEntityDecorationResolver.java | 74 ++++- .../spi/creation/BrooklynEntityMatcher.java | 1 + .../creation/BrooklynYamlTypeInstantiator.java | 2 + .../brooklyn/spi/creation/CampCatalogUtils.java | 12 +- .../camp/brooklyn/spi/creation/CampUtils.java | 74 ++++- .../service/UrlServiceSpecResolver.java | 7 +- .../spi/dsl/methods/BrooklynDslCommon.java | 6 + .../brooklyn/spi/dsl/methods/DslComponent.java | 14 +- .../platform/BrooklynImmutableCampPlatform.java | 1 + .../camp/brooklyn/AbstractYamlTest.java | 7 +- .../camp/brooklyn/EntitiesYamlTest.java | 74 ++++- .../brooklyn/ReferencingYamlTestEntity.java | 8 + .../brooklyn/catalog/CatalogParametersTest.java | 318 ++++++++++++++++++ .../resources/test-referencing-entities.yaml | 14 + .../assets/js/view/application-add-wizard.js | 14 +- .../app-add-wizard/required-config-entry.html | 2 +- .../rest/transform/CatalogTransformer.java | 15 +- .../rest/transform/EntityTransformer.java | 7 + .../brooklyn-test-osgi-more-entities_0.2.0.jar | Bin 15622 -> 15745 bytes .../osgi/more-entities-v2-evil-twin/pom.xml | 2 +- .../test/osgi/entities/more/MoreEntity.java | 3 + 57 files changed, 1994 insertions(+), 133 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be46512a/core/src/main/java/org/apache/brooklyn/core/mgmt/EntityManagementUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/be46512a/core/src/main/java/org/apache/brooklyn/core/mgmt/ha/OsgiManager.java ----------------------------------------------------------------------
