This closes #614
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/d6480820 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/d6480820 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/d6480820 Branch: refs/heads/master Commit: d648082060ecb9dd3ab8d3bba54f1fef241c1807 Parents: d0cbcf3 7556c58 Author: Alex Heneveld <[email protected]> Authored: Thu May 7 11:57:04 2015 +0100 Committer: Alex Heneveld <[email protected]> Committed: Thu May 7 11:57:04 2015 +0100 ---------------------------------------------------------------------- .../brooklyn/entity/rebind/RebindManager.java | 5 + .../brooklyn/management/ManagementContext.java | 17 +- .../entity/rebind/RebindManagerImpl.java | 11 + .../ha/HighAvailabilityManagerImpl.java | 5 +- .../internal/AbstractManagementContext.java | 17 +- .../internal/LocalManagementContext.java | 4 + .../internal/ManagementContextInternal.java | 9 + .../NonDeploymentManagementContext.java | 20 +- .../policy/followthesun/FollowTheSunPolicy.java | 8 +- .../loadbalancing/LoadBalancingPolicy.java | 16 +- .../entity/brooklynnode/BrooklynNodeImpl.java | 4 + .../BrooklynNodeIntegrationTest.java | 23 +- usage/cli/src/main/java/brooklyn/cli/Main.java | 68 ++++-- usage/jsgui/src/main/webapp/assets/js/config.js | 10 +- .../jsgui/src/main/webapp/assets/js/model/ha.js | 62 ------ .../assets/js/model/server-extended-status.js | 102 +++++++++ usage/jsgui/src/main/webapp/assets/js/router.js | 217 ++++++++++--------- .../main/webapp/assets/js/view/ha-summary.js | 17 +- .../src/main/webapp/assets/js/view/home.js | 4 +- .../src/main/webapp/assets/tpl/help/page.html | 5 +- .../webapp/assets/tpl/home/server-caution.html | 106 +++++++++ .../assets/tpl/home/server-not-ha-master.html | 35 --- usage/jsgui/src/main/webapp/index.html | 2 +- .../src/test/javascript/specs/model/ha-spec.js | 41 ---- .../src/test/javascript/specs/router-spec.js | 3 - .../brooklyn/launcher/BrooklynLauncher.java | 63 ++++-- .../BrooklynLauncherHighAvailabilityTest.java | 2 + .../brooklyn/launcher/BrooklynLauncherTest.java | 108 +++++++-- .../main/java/brooklyn/rest/api/ServerApi.java | 20 ++ .../rest/filter/HaHotCheckResourceFilter.java | 74 +++++-- .../rest/filter/HaMasterCheckFilter.java | 58 ++++- .../resources/AbstractBrooklynRestResource.java | 13 +- .../rest/resources/CatalogResource.java | 17 +- .../brooklyn/rest/resources/ServerResource.java | 55 ++++- .../brooklyn/rest/BrooklynRestApiLauncher.java | 1 + .../test/java/brooklyn/rest/HaHotCheckTest.java | 57 ++--- .../brooklyn/rest/HaMasterCheckFilterTest.java | 3 +- .../rest/testing/BrooklynRestResourceTest.java | 2 +- .../mocks/HighAvailabilityManagerStub.java | 121 ----------- .../testing/mocks/ManagementContextMock.java | 189 ---------------- 40 files changed, 871 insertions(+), 723 deletions(-) ----------------------------------------------------------------------
