This closes #1017
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3e40b2bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3e40b2bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3e40b2bf Branch: refs/heads/master Commit: 3e40b2bfd609e6313c9f48d42be722f708043da1 Parents: 7c649d7 c575708 Author: Alex Heneveld <[email protected]> Authored: Tue Nov 17 22:50:49 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Tue Nov 17 22:50:49 2015 +0000 ---------------------------------------------------------------------- .../brooklyn/api/catalog/CatalogItem.java | 24 ++ .../apache/brooklyn/api/entity/EntitySpec.java | 93 ----- .../internal/AbstractBrooklynObjectSpec.java | 100 ++++- .../brooklyn/api/location/LocationSpec.java | 78 +--- .../BrooklynClassLoadingContext.java | 50 +++ .../apache/brooklyn/api/policy/PolicySpec.java | 75 ---- .../brooklyn/api/sensor/EnricherSpec.java | 75 +--- .../api/typereg/BrooklynTypeRegistry.java | 32 +- .../brooklyn/api/typereg/RegisteredType.java | 45 ++- .../api/typereg/RegisteredTypeConstraint.java | 45 --- .../typereg/RegisteredTypeLoadingContext.java | 50 +++ .../catalog/internal/BasicBrooklynCatalog.java | 41 +- .../catalog/internal/CatalogItemBuilder.java | 44 ++- .../core/catalog/internal/CatalogUtils.java | 33 +- .../core/location/CatalogLocationResolver.java | 3 +- .../core/mgmt/EntityManagementUtils.java | 17 +- .../AbstractBrooklynClassLoadingContext.java | 5 +- .../BrooklynClassLoadingContext.java | 30 +- .../BrooklynClassLoadingContextSequential.java | 1 + ...ssLoaderFromBrooklynClassLoadingContext.java | 2 + .../internal/AbstractManagementContext.java | 2 +- .../core/mgmt/persist/XmlMementoSerializer.java | 2 +- .../core/mgmt/rebind/RebindIteration.java | 2 +- .../brooklyn/core/objs/BasicSpecParameter.java | 2 +- .../core/plan/PlanNotRecognizedException.java | 5 + .../brooklyn/core/plan/PlanToSpecFactory.java | 40 +- .../core/plan/PlanToSpecTransformer.java | 3 +- .../entity/AbstractEntitySpecResolver.java | 2 +- .../entity/CatalogEntitySpecResolver.java | 6 +- .../entity/DelegatingEntitySpecResolver.java | 4 +- .../core/resolve/entity/EntitySpecResolver.java | 2 +- .../resolve/entity/JavaEntitySpecResolver.java | 2 +- ...actFormatSpecificTypeImplementationPlan.java | 52 +++ .../typereg/AbstractTypePlanTransformer.java | 142 +++++++ .../core/typereg/BasicBrooklynTypeRegistry.java | 126 +++++- .../core/typereg/BasicRegisteredType.java | 135 +++++++ .../typereg/BasicTypeImplementationPlan.java | 41 ++ .../typereg/BrooklynTypePlanTransformer.java | 88 +++++ .../JavaClassNameTypePlanTransformer.java | 91 +++++ .../core/typereg/RegisteredTypeConstraints.java | 156 -------- .../core/typereg/RegisteredTypeKindVisitor.java | 45 +++ .../typereg/RegisteredTypeLoadingContexts.java | 236 +++++++++++ .../core/typereg/RegisteredTypePredicates.java | 28 +- .../brooklyn/core/typereg/RegisteredTypes.java | 389 ++++++++++++------- .../core/typereg/TypePlanTransformers.java | 165 ++++++++ .../typereg/UnsupportedTypePlanException.java | 37 ++ .../brooklyn/util/core/ResourceUtils.java | 3 +- ...lyn.core.typereg.BrooklynTypePlanTransformer | 19 + .../policy/basic/AbstractEntityAdjunctTest.java | 52 --- .../internal/StaticTypePlanTransformer.java | 124 ++++++ .../internal/StaticTypePlanTransformerTest.java | 63 +++ .../core/objs/AbstractEntityAdjunctTest.java | 52 +++ .../objs/BasicSpecParameterFromListTest.java | 2 +- .../core/plan/XmlPlanToSpecTransformer.java | 5 +- .../core/plan/XmlPlanToSpecTransformerTest.java | 2 + .../brooklyn/core/sensor/StaticSensorTest.java | 8 +- .../core/test/BrooklynAppLiveTestSupport.java | 26 +- .../core/test/BrooklynAppUnitTestSupport.java | 38 +- .../core/test/BrooklynMgmtUnitTestSupport.java | 61 +++ .../core/test/entity/TestEntityImpl.java | 1 - .../typereg/ExampleXmlTypePlanTransformer.java | 140 +++++++ .../ExampleXmlTypePlanTransformerTest.java | 67 ++++ .../JavaClassNameTypePlanTransformerTest.java | 90 +++++ .../entity/resolve/ChefEntitySpecResolver.java | 2 +- .../HardcodedCatalogEntitySpecResolver.java | 2 +- .../api/AssemblyTemplateSpecInstantiator.java | 7 +- .../BrooklynAssemblyTemplateInstantiator.java | 13 +- .../BrooklynComponentTemplateResolver.java | 2 +- .../BrooklynEntityDecorationResolver.java | 5 +- .../spi/creation/BrooklynEntityMatcher.java | 2 +- .../creation/BrooklynYamlTypeInstantiator.java | 2 +- .../brooklyn/spi/creation/CampCatalogUtils.java | 54 +-- .../spi/creation/CampInternalUtils.java | 247 ++++++++++++ .../brooklyn/spi/creation/CampResolver.java | 147 +++++++ .../spi/creation/CampToSpecTransformer.java | 17 +- .../spi/creation/CampTypePlanTransformer.java | 98 +++++ .../camp/brooklyn/spi/creation/CampUtils.java | 267 ------------- .../service/ServiceTypeResolverAdaptor.java | 2 +- .../service/UrlServiceSpecResolver.java | 20 +- ...lyn.core.typereg.BrooklynTypePlanTransformer | 19 + .../camp/brooklyn/AbstractYamlTest.java | 39 +- .../BrooklynYamlTypeInstantiatorTest.java | 2 +- .../camp/brooklyn/EntitiesYamlTest.java | 2 + .../camp/brooklyn/LocationsYamlTest.java | 4 +- .../camp/brooklyn/ReferencedYamlTest.java | 1 + .../CatalogOsgiVersionMoreEntityTest.java | 18 +- .../catalog/CatalogYamlLocationTest.java | 3 +- .../catalog/SpecParameterParsingTest.java | 44 ++- .../brooklyn/test/lite/CampYamlLiteTest.java | 6 +- .../test/lite/TestAppAssemblyInstantiator.java | 10 +- .../rest/resources/ApplicationResource.java | 14 +- .../rest/resources/CatalogResource.java | 5 +- .../rest/util/BrooklynRestResourceUtils.java | 2 +- .../exceptions/PropagatedRuntimeException.java | 6 + .../apache/brooklyn/util/text/Identifiers.java | 13 +- .../brooklyn/util/text/IdentifiersTest.java | 13 + 96 files changed, 3133 insertions(+), 1354 deletions(-) ----------------------------------------------------------------------
