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 2014/07/09 23:47:03 UTC
[50/50] git commit: This closes #60
This closes #60
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d767d781
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d767d781
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d767d781
Branch: refs/heads/master
Commit: d767d781f3d3b8e6b6e2defc24b5a50d56042215
Parents: c008f29 6d01486
Author: Aled Sage <al...@gmail.com>
Authored: Wed Jul 9 22:45:37 2014 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Jul 9 22:45:37 2014 +0100
----------------------------------------------------------------------
.../java/brooklyn/catalog/BrooklynCatalog.java | 5 +
.../main/java/brooklyn/catalog/CatalogItem.java | 4 +
.../BrooklynClassLoadingContext.java | 26 ++
.../brooklyn/camp/spi/pdp/DeploymentPlan.java | 10 +-
.../catalog/internal/BasicBrooklynCatalog.java | 132 ++++--
.../brooklyn/catalog/internal/CatalogDo.java | 24 +-
.../brooklyn/catalog/internal/CatalogDto.java | 62 ++-
.../catalog/internal/CatalogItemDo.java | 53 +--
.../internal/CatalogItemDtoAbstract.java | 21 +
.../entity/proxying/InternalEntityFactory.java | 173 ++++---
.../AbstractBrooklynClassLoadingContext.java | 62 +++
.../BrooklynClassLoadingContextSequential.java | 98 ++++
.../JavaBrooklynClassLoadingContext.java | 60 +++
.../OsgiBrooklynClassLoadingContext.java | 76 ++++
.../brooklyn/management/ha/OsgiManager.java | 29 +-
.../internal/AbstractManagementContext.java | 15 +-
.../main/java/brooklyn/util/ResourceUtils.java | 55 ++-
.../java/brooklyn/util/flags/TypeCoercions.java | 28 +-
.../src/main/java/brooklyn/util/osgi/Osgis.java | 119 +++++
.../src/test/dependencies/osgi/entities/pom.xml | 62 +++
.../brooklyn/osgi/tests/SimpleApplication.java | 10 +
.../osgi/tests/SimpleApplicationImpl.java | 9 +
.../java/brooklyn/osgi/tests/SimpleEntity.java | 10 +
.../brooklyn/osgi/tests/SimpleEntityImpl.java | 8 +
.../main/resources/brooklyn/osgi/tests/icon.gif | Bin 0 -> 43 bytes
.../brooklyn/camp/lite/CampYamlLiteTest.java | 82 +++-
.../brooklyn/entity/basic/EntitySpecTest.java | 2 +-
.../management/osgi/OsgiStandaloneTest.java | 53 ++-
.../util/internal/TypeCoercionsTest.java | 37 +-
.../camp/lite/test-app-service-blueprint.yaml | 2 +-
core/src/test/resources/brooklyn/osgi/README.md | 1 +
.../osgi/brooklyn-test-osgi-entities.jar | Bin 0 -> 10891 bytes
.../osgi/brooklyn-tests-osgi-entities-0.1.0.jar | Bin 4810 -> 0 bytes
.../ControlledDynamicWebAppClusterTest.java | 17 +-
.../BrooklynAssemblyTemplateInstantiator.java | 445 +++++++++----------
.../BrooklynComponentTemplateResolver.java | 148 +++---
.../creation/BrooklynEntityClassResolver.java | 141 ------
.../BrooklynEntityDecorationResolver.java | 20 +-
.../spi/creation/BrooklynEntityMatcher.java | 23 +-
.../creation/BrooklynYamlTypeInstantiator.java | 200 +++++++++
.../spi/creation/BrooklynYamlTypeLoader.java | 210 ---------
.../creation/ChefComponentTemplateResolver.java | 15 +-
.../BrooklynYamlTypeInstantiatorTest.java | 76 ++++
.../brooklyn/BrooklynYamlTypeLoaderTest.java | 70 ---
usage/cli/src/main/java/brooklyn/cli/Main.java | 3 +-
.../main/java/brooklyn/rest/api/CatalogApi.java | 19 +
.../rest/resources/CatalogResource.java | 19 +-
.../rest/resources/ApiDocResourceTest.java | 2 +-
.../rest/resources/ApplicationResourceTest.java | 30 ++
.../resources/CatalogBundleResourceTest.java | 178 ++++++++
.../rest/resources/CatalogResourceTest.java | 81 +++-
.../brooklyn/util/collections/MutableMap.java | 7 +
.../brooklyn/util/text/StringPredicates.java | 26 +-
53 files changed, 2120 insertions(+), 938 deletions(-)
----------------------------------------------------------------------