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/04/14 15:17:50 UTC

[2/2] incubator-brooklyn git commit: This closes #593

This closes #593


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

Branch: refs/heads/master
Commit: 4f6fa6ca9199431a328704adf3d22f31cf0c28d8
Parents: 861b86a f114676
Author: Aled Sage <al...@gmail.com>
Authored: Tue Apr 14 08:17:27 2015 -0500
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Apr 14 08:17:27 2015 -0500

----------------------------------------------------------------------
 .../entity/rebind/RebindCatalogItemTest.java    |  13 +-
 .../entity/rebind/RebindTestFixture.java        |   6 +
 .../main/java/brooklyn/rest/api/CatalogApi.java |  81 ++++++++++--
 .../java/brooklyn/rest/api/LocationApi.java     |  24 +++-
 .../rest/domain/CatalogLocationSummary.java     |  59 +++++++++
 .../rest/domain/LocationConfigSummary.java      |  62 +++++++++
 .../rest/resources/CatalogResource.java         | 126 +++++++++++++++++--
 .../rest/resources/LocationResource.java        |   4 +-
 .../rest/transform/CatalogTransformer.java      |  12 ++
 .../rest/resources/ApiDocResourceTest.java      |   2 +-
 .../rest/resources/CatalogResourceTest.java     |  55 +++++++-
 .../rest/resources/LocationResourceTest.java    |  98 +++++++++++----
 12 files changed, 489 insertions(+), 53 deletions(-)
----------------------------------------------------------------------