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 2014/12/18 22:33:40 UTC
[26/26] incubator-slider git commit: Merge branch
'feature/SLIDER-151_REST_API' into develop
Merge branch 'feature/SLIDER-151_REST_API' 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/57d0d2ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/57d0d2ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/57d0d2ed
Branch: refs/heads/develop
Commit: 57d0d2ed2c6ad94ede6d39bbe791c4391aaa115c
Parents: 8609f16 3c450b9
Author: Steve Loughran <st...@apache.org>
Authored: Thu Dec 18 21:33:04 2014 +0000
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Dec 18 21:33:04 2014 +0000
----------------------------------------------------------------------
.../apache/slider/api/ClusterDescription.java | 12 +-
.../org/apache/slider/api/ResourceKeys.java | 2 +-
.../slider/api/SliderClusterProtocol.java | 24 ++-
.../java/org/apache/slider/api/StateValues.java | 53 +++++
.../java/org/apache/slider/api/StatusKeys.java | 41 +++-
.../types/SerializedComponentInformation.java | 41 ++++
.../types/SerializedContainerInformation.java | 57 ++++++
.../org/apache/slider/client/SliderClient.java | 18 +-
.../slider/client/SliderClusterOperations.java | 5 +-
.../org/apache/slider/common/SliderKeys.java | 6 +-
.../apache/slider/common/tools/PortScanner.java | 23 ++-
.../apache/slider/core/build/InstanceIO.java | 14 +-
.../slider/core/conf/ConfTreeOperations.java | 3 +-
.../slider/core/persist/JsonSerDeser.java | 2 +
.../registry/docstore/PublishedContent.java | 24 ---
.../server/appmaster/RoleLaunchService.java | 2 +-
.../server/appmaster/SliderAppMaster.java | 155 ++++++++-------
.../slider/server/appmaster/state/AppState.java | 26 ++-
.../server/appmaster/state/RoleInstance.java | 29 ++-
.../server/appmaster/state/RoleStatus.java | 39 ++--
.../server/appmaster/web/HttpCacheHeaders.java | 35 ++++
.../server/appmaster/web/SliderAMWebApp.java | 1 -
.../server/appmaster/web/WebAppApiImpl.java | 4 +-
.../web/rest/AMWadlGeneratorConfig.java | 4 +-
.../appmaster/web/rest/AMWebServices.java | 24 ++-
.../web/rest/AbstractSliderResource.java | 96 +++++++++
.../server/appmaster/web/rest/RestPaths.java | 81 +++++++-
.../web/rest/SliderJacksonJaxbJsonProvider.java | 1 -
.../appmaster/web/rest/agent/AgentResource.java | 6 +-
.../rest/application/ApplicationResource.java | 199 +++++++++++++++++++
.../web/rest/application/package-info.java | 24 +++
.../application/resources/CachedContent.java | 121 +++++++++++
.../application/resources/ContentCache.java | 43 ++++
.../resources/LiveComponentsRefresher.java | 52 +++++
.../resources/LiveContainersRefresher.java | 51 +++++
.../resources/LiveResourcesRefresher.java | 68 +++++++
.../resources/ResourceRefresher.java | 31 +++
.../resources/ResourceSnapshotRefresher.java | 40 ++++
.../web/rest/management/ManagementResource.java | 30 ++-
.../management/resources/ActionsResource.java | 22 ++
.../resources/AggregateConfResource.java | 2 +-
.../management/resources/ConfTreeResource.java | 3 +-
.../web/rest/publisher/PublisherResource.java | 56 +++---
.../web/rest/registry/RegistryResource.java | 18 +-
.../slider/agent/actions/TestActionList.groovy | 2 +-
.../standalone/TestStandaloneAgentWeb.groovy | 134 +++++++++++--
.../appstate/StubSliderClusterProtocol.groovy | 108 ++++++++++
.../TestMockAppStateAppRestIntegration.groovy | 164 +++++++++++++++
.../TestMockContainerResourceAllocations.groovy | 8 +-
.../publisher/TestPublisherRestResources.groovy | 5 +
.../org/apache/slider/test/KeysForTests.groovy | 1 +
.../apache/slider/test/SliderTestUtils.groovy | 163 ++++++++++++---
.../test/YarnZKMiniClusterTestBase.groovy | 1 +
.../framework/AgentCommandTestBase.groovy | 8 +-
.../funtest/framework/CommandTestBase.groovy | 17 +-
.../funtest/lifecycle/AgentWebPagesIT.groovy | 27 +--
56 files changed, 1907 insertions(+), 319 deletions(-)
----------------------------------------------------------------------