You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sj...@apache.org on 2014/08/27 12:02:22 UTC
[5/6] git commit: This closes #124
This closes #124
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d3682450
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d3682450
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d3682450
Branch: refs/heads/master
Commit: d3682450cdaaf84ded25aec65d4b4d73b1168060
Parents: 5e25133 4811e81
Author: Sam Corbett <sa...@cloudsoftcorp.com>
Authored: Wed Aug 27 11:01:50 2014 +0100
Committer: Sam Corbett <sa...@cloudsoftcorp.com>
Committed: Wed Aug 27 11:01:50 2014 +0100
----------------------------------------------------------------------
.../catalog/internal/BasicBrooklynCatalog.java | 149 +++++++----
.../catalog/internal/CatalogItemBuilder.java | 90 +++++++
.../java/brooklyn/osgi/tests/SimplePolicy.java | 36 +++
.../osgi/brooklyn-test-osgi-entities.jar | Bin 10891 -> 14663 bytes
.../BrooklynEntityDecorationResolver.java | 22 +-
.../camp/brooklyn/CatalogYamlEntityTest.java | 254 +++++++++++++++++++
.../camp/brooklyn/CatalogYamlPolicyTest.java | 170 +++++++++++++
.../brooklyn/camp/brooklyn/CatalogYamlTest.java | 250 ------------------
.../src/main/webapp/assets/js/view/catalog.js | 13 +-
.../assets/tpl/catalog/details-entity.html | 2 +
.../rest/domain/CatalogPolicySummary.java | 3 +-
.../rest/transform/CatalogTransformer.java | 3 +-
.../src/main/java/brooklyn/util/yaml/Yamls.java | 17 +-
13 files changed, 702 insertions(+), 307 deletions(-)
----------------------------------------------------------------------