Merge branch 'feature/SLIDER-782_SLIDER_RPC_Client_API_in_sync_with_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/67938ee9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/67938ee9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/67938ee9 Branch: refs/heads/feature/SLIDER-779_Move_to_Groovy_2.4.0 Commit: 67938ee99a5115910f90c5f31c00c2a87a8d5638 Parents: 0b00221 c8ddd60 Author: Steve Loughran <[email protected]> Authored: Sat Feb 14 18:28:55 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Sat Feb 14 18:28:55 2015 +0000 ---------------------------------------------------------------------- .../apache/slider/api/SliderApplicationApi.java | 145 + .../slider/api/SliderClusterProtocol.java | 48 +- .../org/apache/slider/api/proto/Messages.java | 12514 ++++++++++++++++- .../slider/api/proto/RestTypeMarshalling.java | 193 + .../slider/api/proto/SliderClusterAPI.java | 967 +- .../slider/api/types/ComponentInformation.java | 25 +- .../slider/api/types/ContainerInformation.java | 4 +- .../slider/client/ClientRegistryBinder.java | 201 + .../org/apache/slider/client/SliderClient.java | 3 +- .../apache/slider/client/SliderClientAPI.java | 3 - .../slider/client/SliderClusterOperations.java | 327 - .../slider/client/SliderYarnClientImpl.java | 1 - .../client/ipc/SliderApplicationIpcClient.java | 214 + .../client/ipc/SliderClusterOperations.java | 490 + .../slider/client/rest/RestClientFactory.java | 15 +- .../client/rest/RestClientRegistryBinder.java | 201 - .../client/rest/SliderApplicationApi.java | 145 - .../client/rest/SliderApplicationApiClient.java | 255 - .../rest/SliderApplicationApiRestClient.java | 265 + .../apache/slider/common/SliderXmlConfKeys.java | 11 + .../core/exceptions/NoSuchNodeException.java | 2 +- .../exceptions/ServiceNotReadyException.java | 43 + .../registry/retrieve/RegistryRetriever.java | 2 +- .../providers/AbstractProviderService.java | 12 +- .../appmaster/AppMasterActionOperations.java | 32 + .../server/appmaster/SliderAppMaster.java | 314 +- .../appmaster/actions/ActionFlexCluster.java | 44 + .../appmaster/actions/ActionKillContainer.java | 5 +- .../actions/ReviewAndFlexApplicationSize.java | 2 +- .../operations/AbstractRMOperation.java | 3 +- .../operations/CancelRequestOperation.java | 2 +- .../operations/ContainerReleaseOperation.java | 2 +- .../operations/ContainerRequestOperation.java | 2 +- .../operations/RMOperationHandler.java | 7 +- .../operations/RMOperationHandlerActions.java | 8 + .../slider/server/appmaster/rpc/RpcBinder.java | 136 +- .../rpc/SliderClusterProtocolPBImpl.java | 123 +- .../rpc/SliderClusterProtocolProxy.java | 165 +- .../server/appmaster/rpc/SliderIPCService.java | 466 + .../slider/server/appmaster/state/AppState.java | 6 +- .../appmaster/state/ProviderAppState.java | 46 +- .../state/StateAccessForProviders.java | 18 +- .../slider/server/appmaster/web/WebAppApi.java | 13 +- .../server/appmaster/web/WebAppApiImpl.java | 32 +- .../ApplicationResouceContentCacheFactory.java | 91 + .../rest/application/ApplicationResource.java | 77 +- .../application/resources/ContentCache.java | 33 +- .../appmaster/web/view/ContainerStatsBlock.java | 48 +- .../src/main/proto/SliderClusterMessages.proto | 141 +- .../src/main/proto/SliderClusterProtocol.proto | 84 +- .../rest/AbstractAppApiTestDelegates.groovy | 235 + .../agent/rest/IpcApiClientTestDelegates.java | 29 + .../agent/rest/JerseyTestDelegates.groovy | 6 +- .../rest/RestAPIClientTestDelegates.groovy | 222 +- .../slider/agent/rest/TestStandaloneREST.groovy | 12 + .../appstate/StubSliderClusterProtocol.groovy | 108 - .../TestMockAppStateAppRestIntegration.groovy | 8 +- .../model/mock/MockProviderService.groovy | 6 + .../model/mock/MockSliderClusterProtocol.groovy | 108 - .../view/TestClusterSpecificationBlock.groovy | 6 +- .../web/view/TestContainerStatsBlock.groovy | 5 +- .../appmaster/web/view/TestIndexBlock.groovy | 5 +- .../agent/TestAgentProviderService.java | 3 +- .../web/rest/agent/TestAMAgentWebServices.java | 5 +- .../management/TestAMManagementWebServices.java | 5 +- .../funtest/lifecycle/AgentWebPagesIT.groovy | 32 +- 66 files changed, 16896 insertions(+), 1885 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/67938ee9/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java ----------------------------------------------------------------------
