Merge branch 'feature/SLIDER-713_flex_via_REST' 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/6b33fd89 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6b33fd89 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6b33fd89 Branch: refs/heads/develop Commit: 6b33fd8922e7378e6fbad33ddc07d0e31985ea7f Parents: 22ffc64 b235fbe Author: Steve Loughran <ste...@apache.org> Authored: Fri Feb 27 11:28:13 2015 -0800 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Feb 27 11:28:13 2015 -0800 ---------------------------------------------------------------------- slider-core/pom.xml | 5 ++ .../apache/slider/api/SliderApplicationApi.java | 9 ++ .../slider/api/SliderClusterProtocol.java | 2 +- .../client/ipc/SliderApplicationIpcClient.java | 12 +++ .../client/ipc/SliderClusterOperations.java | 27 +++++- .../slider/client/rest/BaseRestClient.java | 4 +- .../rest/SliderApplicationApiRestClient.java | 60 ++++++++++--- .../apache/slider/common/SliderXmlConfKeys.java | 3 +- .../core/exceptions/ExceptionConverter.java | 11 ++- .../rpc/SliderClusterProtocolProxy.java | 5 +- .../server/appmaster/rpc/SliderIPCService.java | 2 +- .../appmaster/web/rest/InsecureAmFilter.java | 2 +- .../rest/application/ApplicationResource.java | 80 ++++++++++++++++- .../rest/AbstractAppApiTestDelegates.groovy | 49 +++++++++++ .../agent/rest/LowLevelRestTestDelegates.groovy | 92 +++++++++++++++++--- .../rest/RestAPIClientTestDelegates.groovy | 21 ++++- 16 files changed, 345 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
