Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-slider 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/c011e7ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/c011e7ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/c011e7ac Branch: refs/heads/master Commit: c011e7ac5a5120c87fa4800058af8f4cf8166636 Parents: 80424c1 859ca52 Author: tedyu <yuzhih...@gmail.com> Authored: Wed Jul 9 12:53:31 2014 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Wed Jul 9 12:53:31 2014 -0700 ---------------------------------------------------------------------- pom.xml | 17 +- .../src/main/python/agent/AgentConfig.py | 3 + .../src/main/python/agent/Controller.py | 32 ++- slider-agent/src/main/python/agent/NetUtil.py | 8 +- slider-agent/src/main/python/agent/main.py | 15 +- slider-agent/src/main/python/agent/security.py | 7 +- .../src/test/python/agent/TestController.py | 4 +- slider-agent/src/test/python/agent/TestMain.py | 8 +- .../src/test/python/agent/TestNetUtil.py | 2 +- slider-core/pom.xml | 7 + .../java/org/apache/slider/api/StatusKeys.java | 3 + .../org/apache/slider/common/SliderKeys.java | 14 + .../apache/slider/common/tools/SliderUtils.java | 2 +- .../core/launch/ClasspathConstructor.java | 1 - .../registry/info/CustomRegistryConstants.java | 2 +- .../providers/AbstractProviderService.java | 7 +- .../slider/providers/ProviderService.java | 8 +- .../slider/providers/agent/AgentKeys.java | 1 + .../providers/agent/AgentProviderService.java | 16 +- .../slideram/SliderAMClientProvider.java | 7 +- .../slideram/SliderAMProviderService.java | 18 +- .../server/appmaster/SliderAppMaster.java | 68 ++++- .../server/appmaster/web/AgentService.java | 53 ++++ .../server/appmaster/web/SliderAmIpFilter.java | 18 +- .../slider/server/appmaster/web/WebAppApi.java | 9 +- .../server/appmaster/web/WebAppApiImpl.java | 16 +- .../appmaster/web/rest/AMWebServices.java | 7 +- .../server/appmaster/web/rest/RestPaths.java | 5 +- .../appmaster/web/rest/agent/AgentResource.java | 25 +- .../appmaster/web/rest/agent/AgentWebApp.java | 203 +++++++++++++++ .../web/rest/agent/AgentWebServices.java | 40 +++ .../services/security/CertificateManager.java | 257 +++++++++++++++++++ .../server/services/security/SecurityUtils.java | 209 +++++++++++++++ .../services/security/SignCertResponse.java | 67 +++++ .../server/services/security/SignMessage.java | 54 ++++ .../providers/slideram/instance/appconf.json | 5 +- .../main/resources/webapps/slideragent/.keep | 0 .../agent/TestAgentAMManagementWS.groovy | 46 +++- .../model/mock/MockProviderService.groovy | 12 +- .../view/TestClusterSpecificationBlock.groovy | 2 +- .../web/view/TestContainerStatsBlock.groovy | 2 +- .../appmaster/web/view/TestIndexBlock.groovy | 2 +- .../agent/TestAgentProviderService.java | 6 +- .../web/rest/agent/TestAMAgentWebServices.java | 217 ++++++++-------- .../management/TestAMManagementWebServices.java | 2 +- .../security/TestCertificateManager.java | 60 +++++ slider-core/src/test/python/agent/main.py | 2 + .../providers/hbase/HBaseProviderService.java | 5 +- 48 files changed, 1381 insertions(+), 193 deletions(-) ----------------------------------------------------------------------