This closes #955
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d53bd189 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d53bd189 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d53bd189 Branch: refs/heads/master Commit: d53bd189cf5db6a722e49fb60e4a3bf8f283b3da Parents: b0cadef 87e3395 Author: Sam Corbett <[email protected]> Authored: Thu Oct 15 15:01:57 2015 +0100 Committer: Sam Corbett <[email protected]> Committed: Thu Oct 15 15:01:57 2015 +0100 ---------------------------------------------------------------------- .../catalog/internal/BasicBrooklynCatalog.java | 28 +- .../internal/JavaCatalogToSpecTransformer.java | 98 +++++++ .../core/mgmt/EntityManagementUtils.java | 13 +- .../brooklyn/core/plan/PlanToSpecFactory.java | 2 +- .../core/plan/PlanToSpecTransformer.java | 10 +- .../brooklyn/core/resolve/ResolveUtils.java | 87 ++++++ .../entity/AbstractEntitySpecResolver.java | 65 +++++ .../entity/CatalogEntitySpecResolver.java | 99 +++++++ .../entity/DelegatingEntitySpecResolver.java | 127 ++++++++ .../core/resolve/entity/EntitySpecResolver.java | 67 +++++ .../resolve/entity/JavaEntitySpecResolver.java | 91 ++++++ ...che.brooklyn.core.plan.PlanToSpecTransformer | 19 ++ ...oklyn.core.resolve.entity.EntitySpecResolver | 20 ++ .../core/plan/XmlPlanToSpecTransformer.java | 3 +- .../entity/resolve/ChefEntitySpecResolver.java | 42 +++ .../HardcodedCatalogEntitySpecResolver.java | 96 ++++++ ...oklyn.core.resolve.entity.EntitySpecResolver | 20 ++ usage/camp/pom.xml | 5 - .../camp/brooklyn/BrooklynCampConstants.java | 2 +- .../api/AssemblyTemplateSpecInstantiator.java | 13 +- .../BrooklynAssemblyTemplateInstantiator.java | 173 ++--------- .../BrooklynComponentTemplateResolver.java | 289 +++++-------------- .../spi/creation/BrooklynEntityMatcher.java | 15 +- .../brooklyn/spi/creation/CampCatalogUtils.java | 204 ++----------- .../spi/creation/CampToSpecTransformer.java | 41 +-- .../camp/brooklyn/spi/creation/CampUtils.java | 161 +++++++++++ .../service/BrooklynServiceTypeResolver.java | 12 +- .../service/CampServiceSpecResolver.java | 47 +++ .../service/CatalogServiceTypeResolver.java | 77 ----- .../service/ChefServiceTypeResolver.java | 61 ---- .../service/JavaServiceTypeResolver.java | 38 --- .../creation/service/ServiceTypeResolver.java | 4 + .../service/ServiceTypeResolverAdaptor.java | 70 +++++ .../service/UrlServiceSpecResolver.java | 72 +++++ ...lyn.spi.creation.service.ServiceTypeResolver | 22 -- .../camp/brooklyn/AbstractYamlTest.java | 8 +- .../brooklyn/catalog/CatalogXmlOsgiTest.java | 16 +- .../brooklyn/catalog/CatalogYamlEntityTest.java | 110 ++++++- .../service/ServiceTypeResolverTest.java | 39 +++ .../service/TestServiceTypeResolver.java | 54 ++++ .../test/lite/TestAppAssemblyInstantiator.java | 12 +- ...lyn.spi.creation.service.ServiceTypeResolver | 19 ++ .../rest/resources/ApplicationResource.java | 4 +- .../rest/util/BrooklynRestResourceUtils.java | 2 + 44 files changed, 1617 insertions(+), 840 deletions(-) ----------------------------------------------------------------------
