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/04/21 22:41:35 UTC
[16/16] incubator-brooklyn git commit: This closes #585
This closes #585
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/c4ca5b68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/c4ca5b68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/c4ca5b68
Branch: refs/heads/master
Commit: c4ca5b6833530a9b0ed2e7bbc3cc18998f46dfeb
Parents: 2cfd875 f6c5619
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Apr 21 21:40:01 2015 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Apr 21 21:40:01 2015 +0100
----------------------------------------------------------------------
.../java/brooklyn/catalog/BrooklynCatalog.java | 22 +
.../main/java/brooklyn/catalog/CatalogItem.java | 3 +-
.../java/brooklyn/location/LocationSpec.java | 9 +-
.../io/brooklyn/camp/BasicCampPlatform.java | 7 +-
.../brooklyn/catalog/CatalogPredicates.java | 12 +-
.../catalog/internal/BasicBrooklynCatalog.java | 586 ++++++++++++++-----
.../catalog/internal/CatalogItemBuilder.java | 5 +
.../brooklyn/catalog/internal/CatalogUtils.java | 24 +-
.../location/basic/BasicLocationRegistry.java | 2 +-
.../location/basic/CatalogLocationResolver.java | 3 +-
.../location/geo/UtraceHostGeoLookup.java | 4 +-
.../internal/EntityManagementUtils.java | 18 +-
.../policy/basic/AbstractEntityAdjunct.java | 22 +-
.../java/brooklyn/util/task/ValueResolver.java | 7 +-
.../brooklyn/camp/lite/CampYamlLiteTest.java | 6 +-
.../catalog/internal/CatalogLoadTest.java | 4 +-
.../catalog/internal/CatalogVersioningTest.java | 23 +
.../entity/rebind/RebindCatalogItemTest.java | 10 +-
docs/_config.yml | 1 +
docs/guide/misc/release-notes.md | 4 +
docs/guide/ops/catalog/index.md | 347 +++++++----
.../java/brooklyn/entity/nosql/riak/riak.png | Bin 0 -> 110651 bytes
.../BrooklynAssemblyTemplateInstantiator.java | 63 +-
.../BrooklynComponentTemplateResolver.java | 58 +-
.../creation/BrooklynYamlTypeInstantiator.java | 3 +-
.../camp/brooklyn/AbstractYamlTest.java | 12 +-
.../CatalogOsgiVersionMoreEntityTest.java | 11 +-
.../brooklyn/catalog/CatalogYamlCombiTest.java | 145 +++++
.../brooklyn/catalog/CatalogYamlEntityTest.java | 241 +++++++-
.../catalog/CatalogYamlLocationTest.java | 124 +++-
.../brooklyn/catalog/CatalogYamlPolicyTest.java | 73 ++-
.../catalog/CatalogYamlTemplateTest.java | 96 +++
.../catalog/CatalogYamlVersioningTest.java | 56 +-
.../src/main/webapp/assets/js/view/catalog.js | 57 +-
.../create-step-template-entry.html | 8 +-
.../assets/tpl/catalog/add-catalog-entry.html | 4 +-
.../webapp/assets/tpl/catalog/add-entity.html | 30 -
.../webapp/assets/tpl/catalog/add-yaml.html | 30 +
.../src/test/resources/couchbase-w-loadgen.yaml | 2 +-
.../main/java/brooklyn/rest/api/CatalogApi.java | 19 +-
.../java/brooklyn/rest/api/LocationApi.java | 5 +-
.../rest/domain/CatalogEntitySummary.java | 6 +
.../rest/domain/CatalogItemSummary.java | 3 +
.../rest/domain/CatalogPolicySummary.java | 3 +
.../rest/resources/CatalogResource.java | 66 +--
.../rest/resources/LocationResource.java | 4 +-
.../rest/transform/CatalogTransformer.java | 44 +-
.../rest/resources/CatalogResourceTest.java | 67 ++-
.../brooklyn/util/exceptions/Exceptions.java | 2 +-
.../src/main/java/brooklyn/util/yaml/Yamls.java | 383 +++++++++++-
.../test/java/brooklyn/util/yaml/YamlsTest.java | 127 ++++
51 files changed, 2326 insertions(+), 535 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/c4ca5b68/core/src/main/java/brooklyn/util/task/ValueResolver.java
----------------------------------------------------------------------