You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/08/18 15:25:57 UTC
[9/9] incubator-brooklyn git commit: This closes #837
This closes #837
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/23889db5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/23889db5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/23889db5
Branch: refs/heads/master
Commit: 23889db5cfc6a33c871699fd1ac4439d6c58fcde
Parents: f092e18 7d782f3
Author: Aled Sage <al...@gmail.com>
Authored: Tue Aug 18 14:26:06 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Aug 18 14:26:06 2015 +0100
----------------------------------------------------------------------
.../brooklyn/camp/AggregatingCampPlatform.java | 131 ---------
.../io/brooklyn/camp/BasicCampPlatform.java | 143 ----------
.../java/io/brooklyn/camp/CampPlatform.java | 76 ------
.../camp/commontypes/RepresentationSkew.java | 23 --
.../io/brooklyn/camp/spi/AbstractResource.java | 197 --------------
.../brooklyn/camp/spi/ApplicationComponent.java | 93 -------
.../camp/spi/ApplicationComponentTemplate.java | 54 ----
.../java/io/brooklyn/camp/spi/Assembly.java | 109 --------
.../io/brooklyn/camp/spi/AssemblyTemplate.java | 118 ---------
.../main/java/io/brooklyn/camp/spi/Link.java | 40 ---
.../io/brooklyn/camp/spi/PlatformComponent.java | 101 -------
.../camp/spi/PlatformComponentTemplate.java | 52 ----
.../brooklyn/camp/spi/PlatformRootSummary.java | 70 -----
.../brooklyn/camp/spi/PlatformTransaction.java | 46 ----
.../spi/collection/AbstractResourceLookup.java | 35 ---
.../collection/AggregatingResourceLookup.java | 56 ----
.../spi/collection/BasicResourceLookup.java | 71 -----
.../camp/spi/collection/ResolvableLink.java | 37 ---
.../camp/spi/collection/ResourceLookup.java | 47 ----
.../AssemblyTemplateInstantiator.java | 30 ---
.../BasicAssemblyTemplateInstantiator.java | 36 ---
.../java/io/brooklyn/camp/spi/pdp/Artifact.java | 99 -------
.../brooklyn/camp/spi/pdp/ArtifactContent.java | 65 -----
.../camp/spi/pdp/ArtifactRequirement.java | 72 -----
.../spi/pdp/AssemblyTemplateConstructor.java | 100 -------
.../brooklyn/camp/spi/pdp/DeploymentPlan.java | 150 -----------
.../java/io/brooklyn/camp/spi/pdp/Service.java | 94 -------
.../camp/spi/pdp/ServiceCharacteristic.java | 72 -----
.../brooklyn/camp/spi/resolve/PdpMatcher.java | 51 ----
.../brooklyn/camp/spi/resolve/PdpProcessor.java | 188 -------------
.../camp/spi/resolve/PlanInterpreter.java | 113 --------
.../interpret/PlanInterpretationContext.java | 152 -----------
.../interpret/PlanInterpretationNode.java | 263 -------------------
.../main/java/io/brooklyn/util/yaml/Yamls.java | 24 --
.../brooklyn/camp/AggregatingCampPlatform.java | 130 +++++++++
.../apache/brooklyn/camp/BasicCampPlatform.java | 142 ++++++++++
.../org/apache/brooklyn/camp/CampPlatform.java | 76 ++++++
.../camp/commontypes/RepresentationSkew.java | 23 ++
.../brooklyn/camp/spi/AbstractResource.java | 197 ++++++++++++++
.../brooklyn/camp/spi/ApplicationComponent.java | 93 +++++++
.../camp/spi/ApplicationComponentTemplate.java | 54 ++++
.../org/apache/brooklyn/camp/spi/Assembly.java | 109 ++++++++
.../brooklyn/camp/spi/AssemblyTemplate.java | 118 +++++++++
.../java/org/apache/brooklyn/camp/spi/Link.java | 40 +++
.../brooklyn/camp/spi/PlatformComponent.java | 101 +++++++
.../camp/spi/PlatformComponentTemplate.java | 52 ++++
.../brooklyn/camp/spi/PlatformRootSummary.java | 70 +++++
.../brooklyn/camp/spi/PlatformTransaction.java | 46 ++++
.../spi/collection/AbstractResourceLookup.java | 35 +++
.../collection/AggregatingResourceLookup.java | 56 ++++
.../spi/collection/BasicResourceLookup.java | 71 +++++
.../camp/spi/collection/ResolvableLink.java | 37 +++
.../camp/spi/collection/ResourceLookup.java | 47 ++++
.../AssemblyTemplateInstantiator.java | 30 +++
.../BasicAssemblyTemplateInstantiator.java | 36 +++
.../apache/brooklyn/camp/spi/pdp/Artifact.java | 99 +++++++
.../brooklyn/camp/spi/pdp/ArtifactContent.java | 65 +++++
.../camp/spi/pdp/ArtifactRequirement.java | 72 +++++
.../spi/pdp/AssemblyTemplateConstructor.java | 100 +++++++
.../brooklyn/camp/spi/pdp/DeploymentPlan.java | 150 +++++++++++
.../apache/brooklyn/camp/spi/pdp/Service.java | 94 +++++++
.../camp/spi/pdp/ServiceCharacteristic.java | 72 +++++
.../brooklyn/camp/spi/resolve/PdpMatcher.java | 51 ++++
.../brooklyn/camp/spi/resolve/PdpProcessor.java | 187 +++++++++++++
.../camp/spi/resolve/PlanInterpreter.java | 113 ++++++++
.../interpret/PlanInterpretationContext.java | 152 +++++++++++
.../interpret/PlanInterpretationNode.java | 262 ++++++++++++++++++
.../apache/brooklyn/camp/util/yaml/Yamls.java | 24 ++
.../pdp/DeploymentPlanToyInterpreterTest.java | 114 --------
.../io/brooklyn/camp/spi/pdp/PdpYamlTest.java | 78 ------
.../web/MockAssemblyTemplateInstantiator.java | 38 ---
.../camp/test/mock/web/MockWebPlatform.java | 131 ---------
.../test/platform/BasicCampPlatformTest.java | 87 ------
.../pdp/DeploymentPlanToyInterpreterTest.java | 113 ++++++++
.../brooklyn/camp/spi/pdp/PdpYamlTest.java | 80 ++++++
.../web/MockAssemblyTemplateInstantiator.java | 37 +++
.../camp/test/mock/web/MockWebPlatform.java | 132 ++++++++++
.../test/platform/BasicCampPlatformTest.java | 86 ++++++
.../camp/spi/pdp/pdp-single-artifact.yaml | 27 --
.../camp/spi/pdp/pdp-single-service.yaml | 29 --
.../pdp/yaml-sample-toy-interpreter-result.yaml | 22 --
.../spi/pdp/yaml-sample-toy-interpreter.yaml | 28 --
.../camp/spi/pdp/pdp-single-artifact.yaml | 27 ++
.../camp/spi/pdp/pdp-single-service.yaml | 29 ++
.../pdp/yaml-sample-toy-interpreter-result.yaml | 22 ++
.../spi/pdp/yaml-sample-toy-interpreter.yaml | 28 ++
.../io/brooklyn/camp/CampRestResources.java | 70 -----
.../main/java/io/brooklyn/camp/CampServer.java | 185 -------------
.../java/io/brooklyn/camp/dto/ApiErrorDto.java | 119 ---------
.../camp/dto/ApplicationComponentDto.java | 72 -----
.../dto/ApplicationComponentTemplateDto.java | 44 ----
.../java/io/brooklyn/camp/dto/AssemblyDto.java | 77 ------
.../brooklyn/camp/dto/AssemblyTemplateDto.java | 72 -----
.../main/java/io/brooklyn/camp/dto/DtoBase.java | 31 ---
.../brooklyn/camp/dto/DtoCustomAttributes.java | 66 -----
.../main/java/io/brooklyn/camp/dto/LinkDto.java | 72 -----
.../brooklyn/camp/dto/PlatformComponentDto.java | 82 ------
.../camp/dto/PlatformComponentTemplateDto.java | 44 ----
.../java/io/brooklyn/camp/dto/PlatformDto.java | 131 ---------
.../java/io/brooklyn/camp/dto/ResourceDto.java | 112 --------
.../rest/resource/AbstractCampRestResource.java | 56 ----
.../camp/rest/resource/ApidocRestResource.java | 31 ---
.../ApplicationComponentRestResource.java | 50 ----
...pplicationComponentTemplateRestResource.java | 50 ----
.../rest/resource/AssemblyRestResource.java | 52 ----
.../resource/AssemblyTemplateRestResource.java | 88 -------
.../resource/PlatformComponentRestResource.java | 50 ----
.../PlatformComponentTemplateRestResource.java | 50 ----
.../rest/resource/PlatformRestResource.java | 89 -------
.../io/brooklyn/camp/rest/util/CampJsons.java | 39 ---
.../camp/rest/util/CampRestContext.java | 50 ----
.../brooklyn/camp/rest/util/CampRestGuavas.java | 32 ---
.../io/brooklyn/camp/rest/util/DtoFactory.java | 176 -------------
.../camp/rest/util/WebResourceUtils.java | 60 -----
.../brooklyn/camp/server/dto/ApiErrorDto.java | 119 +++++++++
.../server/dto/ApplicationComponentDto.java | 72 +++++
.../dto/ApplicationComponentTemplateDto.java | 44 ++++
.../brooklyn/camp/server/dto/AssemblyDto.java | 77 ++++++
.../camp/server/dto/AssemblyTemplateDto.java | 72 +++++
.../brooklyn/camp/server/dto/DtoBase.java | 31 +++
.../camp/server/dto/DtoCustomAttributes.java | 66 +++++
.../brooklyn/camp/server/dto/LinkDto.java | 72 +++++
.../camp/server/dto/PlatformComponentDto.java | 82 ++++++
.../dto/PlatformComponentTemplateDto.java | 44 ++++
.../brooklyn/camp/server/dto/PlatformDto.java | 131 +++++++++
.../brooklyn/camp/server/dto/ResourceDto.java | 112 ++++++++
.../camp/server/rest/CampRestResources.java | 69 +++++
.../brooklyn/camp/server/rest/CampServer.java | 185 +++++++++++++
.../rest/resource/AbstractCampRestResource.java | 56 ++++
.../rest/resource/ApidocRestResource.java | 31 +++
.../ApplicationComponentRestResource.java | 49 ++++
...pplicationComponentTemplateRestResource.java | 49 ++++
.../rest/resource/AssemblyRestResource.java | 51 ++++
.../resource/AssemblyTemplateRestResource.java | 87 ++++++
.../resource/PlatformComponentRestResource.java | 49 ++++
.../PlatformComponentTemplateRestResource.java | 49 ++++
.../rest/resource/PlatformRestResource.java | 87 ++++++
.../camp/server/rest/util/CampJsons.java | 39 +++
.../camp/server/rest/util/CampRestContext.java | 50 ++++
.../camp/server/rest/util/CampRestGuavas.java | 32 +++
.../camp/server/rest/util/DtoFactory.java | 176 +++++++++++++
.../camp/server/rest/util/WebResourceUtils.java | 59 +++++
.../ApplicationCompomentTemplateDtoTest.java | 49 ----
.../java/io/brooklyn/camp/dto/BasicDtoTest.java | 90 -------
.../java/io/brooklyn/camp/dto/LinkDtoTest.java | 62 -----
.../dto/PlatformCompomentTemplateDtoTest.java | 49 ----
.../io/brooklyn/camp/dto/ResourceDtoTest.java | 77 ------
.../rest/resource/PlatformRestResourceTest.java | 42 ---
.../test/fixture/AbstractRestResourceTest.java | 86 ------
.../camp/test/fixture/InMemoryCamp.java | 53 ----
.../ApplicationCompomentTemplateDtoTest.java | 49 ++++
.../brooklyn/camp/server/dto/BasicDtoTest.java | 91 +++++++
.../brooklyn/camp/server/dto/LinkDtoTest.java | 63 +++++
.../dto/PlatformCompomentTemplateDtoTest.java | 49 ++++
.../camp/server/dto/ResourceDtoTest.java | 77 ++++++
.../rest/resource/PlatformRestResourceTest.java | 43 +++
.../test/fixture/AbstractRestResourceTest.java | 85 ++++++
.../camp/server/test/fixture/InMemoryCamp.java | 52 ++++
.../api/AssemblyTemplateSpecInstantiator.java | 7 +-
.../brooklyn/config/BrooklynServerConfig.java | 2 +-
.../catalog/internal/BasicBrooklynCatalog.java | 10 +-
.../internal/EntityManagementUtils.java | 9 +-
.../lite/CampPlatformWithJustBrooklynMgmt.java | 2 +-
.../brooklyn/camp/lite/CampYamlLiteTest.java | 9 +-
.../brooklyn/camp/lite/TestAppAssembly.java | 3 +-
.../camp/lite/TestAppAssemblyInstantiator.java | 15 +-
.../entity/rebind/RebindCatalogItemTest.java | 4 +-
.../camp/brooklyn/BrooklynCampConstants.java | 4 +-
.../camp/brooklyn/BrooklynCampPlatform.java | 7 +-
.../BrooklynCampPlatformLauncherAbstract.java | 3 +-
.../camp/brooklyn/YamlLauncherAbstract.java | 5 +-
.../BrooklynAssemblyTemplateInstantiator.java | 15 +-
.../BrooklynComponentTemplateResolver.java | 9 +-
.../spi/creation/BrooklynEntityMatcher.java | 11 +-
.../service/BrooklynServiceTypeResolver.java | 3 +-
.../service/CatalogServiceTypeResolver.java | 3 +-
.../service/ChefServiceTypeResolver.java | 3 +-
.../service/JavaServiceTypeResolver.java | 3 +-
.../spi/dsl/BrooklynDslDeferredSupplier.java | 7 +-
.../spi/dsl/BrooklynDslInterpreter.java | 9 +-
.../lookup/AbstractBrooklynResourceLookup.java | 7 +-
.../lookup/AbstractTemplateBrooklynLookup.java | 7 +-
.../spi/lookup/AssemblyBrooklynLookup.java | 7 +-
.../lookup/AssemblyTemplateBrooklynLookup.java | 7 +-
.../lookup/PlatformComponentBrooklynLookup.java | 9 +-
...PlatformComponentTemplateBrooklynLookup.java | 7 +-
.../platform/BrooklynImmutableCampPlatform.java | 25 +-
.../camp/brooklyn/AbstractYamlRebindTest.java | 5 +-
.../camp/brooklyn/AbstractYamlTest.java | 5 +-
...aWebAppWithDslYamlRebindIntegrationTest.java | 5 +-
.../brooklyn/JavaWebAppsIntegrationTest.java | 14 +-
.../camp/brooklyn/JavaWebAppsMatchingTest.java | 11 +-
.../brooklyn/ReloadBrooklynPropertiesTest.java | 7 +-
.../brooklyn/launcher/BrooklynLauncher.java | 6 +-
.../camp/BrooklynCampPlatformLauncher.java | 4 +-
.../resources/AbstractBrooklynRestResource.java | 3 +-
.../rest/resources/ApplicationResource.java | 3 +-
197 files changed, 6230 insertions(+), 6272 deletions(-)
----------------------------------------------------------------------