You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2015/01/09 16:34:31 UTC

[10/10] incubator-slider git commit: Merge branch 'feature/SLIDER-710_Restore_insecure_WS_back_door_for_REST_dev' into develop

Merge branch 'feature/SLIDER-710_Restore_insecure_WS_back_door_for_REST_dev' 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/aaeac319
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/aaeac319
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/aaeac319

Branch: refs/heads/develop
Commit: aaeac3196e6659726cd000391db730d919334d46
Parents: 7a1a590 3ba98bf
Author: Steve Loughran <st...@apache.org>
Authored: Fri Jan 9 15:34:10 2015 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Jan 9 15:34:10 2015 +0000

----------------------------------------------------------------------
 .../org/apache/slider/client/SliderClient.java  |  15 +-
 .../org/apache/slider/common/SliderKeys.java    |  12 +-
 .../common/SliderXMLConfKeysForTesting.java     |   9 +-
 .../apache/slider/common/SliderXmlConfKeys.java |   7 +-
 .../slider/common/tools/ConfigHelper.java       |  61 ++++-
 .../apache/slider/common/tools/SliderUtils.java |  15 +-
 .../launch/SerializedApplicationReport.java     |   2 +-
 .../core/restclient/HttpOperationResponse.java  |  29 +++
 .../apache/slider/core/restclient/HttpVerb.java |  57 +++++
 .../restclient/UrlConnectionOperations.java     | 198 +++++++++++++++
 .../slider/providers/SliderProviderFactory.java |   5 +
 .../server/appmaster/SliderAppMaster.java       | 142 +++++++----
 .../appmaster/web/rest/InsecureAmFilter.java    | 105 ++++++++
 .../web/rest/InsecureAmFilterInitializer.java   | 102 ++++++++
 .../server/appmaster/web/rest/RestPaths.java    |   3 +
 .../rest/application/ApplicationResource.java   |  90 +++++--
 .../application/actions/RestActionPing.java     |  51 ++++
 .../application/resources/PingResource.java     |  44 ++++
 .../main/resources/org/apache/slider/slider.xml |   6 +
 .../slider/agent/rest/RestTestDelegates.groovy  | 235 ++++++++++++++++++
 .../slider/agent/rest/TestStandaloneREST.groovy | 119 +++++++++
 .../standalone/TestStandaloneAgentWeb.groovy    | 240 -------------------
 .../tools/TestClientResourceRegistration.groovy |   2 +-
 .../agent/TestAgentAMManagementWS.groovy        |   8 +-
 .../apache/slider/test/SliderTestBase.groovy    |   4 +-
 .../apache/slider/test/SliderTestUtils.groovy   | 105 ++++----
 .../funtest/framework/CommandTestBase.groovy    |   1 +
 .../funtest/framework/FuntestProperties.groovy  |   2 +-
 .../funtest/lifecycle/AgentWebPagesIT.groovy    |  58 ++++-
 29 files changed, 1320 insertions(+), 407 deletions(-)
----------------------------------------------------------------------