You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/08/19 16:35:36 UTC

[4/4] incubator-brooklyn git commit: This closes #846

This closes #846


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/fb6a4a1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/fb6a4a1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/fb6a4a1d

Branch: refs/heads/master
Commit: fb6a4a1d064dbf5d9d1adccbd898bf0e291eb58c
Parents: 0f6041e a47d5aa
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Aug 19 15:35:06 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Aug 19 15:35:06 2015 +0100

----------------------------------------------------------------------
 core/pom.xml                                    |  16 +-
 .../api/AssemblyTemplateSpecInstantiator.java   |  35 ---
 .../catalog/internal/BasicBrooklynCatalog.java  | 243 +++---------------
 .../core/mgmt/EntityManagementUtils.java        | 201 ++++++---------
 .../core/plan/PlanNotRecognizedException.java   |  37 +++
 .../brooklyn/core/plan/PlanToSpecFactory.java   |  46 ++++
 .../core/plan/PlanToSpecTransformer.java        |  49 ++++
 .../core/server/BrooklynServerConfig.java       |  14 -
 .../core/mgmt/rebind/RebindCatalogItemTest.java |  93 ++++---
 ...talogWhenCatalogPersistenceDisabledTest.java |   8 +-
 .../lite/CampPlatformWithJustBrooklynMgmt.java  |  41 ---
 .../camp/brooklyn/lite/CampYamlLiteTest.java    | 255 -------------------
 .../camp/brooklyn/lite/TestAppAssembly.java     |  36 ---
 .../lite/TestAppAssemblyInstantiator.java       |  90 -------
 .../lite/test-app-service-blueprint.yaml        |  38 ---
 usage/camp/pom.xml                              |  12 +
 .../camp/brooklyn/BrooklynCampConstants.java    |   3 +-
 .../api/AssemblyTemplateSpecInstantiator.java   |  35 +++
 .../BrooklynAssemblyTemplateInstantiator.java   |  51 ++--
 .../BrooklynComponentTemplateResolver.java      |  12 +-
 .../brooklyn/spi/creation/CampCatalogUtils.java | 244 ++++++++++++++++++
 .../spi/creation/CampToSpecTransformer.java     |  92 +++++++
 ...che.brooklyn.core.plan.PlanToSpecTransformer |  19 ++
 .../brooklyn/catalog/CatalogYamlCombiTest.java  |   7 +-
 .../lite/CampPlatformWithJustBrooklynMgmt.java  |  41 +++
 .../brooklyn/test/lite/CampYamlLiteTest.java    | 254 ++++++++++++++++++
 .../brooklyn/test/lite/TestAppAssembly.java     |  36 +++
 .../test/lite/TestAppAssemblyInstantiator.java  |  90 +++++++
 .../test/lite/test-app-service-blueprint.yaml   |  38 +++
 .../brooklyn/launcher/BrooklynLauncher.java     |  46 +---
 .../resources/AbstractBrooklynRestResource.java |   4 -
 .../rest/resources/ApplicationResource.java     |  83 +++---
 32 files changed, 1265 insertions(+), 1004 deletions(-)
----------------------------------------------------------------------