Merge branch 'feature/SLIDER-771_root_slider_pages_to_link_to_new_App_view' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/fad546ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/fad546ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/fad546ea Branch: refs/heads/develop Commit: fad546eab8e35cfb6b7054e9a71cbd4522fb6ef1 Parents: ad33f06 07909f8 Author: Steve Loughran <[email protected]> Authored: Tue Feb 3 21:30:16 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Tue Feb 3 21:30:16 2015 +0000 ---------------------------------------------------------------------- .../slider/api/types/PingInformation.java | 47 ++++++++++ .../apache/slider/api/types/PingResource.java | 47 ---------- .../client/rest/SliderApplicationApi.java | 4 +- .../client/rest/SliderApplicationApiClient.java | 12 +-- .../providers/AbstractProviderService.java | 5 ++ .../slider/providers/ProviderService.java | 6 ++ .../providers/agent/AgentProviderService.java | 5 ++ .../slideram/SliderAMProviderService.java | 5 ++ .../rest/application/ApplicationResource.java | 10 +-- .../application/actions/RestActionPing.java | 18 ++-- .../server/appmaster/web/view/IndexBlock.java | 94 +++++++++++++------- .../server/appmaster/web/view/NavBlock.java | 35 ++++++-- .../agent/rest/JerseyTestDelegates.groovy | 14 +-- .../agent/rest/LowLevelRestTestDelegates.groovy | 8 +- .../slider/agent/rest/TestStandaloneREST.groovy | 1 - .../agent/standalone/DemoStandaloneAM.groovy | 71 +++++++++++++++ .../model/mock/MockProviderService.groovy | 5 ++ 17 files changed, 268 insertions(+), 119 deletions(-) ----------------------------------------------------------------------
