This closes #75
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/935236ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/935236ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/935236ec Branch: refs/heads/master Commit: 935236ec8ecd0f089e077b62d3abe86fd01ac467 Parents: bf71719 8319558 Author: Aled Sage <aled.s...@gmail.com> Authored: Fri Jul 18 13:38:07 2014 +0100 Committer: Aled Sage <aled.s...@gmail.com> Committed: Fri Jul 18 13:38:07 2014 +0100 ---------------------------------------------------------------------- .../catalog/internal/CatalogLibrariesDo.java | 3 +- .../location/basic/LocationConfigUtils.java | 2 - .../location/geo/LocalhostExternalIpLoader.java | 3 +- .../brooklyn/entity/nosql/redis/RedisStore.java | 2 - .../entity/nosql/redis/RedisStoreImpl.java | 2 +- .../camp/brooklyn/AbstractYamlTest.java | 4 +- .../camp/brooklyn/DslAndRebindYamlTest.java | 4 +- ...aWebAppWithDslYamlRebindIntegrationTest.java | 4 +- .../webapp/assets/js/libs/brooklyn-utils.js | 14 +++- .../javascript/specs/brooklyn-utils-spec.js | 15 ++++ .../java/brooklyn/rest/api/EffectorApi.java | 5 +- .../java/brooklyn/rest/api/LocationApi.java | 5 -- .../ApplicationResourceIntegrationTest.java | 2 +- .../rest-client/src/test/webapp/WEB-INF/web.xml | 1 + .../java/brooklyn/rest/BrooklynRestApi.java | 2 + .../rest/resources/CatalogResource.java | 31 ++++++-- .../rest/resources/EffectorResource.java | 2 +- .../rest/resources/LocationResource.java | 6 +- .../rest/transform/CatalogTransformer.java | 18 +++-- .../rest/transform/LocationTransformer.java | 10 ++- .../rest/util/BrooklynRestResourceUtils.java | 4 +- .../brooklyn/rest/util/FormMapProvider.java | 82 ++++++++++++++++++++ .../brooklyn/rest/util/WebResourceUtils.java | 12 +++ .../rest-server/src/main/webapp/WEB-INF/web.xml | 1 + .../rest/resources/ApplicationResourceTest.java | 18 +++++ .../rest/testing/BrooklynRestApiTest.java | 2 + 26 files changed, 207 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/935236ec/usage/camp/src/test/java/io/brooklyn/camp/brooklyn/AbstractYamlTest.java ----------------------------------------------------------------------
