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 2014/07/04 11:51:08 UTC
[26/45] git commit: Merge remote-tracking branch
'ahgittin/camp-in-brooklyn' into osgi2
Merge remote-tracking branch 'ahgittin/camp-in-brooklyn' into osgi2
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c664f5eb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c664f5eb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c664f5eb
Branch: refs/heads/master
Commit: c664f5eb3fdbdef676312ca62398d0226d86b1a5
Parents: a391522 646e202
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jul 2 16:13:19 2014 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jul 2 16:13:19 2014 +0100
----------------------------------------------------------------------
camp/README.md | 17 ++
camp/camp-base/notes.txt | 64 +++++
camp/camp-base/pom.xml | 67 +++++
.../brooklyn/camp/AggregatingCampPlatform.java | 113 +++++++++
.../io/brooklyn/camp/BasicCampPlatform.java | 122 +++++++++
.../java/io/brooklyn/camp/CampPlatform.java | 58 +++++
.../camp/commontypes/RepresentationSkew.java | 5 +
.../io/brooklyn/camp/spi/AbstractResource.java | 176 +++++++++++++
.../brooklyn/camp/spi/ApplicationComponent.java | 78 ++++++
.../camp/spi/ApplicationComponentTemplate.java | 39 +++
.../java/io/brooklyn/camp/spi/Assembly.java | 94 +++++++
.../io/brooklyn/camp/spi/AssemblyTemplate.java | 102 ++++++++
.../main/java/io/brooklyn/camp/spi/Link.java | 22 ++
.../io/brooklyn/camp/spi/PlatformComponent.java | 86 +++++++
.../camp/spi/PlatformComponentTemplate.java | 37 +++
.../brooklyn/camp/spi/PlatformRootSummary.java | 55 +++++
.../brooklyn/camp/spi/PlatformTransaction.java | 28 +++
.../spi/collection/AbstractResourceLookup.java | 17 ++
.../collection/AggregatingResourceLookup.java | 38 +++
.../spi/collection/BasicResourceLookup.java | 53 ++++
.../camp/spi/collection/ResolvableLink.java | 19 ++
.../camp/spi/collection/ResourceLookup.java | 29 +++
.../AssemblyTemplateInstantiator.java | 12 +
.../BasicAssemblyTemplateInstantiator.java | 18 ++
.../java/io/brooklyn/camp/spi/pdp/Artifact.java | 82 +++++++
.../brooklyn/camp/spi/pdp/ArtifactContent.java | 47 ++++
.../camp/spi/pdp/ArtifactRequirement.java | 55 +++++
.../spi/pdp/AssemblyTemplateConstructor.java | 76 ++++++
.../brooklyn/camp/spi/pdp/DeploymentPlan.java | 93 +++++++
.../java/io/brooklyn/camp/spi/pdp/Service.java | 77 ++++++
.../camp/spi/pdp/ServiceCharacteristic.java | 55 +++++
.../brooklyn/camp/spi/resolve/PdpMatcher.java | 33 +++
.../brooklyn/camp/spi/resolve/PdpProcessor.java | 154 ++++++++++++
.../camp/spi/resolve/PlanInterpreter.java | 95 +++++++
.../interpret/PlanInterpretationContext.java | 134 ++++++++++
.../interpret/PlanInterpretationNode.java | 245 +++++++++++++++++++
.../main/java/io/brooklyn/util/yaml/Yamls.java | 89 +++++++
.../src/main/resources/logback-custom.xml | 9 +
.../pdp/DeploymentPlanToyInterpreterTest.java | 96 ++++++++
.../io/brooklyn/camp/spi/pdp/PdpYamlTest.java | 60 +++++
.../web/MockAssemblyTemplateInstantiator.java | 20 ++
.../camp/test/mock/web/MockWebPlatform.java | 104 ++++++++
.../test/platform/BasicCampPlatformTest.java | 69 ++++++
.../camp/spi/pdp/pdp-single-artifact.yaml | 9 +
.../camp/spi/pdp/pdp-single-service.yaml | 11 +
.../pdp/yaml-sample-toy-interpreter-result.yaml | 4 +
.../spi/pdp/yaml-sample-toy-interpreter.yaml | 10 +
camp/camp-server/pom.xml | 115 +++++++++
.../io/brooklyn/camp/CampRestResources.java | 52 ++++
.../main/java/io/brooklyn/camp/CampServer.java | 167 +++++++++++++
.../java/io/brooklyn/camp/dto/ApiErrorDto.java | 101 ++++++++
.../camp/dto/ApplicationComponentDto.java | 54 ++++
.../dto/ApplicationComponentTemplateDto.java | 26 ++
.../java/io/brooklyn/camp/dto/AssemblyDto.java | 59 +++++
.../brooklyn/camp/dto/AssemblyTemplateDto.java | 54 ++++
.../main/java/io/brooklyn/camp/dto/DtoBase.java | 13 +
.../brooklyn/camp/dto/DtoCustomAttributes.java | 48 ++++
.../main/java/io/brooklyn/camp/dto/LinkDto.java | 54 ++++
.../brooklyn/camp/dto/PlatformComponentDto.java | 64 +++++
.../camp/dto/PlatformComponentTemplateDto.java | 26 ++
.../java/io/brooklyn/camp/dto/PlatformDto.java | 113 +++++++++
.../java/io/brooklyn/camp/dto/ResourceDto.java | 94 +++++++
.../rest/resource/AbstractCampRestResource.java | 38 +++
.../camp/rest/resource/ApidocRestResource.java | 13 +
.../ApplicationComponentRestResource.java | 32 +++
...pplicationComponentTemplateRestResource.java | 32 +++
.../rest/resource/AssemblyRestResource.java | 34 +++
.../resource/AssemblyTemplateRestResource.java | 70 ++++++
.../resource/PlatformComponentRestResource.java | 32 +++
.../PlatformComponentTemplateRestResource.java | 32 +++
.../rest/resource/PlatformRestResource.java | 71 ++++++
.../io/brooklyn/camp/rest/util/CampJsons.java | 21 ++
.../camp/rest/util/CampRestContext.java | 32 +++
.../brooklyn/camp/rest/util/CampRestGuavas.java | 14 ++
.../io/brooklyn/camp/rest/util/DtoFactory.java | 158 ++++++++++++
.../camp/rest/util/WebResourceUtils.java | 42 ++++
.../ApplicationCompomentTemplateDtoTest.java | 31 +++
.../java/io/brooklyn/camp/dto/BasicDtoTest.java | 72 ++++++
.../java/io/brooklyn/camp/dto/LinkDtoTest.java | 44 ++++
.../dto/PlatformCompomentTemplateDtoTest.java | 31 +++
.../io/brooklyn/camp/dto/ResourceDtoTest.java | 59 +++++
.../rest/resource/PlatformRestResourceTest.java | 24 ++
.../test/fixture/AbstractRestResourceTest.java | 68 +++++
.../camp/test/fixture/InMemoryCamp.java | 35 +++
camp/pom.xml | 27 ++
core/pom.xml | 12 +
.../brooklyn/camp/lite/CampYamlLiteTest.java | 75 ++++++
.../brooklyn/camp/lite/TestAppAssembly.java | 18 ++
.../camp/lite/TestAppAssemblyInstantiator.java | 43 ++++
.../camp/lite/test-app-service-blueprint.yaml | 11 +
pom.xml | 3 +
usage/camp/pom.xml | 6 +-
usage/launcher/pom.xml | 8 +-
93 files changed, 5193 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c664f5eb/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c664f5eb/pom.xml
----------------------------------------------------------------------