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/03/05 10:53:53 UTC
[2/2] incubator-brooklyn git commit: This closes #540
This closes #540
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1b0037b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1b0037b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1b0037b6
Branch: refs/heads/master
Commit: 1b0037b609b4ad11a803522e696d6bfcac00f57f
Parents: 1f3bff4 f0fe508
Author: Aled Sage <al...@gmail.com>
Authored: Thu Mar 5 09:53:37 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Thu Mar 5 09:53:37 2015 +0000
----------------------------------------------------------------------
.../java/brooklyn/catalog/BrooklynCatalog.java | 3 ++
.../main/java/brooklyn/catalog/CatalogItem.java | 6 +++
.../main/java/brooklyn/entity/EntityType.java | 1 -
.../brooklyn/mementos/CatalogItemMemento.java | 2 +
.../brooklyn/catalog/CatalogPredicates.java | 9 ++++
.../catalog/internal/BasicBrooklynCatalog.java | 10 +++++
.../catalog/internal/CatalogItemDo.java | 12 ++++-
.../internal/CatalogItemDtoAbstract.java | 11 +++++
.../rebind/BasicCatalogItemRebindSupport.java | 1 +
.../rebind/dto/BasicCatalogItemMemento.java | 17 ++++++-
.../entity/rebind/dto/MementosGenerators.java | 3 +-
.../entity/rebind/RebindCatalogItemTest.java | 20 ++++++++-
.../main/java/brooklyn/rest/api/CatalogApi.java | 7 +++
.../rest/domain/CatalogEntitySummary.java | 6 ++-
.../rest/domain/CatalogItemSummary.java | 12 ++++-
.../rest/domain/CatalogPolicySummary.java | 3 +-
.../rest/resources/CatalogResource.java | 21 ++++++++-
.../rest/transform/CatalogTransformer.java | 6 +--
.../rest/resources/CatalogResourceTest.java | 47 +++++++++++++++++++-
19 files changed, 180 insertions(+), 17 deletions(-)
----------------------------------------------------------------------