This closes #542
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/3d73c932 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/3d73c932 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/3d73c932 Branch: refs/heads/master Commit: 3d73c9324420b86c59c250de1fbd6b2a2fb0a44c Parents: 78072b2 9bafb46 Author: Aled Sage <[email protected]> Authored: Thu Mar 19 14:07:04 2015 +0000 Committer: Aled Sage <[email protected]> Committed: Thu Mar 19 14:07:04 2015 +0000 ---------------------------------------------------------------------- .../management/ha/HighAvailabilityManager.java | 5 +- .../ha/HighAvailabilityManagerImpl.java | 9 + .../NonDeploymentManagementContext.java | 4 + .../brooklyn/entity/basic/SoftwareProcess.java | 25 ++- ...wareProcessDriverLifecycleEffectorTasks.java | 19 ++ .../entity/basic/SoftwareProcessImpl.java | 6 + .../entity/brooklynnode/BrooklynNodeImpl.java | 78 ++++++- .../BrooklynNodeUpgradeEffectorBody.java | 5 +- .../software/MachineLifecycleEffectorTasks.java | 78 ++++--- .../BrooklynNodeIntegrationTest.java | 55 ++++- .../entity/brooklynnode/MockBrooklynNode.java | 2 - .../MachineLifecycleEffectorTasksTest.java | 8 +- usage/jsgui/src/main/webapp/assets/js/router.js | 7 +- .../BrooklynJavascriptGuiLauncherTest.java | 7 +- .../brooklyn/launcher/BrooklynWebServer.java | 7 + .../rest/filter/HaHotCheckResourceFilter.java | 116 ++++++++++ .../rest/filter/HaHotStateRequired.java | 36 +++ .../rest/filter/HaMasterCheckFilter.java | 2 +- .../rest/resources/ApplicationResource.java | 2 + .../rest/resources/CatalogResource.java | 2 + .../rest/resources/EffectorResource.java | 2 + .../rest/resources/EntityConfigResource.java | 2 + .../brooklyn/rest/resources/EntityResource.java | 2 + .../rest/resources/LocationResource.java | 2 + .../rest/resources/PolicyConfigResource.java | 2 + .../brooklyn/rest/resources/PolicyResource.java | 2 + .../brooklyn/rest/resources/SensorResource.java | 2 + .../rest/util/ManagementContextProvider.java | 33 +++ .../brooklyn/rest/BrooklynRestApiLauncher.java | 18 +- .../rest/BrooklynRestApiLauncherTest.java | 25 ++- .../test/java/brooklyn/rest/HaHotCheckTest.java | 141 ++++++++++++ .../brooklyn/rest/HaMasterCheckFilterTest.java | 218 +++++++++++++++++++ .../mocks/HighAvailabilityManagerStub.java | 121 ++++++++++ .../testing/mocks/ManagementContextMock.java | 189 ++++++++++++++++ .../rest/util/HaHotStateCheckClassResource.java | 38 ++++ .../rest/util/HaHotStateCheckResource.java | 44 ++++ 36 files changed, 1240 insertions(+), 74 deletions(-) ----------------------------------------------------------------------
