This closes #993
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/48e4fe3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/48e4fe3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/48e4fe3c Branch: refs/heads/master Commit: 48e4fe3ca0b5a00fbdec10bceec9f21edee25ded Parents: c0021ca 2530296 Author: Alex Heneveld <[email protected]> Authored: Mon Nov 2 16:42:45 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Mon Nov 2 16:42:45 2015 +0000 ---------------------------------------------------------------------- .../basic/relations/RelationshipType.java | 38 --- .../brooklyn/api/catalog/BrooklynCatalog.java | 47 +-- .../brooklyn/api/catalog/CatalogItem.java | 12 +- .../org/apache/brooklyn/api/entity/Entity.java | 6 + .../internal/AbstractBrooklynObjectSpec.java | 14 +- .../apache/brooklyn/api/mgmt/EntityManager.java | 2 +- .../brooklyn/api/mgmt/ManagementContext.java | 4 + .../brooklyn/api/objs/BrooklynObject.java | 3 +- .../brooklyn/api/objs/BrooklynObjectType.java | 30 +- .../apache/brooklyn/api/objs/BrooklynType.java | 3 + .../api/relations/RelationshipType.java | 38 +++ .../api/typereg/BrooklynTypeRegistry.java | 68 ++++ .../brooklyn/api/typereg/OsgiBundleWithUrl.java | 36 +++ .../brooklyn/api/typereg/RegisteredType.java | 65 ++++ .../api/typereg/RegisteredTypeConstraint.java | 45 +++ .../catalog/internal/BasicBrooklynCatalog.java | 141 +++------ .../core/catalog/internal/CatalogBundleDto.java | 5 +- .../internal/CatalogItemDtoAbstract.java | 2 +- .../core/catalog/internal/CatalogUtils.java | 69 ++++- .../internal/JavaCatalogToSpecTransformer.java | 23 +- .../brooklyn/core/entity/AbstractEntity.java | 26 ++ .../apache/brooklyn/core/entity/Entities.java | 27 +- .../brooklyn/core/entity/EntityRelations.java | 3 +- .../core/entity/factory/ApplicationBuilder.java | 10 +- .../core/location/BasicLocationRegistry.java | 37 ++- .../core/location/CatalogLocationResolver.java | 6 +- .../core/mgmt/EntityManagementUtils.java | 25 +- .../OsgiBrooklynClassLoadingContext.java | 17 +- .../brooklyn/core/mgmt/ha/OsgiManager.java | 47 +-- .../internal/AbstractManagementContext.java | 14 +- .../core/mgmt/internal/LocalEntityManager.java | 1 + .../mgmt/internal/ManagementTransitionMode.java | 2 +- .../NonDeploymentManagementContext.java | 12 +- .../BrooklynMementoPersisterToObjectStore.java | 10 +- .../core/mgmt/persist/XmlMementoSerializer.java | 3 +- .../AbstractBrooklynObjectRebindSupport.java | 3 +- .../mgmt/rebind/RebindContextLookupContext.java | 9 +- .../core/mgmt/rebind/RebindIteration.java | 30 +- .../mgmt/rebind/dto/MementosGenerators.java | 3 +- .../relations/AbstractBasicRelationSupport.java | 3 +- .../relations/ByObjectBasicRelationSupport.java | 3 +- .../core/relations/EmptyRelationSupport.java | 3 +- .../core/relations/RelationshipTypes.java | 4 +- .../brooklyn/core/resolve/ResolveUtils.java | 87 ------ .../entity/CatalogEntitySpecResolver.java | 60 ++-- .../resolve/entity/JavaEntitySpecResolver.java | 8 + .../core/typereg/BasicBrooklynTypeRegistry.java | 120 +++++++ .../core/typereg/BasicOsgiBundleWithUrl.java | 101 ++++++ .../core/typereg/RegisteredTypeConstraints.java | 156 ++++++++++ .../core/typereg/RegisteredTypePredicates.java | 182 +++++++++++ .../brooklyn/core/typereg/RegisteredTypes.java | 245 +++++++++++++++ .../apache/brooklyn/util/core/osgi/Osgis.java | 2 +- .../core/catalog/internal/CatalogDtoTest.java | 6 +- .../core/catalog/internal/CatalogScanTest.java | 3 +- .../core/catalog/internal/CatalogTestUtils.java | 47 --- .../catalog/internal/CatalogVersioningTest.java | 2 +- .../mgmt/osgi/OsgiVersionMoreEntityTest.java | 89 +++--- .../mgmt/persist/XmlMementoSerializerTest.java | 6 +- .../rebind/ActivePartialRebindVersionTest.java | 22 +- .../core/mgmt/rebind/RebindCatalogItemTest.java | 6 +- .../core/mgmt/rebind/RebindTestFixture.java | 22 +- .../core/relations/RelationshipTest.java | 3 +- .../typereg/RegisteredTypePredicatesTest.java | 172 ++++++++++ .../BrooklynAssemblyTemplateInstantiator.java | 9 +- .../BrooklynComponentTemplateResolver.java | 24 +- .../BrooklynEntityDecorationResolver.java | 31 +- .../spi/creation/CampToSpecTransformer.java | 8 +- .../camp/brooklyn/spi/creation/CampUtils.java | 53 +++- .../lookup/AbstractTemplateBrooklynLookup.java | 14 +- .../lookup/AssemblyTemplateBrooklynLookup.java | 3 +- ...PlatformComponentTemplateBrooklynLookup.java | 3 +- .../brooklyn/JavaWebAppsIntegrationTest.java | 2 +- .../camp/brooklyn/PoliciesYamlTest.java | 14 +- .../camp/brooklyn/TestEntityWithInitConfig.java | 3 +- .../TestSensorAndEffectorInitializer.java | 1 - .../camp/brooklyn/WindowsYamlLiveTest.java | 4 +- .../CatalogOsgiVersionMoreEntityTest.java | 72 ++--- .../brooklyn/catalog/CatalogXmlOsgiTest.java | 20 +- .../brooklyn/catalog/CatalogYamlCombiTest.java | 16 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 41 ++- .../catalog/CatalogYamlLocationTest.java | 27 +- .../brooklyn/catalog/CatalogYamlPolicyTest.java | 8 +- .../brooklyn/catalog/CatalogYamlRebindTest.java | 37 +-- .../catalog/CatalogYamlTemplateTest.java | 44 +-- .../catalog/CatalogYamlVersioningTest.java | 58 ++-- .../brooklyn/test/lite/CampYamlLiteTest.java | 22 +- .../test/lite/TestAppAssemblyInstantiator.java | 1 - .../apache/brooklyn/rest/BrooklynWebConfig.java | 2 +- .../resources/AbstractBrooklynRestResource.java | 1 - .../rest/resources/ApplicationResource.java | 21 +- .../rest/resources/CatalogResource.java | 42 +-- .../rest/resources/EffectorResource.java | 19 +- .../rest/resources/EntityConfigResource.java | 17 +- .../brooklyn/rest/resources/EntityResource.java | 17 +- .../rest/resources/LocationResource.java | 4 +- .../rest/resources/PolicyConfigResource.java | 3 +- .../brooklyn/rest/resources/SensorResource.java | 22 +- .../brooklyn/rest/resources/ServerResource.java | 14 +- .../rest/transform/CatalogTransformer.java | 1 + .../rest/transform/EffectorTransformer.java | 3 +- .../rest/transform/EntityTransformer.java | 3 +- .../rest/transform/PolicyTransformer.java | 5 +- .../rest/util/BrooklynRestResourceUtils.java | 310 +++++++++++-------- .../brooklyn/rest/util/WebResourceUtils.java | 2 +- .../brooklyn/rest/domain/ApplicationTest.java | 3 +- .../rest/resources/ApplicationResourceTest.java | 11 +- .../rest/resources/CatalogResetTest.java | 7 +- .../rest/resources/CatalogResourceTest.java | 8 +- .../rest/resources/DescendantsTest.java | 15 +- .../rest/resources/ScriptResourceTest.java | 12 +- .../rest/resources/UsageResourceTest.java | 9 +- .../brooklynnode/DeployBlueprintTest.java | 3 +- .../rest/testing/mocks/CapitalizePolicy.java | 1 + .../util/BrooklynRestResourceUtilsTest.java | 4 - .../guava/IllegalStateExceptionSupplier.java | 24 +- 115 files changed, 2273 insertions(+), 1113 deletions(-) ----------------------------------------------------------------------
