This closes #478
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0d078c9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0d078c9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0d078c9c Branch: refs/heads/master Commit: 0d078c9c97a4989923cf1063b6bd61484efb532f Parents: 92e9d0b d423522 Author: Alex Heneveld <[email protected]> Authored: Fri Feb 6 22:11:36 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Fri Feb 6 22:11:36 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/brooklyn/BrooklynVersion.java | 222 +++++++++++++++---- .../main/java/brooklyn/util/http/HttpTool.java | 5 + .../test/java/brooklyn/BrooklynVersionTest.java | 49 +++- .../main/java/brooklyn/cli/AbstractMain.java | 14 +- usage/cli/src/main/java/brooklyn/cli/Main.java | 26 ++- .../cli/src/test/java/brooklyn/cli/CliTest.java | 2 +- .../brooklyn/cli/CloudExplorerLiveTest.java | 11 +- .../brooklyn/launcher/BrooklynLauncher.java | 15 +- .../brooklyn/launcher/BrooklynWebServer.java | 13 +- .../brooklyn/launcher/WebAppRunnerTest.java | 4 +- .../java/brooklyn/rest/BrooklynWebConfig.java | 7 +- .../brooklyn/rest/resources/ServerResource.java | 15 ++ .../provider/ExplicitUsersSecurityProvider.java | 2 + .../main/java/brooklyn/test/HttpTestUtils.java | 4 +- 14 files changed, 328 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/0d078c9c/usage/rest-server/src/main/java/brooklyn/rest/resources/ServerResource.java ----------------------------------------------------------------------
