brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [45/45] git commit: This closes #46
Date Fri, 04 Jul 2014 09:51:27 GMT
This closes #46


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

Branch: refs/heads/master
Commit: 1a9732e785cbdb22950877073d73d84a00b64a3c
Parents: 437a776 0fc7107
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Fri Jul 4 10:48:53 2014 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Fri Jul 4 10:48:53 2014 +0100

----------------------------------------------------------------------
 .../java/brooklyn/catalog/BrooklynCatalog.java  |  67 +++--
 .../main/java/brooklyn/catalog/CatalogItem.java |  39 ++-
 .../brooklyn/entity/proxying/EntitySpec.java    |  23 +-
 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   | 118 +++++++++
 .../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     | 113 +++++++++
 .../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                                    |  18 ++
 .../api/AssemblyTemplateSpecInstantiator.java   |  12 +
 .../api/HasBrooklynManagementContext.java       |   9 +
 .../brooklyn/catalog/CatalogPredicates.java     |  51 ++--
 .../catalog/internal/BasicBrooklynCatalog.java  | 221 ++++++++++++-----
 .../catalog/internal/CatalogClasspathDo.java    |  65 +++--
 .../internal/CatalogConfigurationDto.java       |  13 +-
 .../brooklyn/catalog/internal/CatalogDo.java    |  53 ++--
 .../brooklyn/catalog/internal/CatalogDto.java   |  71 +++++-
 .../catalog/internal/CatalogDtoUtils.java       |  52 ----
 .../catalog/internal/CatalogEntityItemDto.java  |   9 +-
 .../catalog/internal/CatalogItemDo.java         |  82 ++++++-
 .../internal/CatalogItemDtoAbstract.java        |  71 +++---
 .../brooklyn/catalog/internal/CatalogItems.java |  56 +++++
 .../catalog/internal/CatalogLibrariesDo.java    |  56 +++++
 .../catalog/internal/CatalogLibrariesDto.java   |  64 +++++
 .../catalog/internal/CatalogPolicyItemDto.java  |   9 +-
 .../internal/CatalogTemplateItemDto.java        |  11 +-
 .../catalog/internal/CatalogXmlSerializer.java  |  14 +-
 .../brooklyn/config/BrooklynServerConfig.java   |  15 ++
 .../entity/basic/BrooklynConfigKeys.java        |   6 +-
 .../entity/proxying/InternalEntityFactory.java  |   7 +-
 .../dto/BasicManagementNodeSyncRecord.java      |  12 +-
 .../java/brooklyn/event/feed/ssh/SshFeed.java   |   2 +-
 .../brooklyn/management/ha/OsgiManager.java     | 105 ++++++++
 .../internal/AbstractManagementContext.java     |  10 +-
 .../internal/LocalManagementContext.java        |  18 ++
 .../internal/ManagementContextInternal.java     |   8 +
 .../NonDeploymentManagementContext.java         |   6 +
 .../src/main/java/brooklyn/util/osgi/Osgis.java | 157 ++++++++++++
 .../lite/CampPlatformWithJustBrooklynMgmt.java  |  23 ++
 .../brooklyn/camp/lite/CampYamlLiteTest.java    | 107 ++++++++
 .../brooklyn/camp/lite/TestAppAssembly.java     |  18 ++
 .../camp/lite/TestAppAssemblyInstantiator.java  |  67 +++++
 .../catalog/internal/CatalogDtoTest.java        |  69 +++---
 .../catalog/internal/CatalogLoadTest.java       |  46 ++++
 .../catalog/internal/CatalogScanTest.java       |  15 +-
 .../brooklyn/entity/basic/EntitySpecTest.java   |  16 ++
 .../management/osgi/OsgiStandaloneTest.java     | 120 +++++++++
 .../entity/LocalManagementContextForTests.java  |   9 +-
 .../camp/lite/test-app-service-blueprint.yaml   |  20 ++
 .../brooklyn/catalog/internal/osgi-catalog.xml  |  11 +
 .../osgi/brooklyn-osgi-test-a_0.1.0.jar         | Bin 0 -> 2055 bytes
 .../osgi/brooklyn-tests-osgi-entities-0.1.0.jar | Bin 0 -> 4810 bytes
 pom.xml                                         |   4 +
 usage/camp/pom.xml                              |   6 +-
 .../camp/brooklyn/BrooklynCampConstants.java    |   5 +-
 .../camp/brooklyn/BrooklynCampPlatform.java     |   2 +-
 .../BrooklynAssemblyTemplateInstantiator.java   | 167 ++++++++++---
 .../creation/BrooklynEntityClassResolver.java   |  69 +++++-
 .../spi/creation/BrooklynEntityMatcher.java     |  88 +++----
 .../spi/creation/BrooklynYamlTypeLoader.java    |  11 +-
 .../spi/dsl/BrooklynDslInterpreter.java         |   2 +-
 .../lookup/AbstractTemplateBrooklynLookup.java  |   7 +-
 .../lookup/AssemblyTemplateBrooklynLookup.java  |  18 +-
 ...PlatformComponentTemplateBrooklynLookup.java |   7 +-
 .../platform/BrooklynImmutableCampPlatform.java |   1 +
 .../platform/HasBrooklynManagementContext.java  |   9 -
 .../brooklyn/EmptySoftwareProcessYamlTest.java  |   5 +-
 .../io/brooklyn/camp/brooklyn/WrapAppTest.java  |  75 ++++++
 usage/cli/src/main/java/brooklyn/cli/Main.java  |   8 +-
 usage/launcher/pom.xml                          |   8 +-
 .../brooklyn/launcher/BrooklynLauncher.java     |   8 +-
 .../main/java/brooklyn/rest/api/CatalogApi.java |  14 +-
 .../rest/domain/CatalogEntitySummary.java       |   5 +-
 .../rest/domain/CatalogItemSummary.java         |  28 ++-
 .../rest/domain/CatalogPolicySummary.java       |   2 +-
 .../resources/AbstractBrooklynRestResource.java |   5 +-
 .../rest/resources/CatalogResource.java         |  37 ++-
 .../rest/transform/CatalogTransformer.java      |  26 +-
 .../rest/util/BrooklynRestResourceUtils.java    |   9 +-
 .../rest/util/DefaultExceptionMapper.java       |   2 +-
 .../rest/resources/CatalogResourceTest.java     |  48 ++--
 161 files changed, 7162 insertions(+), 509 deletions(-)
----------------------------------------------------------------------



Mime
View raw message