This closes #997
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b39daf20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b39daf20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b39daf20 Branch: refs/heads/master Commit: b39daf20506953cb1cf98c6b9185e1af22a37d77 Parents: 6c4b517 598f9ac Author: Hadrian Zbarcea <[email protected]> Authored: Mon Nov 9 20:51:30 2015 -0500 Committer: Hadrian Zbarcea <[email protected]> Committed: Mon Nov 9 20:51:30 2015 -0500 ---------------------------------------------------------------------- camp/camp-server/pom.xml | 4 +-- .../brooklyn/camp/server/rest/CampServer.java | 20 ++++++++---- .../apache/brooklyn/core/test/HttpService.java | 20 +++++++++--- parent/pom.xml | 6 ++-- pom.xml | 4 +-- .../jsgui/BrooklynJavascriptGuiLauncher.java | 3 +- .../BrooklynJavascriptGuiLauncherTest.java | 3 +- usage/launcher/pom.xml | 4 +-- .../brooklyn/launcher/BrooklynWebServer.java | 34 +++++++++++++------- .../launcher/BrooklynWebServerTest.java | 21 +++++++++--- usage/rest-api/pom.xml | 4 +-- .../ApplicationResourceIntegrationTest.java | 3 +- .../rest/client/BrooklynApiRestClientTest.java | 3 +- .../brooklyn/rest/BrooklynRestApiLauncher.java | 3 +- .../rest/BrooklynRestApiLauncherTest.java | 3 +- .../BrooklynRestApiLauncherTestFixture.java | 3 +- .../json/BrooklynJacksonSerializerTest.java | 5 +-- 17 files changed, 96 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b39daf20/parent/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b39daf20/pom.xml ----------------------------------------------------------------------
