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 2014/07/11 06:14:17 UTC
[10/10] git commit: This closes #51
This closes #51
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/342a3367
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/342a3367
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/342a3367
Branch: refs/heads/master
Commit: 342a33679f710d404c0cf288e8623d4b12f01e03
Parents: d767d78 e70b3ff
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Fri Jul 11 00:13:41 2014 -0400
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jul 11 00:13:41 2014 -0400
----------------------------------------------------------------------
usage/jsgui/src/main/webapp/assets/css/base.css | 4 +
usage/jsgui/src/main/webapp/assets/js/router.js | 1 -
.../assets/js/view/catalog-details-location.js | 55 ---
.../src/main/webapp/assets/js/view/catalog.js | 422 ++++++++++++-------
.../assets/tpl/catalog/add-location-modal.html | 1 -
.../assets/tpl/catalog/details-entity.html | 156 +++++++
.../assets/tpl/catalog/details-generic.html | 3 +-
.../assets/tpl/catalog/details-location.html | 30 +-
.../assets/tpl/catalog/location-config.html | 3 +-
.../webapp/assets/tpl/catalog/nav-entry.html | 4 +-
.../main/webapp/assets/tpl/catalog/page.html | 74 +---
.../javascript/specs/brooklyn-utils-spec.js | 2 +-
.../main/java/brooklyn/rest/api/CatalogApi.java | 10 +
.../brooklyn/rest/domain/ApplicationSpec.java | 3 +-
.../rest/domain/ApplicationSummary.java | 3 +-
.../rest/domain/CatalogItemSummary.java | 4 +-
.../brooklyn/rest/domain/ConfigSummary.java | 3 +-
.../brooklyn/rest/domain/EffectorSummary.java | 6 +-
.../java/brooklyn/rest/domain/EntitySpec.java | 3 +-
.../brooklyn/rest/domain/EntitySummary.java | 4 +-
.../main/java/brooklyn/rest/domain/HasId.java | 26 ++
.../main/java/brooklyn/rest/domain/HasName.java | 26 ++
.../java/brooklyn/rest/domain/LocationSpec.java | 3 +-
.../brooklyn/rest/domain/LocationSummary.java | 3 +-
.../brooklyn/rest/domain/PolicySummary.java | 4 +-
.../brooklyn/rest/domain/SensorSummary.java | 3 +-
.../rest/domain/SummaryComparators.java | 48 +++
.../java/brooklyn/rest/domain/TaskSummary.java | 3 +-
.../brooklyn/rest/domain/UsageStatistic.java | 3 +-
.../rest/resources/CatalogResource.java | 37 +-
.../rest/resources/EffectorResource.java | 8 +-
.../rest/resources/LocationResource.java | 65 +--
.../brooklyn/rest/resources/PolicyResource.java | 8 +-
33 files changed, 662 insertions(+), 366 deletions(-)
----------------------------------------------------------------------