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/26 14:24:27 UTC
[3/3] incubator-brooklyn git commit: This closes #850
This closes #850
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b4547d95
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b4547d95
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b4547d95
Branch: refs/heads/master
Commit: b4547d95ca650498f4daf1f2e2a79c9bdaa8b1fd
Parents: 918c162 da70a8e
Author: Aled Sage <al...@gmail.com>
Authored: Wed Aug 26 13:25:01 2015 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Aug 26 13:25:01 2015 +0100
----------------------------------------------------------------------
.../brooklyn/api/catalog/CatalogItem.java | 9 +-
.../rebind/mementos/CatalogItemMemento.java | 1 +
.../brooklyn/camp/spi/resolve/PdpProcessor.java | 2 +-
.../core/catalog/CatalogPredicates.java | 197 ++++++++++++++-
.../catalog/internal/BasicBrooklynCatalog.java | 4 +-
.../catalog/internal/CatalogItemBuilder.java | 5 +
.../core/catalog/internal/CatalogItemDo.java | 10 +
.../internal/CatalogItemDtoAbstract.java | 11 +
.../core/location/CatalogLocationResolver.java | 6 +
.../rebind/BasicCatalogItemRebindSupport.java | 1 +
.../rebind/dto/BasicCatalogItemMemento.java | 17 +-
.../mgmt/rebind/dto/MementosGenerators.java | 3 +-
.../core/catalog/CatalogPredicatesTest.java | 176 +++++++++++++
.../catalog/internal/CatalogVersioningTest.java | 20 ++
.../core/mgmt/rebind/RebindOptions.java | 9 +
.../core/mgmt/rebind/RebindTestUtils.java | 8 +
.../BrooklynComponentTemplateResolver.java | 27 +-
.../camp/brooklyn/AbstractYamlRebindTest.java | 11 +-
.../brooklyn/catalog/CatalogYamlRebindTest.java | 249 +++++++++++++++++--
.../apache/brooklyn/rest/api/CatalogApi.java | 31 ++-
.../rest/resources/ApplicationResource.java | 19 +-
.../rest/resources/CatalogResource.java | 48 +++-
.../rest/resources/ApplicationResourceTest.java | 141 +++++++++--
.../rest/resources/CatalogResourceTest.java | 150 ++++++++---
24 files changed, 1038 insertions(+), 117 deletions(-)
----------------------------------------------------------------------