Merge branch 'develop' into feature/SLIDER-151_REST_API
Conflicts:
slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java
slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentResource.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/bfe71dc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/bfe71dc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/bfe71dc0
Branch: refs/heads/feature/SLIDER-151_REST_API
Commit: bfe71dc0531bf18021410ef9be1096be7d39c836
Parents: 621a981 8ac6748
Author: Steve Loughran <ste...@apache.org>
Authored: Sat Aug 9 14:04:18 2014 +0100
Committer: Steve Loughran <ste...@apache.org>
Committed: Sat Aug 9 14:04:18 2014 +0100
----------------------------------------------------------------------
app-packages/accumulo/appConfig.json | 5 +-
app-packages/accumulo/pom.xml | 93 ++-
app-packages/accumulo/resources.json | 15 +-
app-packages/accumulo/src/assembly/accumulo.xml | 1 +
.../AccumuloAgentCommandTestBase.groovy | 52 ++
.../funtest/accumulo/AccumuloBasicIT.groovy | 117 ++++
.../accumulo/AccumuloMonitorSSLIT.groovy | 73 +++
.../funtest/accumulo/AccumuloReadWriteIT.groovy | 116 ++++
.../StubToForceGroovyTestsToCompile.java | 22 +
.../test/resources/appConfig_monitor_ssl.json | 62 ++
.../accumulo/src/test/resources/resources.json | 36 ++
app-packages/app-pkg-template/README.txt | 34 ++
app-packages/app-pkg-template/appConfig.json | 21 +
app-packages/app-pkg-template/metainfo.xml | 57 ++
.../package/files/myapp-1.0.0.tar.REPLACE | 16 +
.../package/scripts/myapp_master.py | 46 ++
.../app-pkg-template/package/scripts/params.py | 30 +
app-packages/app-pkg-template/resources.json | 16 +
.../command-logger/application-pkg/pom.xml | 7 +-
.../command-logger/slider-pkg/appConfig.json | 1 -
app-packages/command-logger/slider-pkg/pom.xml | 2 +-
app-packages/hbase/README.txt | 13 +-
app-packages/hbase/appConfig.json | 13 +-
app-packages/hbase/get-hbase-site.sh | 17 +
app-packages/hbase/links.py | 35 ++
app-packages/hbase/metainfo.xml | 48 ++
.../hbase/package/scripts/hbase_regionserver.py | 3 -
.../hbase/package/scripts/hbase_rest.py | 62 ++
.../hbase/package/scripts/hbase_service.py | 6 +
.../hbase/package/scripts/hbase_thrift.py | 62 ++
.../hbase/package/scripts/hbase_thrift2.py | 62 ++
app-packages/hbase/package/scripts/params.py | 4 +
app-packages/hbase/pom.xml | 154 ++++-
app-packages/hbase/resources.json | 23 +-
app-packages/hbase/src/assembly/hbase.xml | 1 +
.../hbase/HBaseAgentCommandTestBase.groovy | 52 ++
.../slider/funtest/hbase/HBaseBasicIT.groovy | 114 ++++
.../funtest/hbase/HBaseMonitorSSLIT.groovy | 73 +++
.../hbase/StubToForceGroovyTestsToCompile.java | 22 +
.../test/resources/appConfig_monitor_ssl.json | 68 +++
.../hbase/src/test/resources/resources.json | 21 +
app-packages/memcached-win/README.txt | 36 ++
app-packages/memcached-win/appConfig.json | 26 +
app-packages/memcached-win/metainfo.xml | 57 ++
.../jmemcached-cli-1.0.0.jar.REPLACEME | 16 +
.../jmemcached-core-1.0.0.jar.REPLACEME | 16 +
.../memcached-win/package/scripts/memcached.py | 54 ++
.../memcached-win/package/scripts/params.py | 33 ++
app-packages/memcached-win/resources.json | 16 +
app-packages/memcached/README.txt | 35 ++
app-packages/memcached/appConfig.json | 25 +
app-packages/memcached/metainfo.xml | 57 ++
.../package/files/jmemcached-1.0.0.tar.REPLACE | 20 +
.../memcached/package/scripts/memcached.py | 53 ++
.../memcached/package/scripts/params.py | 33 ++
app-packages/memcached/resources.json | 16 +
app-packages/storm-v0_91/README.txt | 33 --
app-packages/storm-v0_91/appConfig.json | 126 ----
.../storm-v0_91/configuration/global.xml | 39 --
.../storm-v0_91/configuration/storm-site.xml | 587 -------------------
app-packages/storm-v0_91/ganglia_metrics.json | 31 -
app-packages/storm-v0_91/jmx_metrics.json | 31 -
app-packages/storm-v0_91/metainfo.xml | 145 -----
...pache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE | 16 -
.../storm-v0_91/package/scripts/drpc_server.py | 55 --
.../storm-v0_91/package/scripts/nimbus.py | 55 --
.../storm-v0_91/package/scripts/params.py | 58 --
.../storm-v0_91/package/scripts/rest_api.py | 57 --
.../storm-v0_91/package/scripts/service.py | 95 ---
.../package/scripts/status_params.py | 36 --
.../storm-v0_91/package/scripts/storm.py | 50 --
.../storm-v0_91/package/scripts/supervisor.py | 61 --
.../storm-v0_91/package/scripts/ui_server.py | 55 --
.../storm-v0_91/package/scripts/yaml_config.py | 69 ---
.../package/templates/config.yaml.j2 | 48 --
.../package/templates/storm_jaas.conf.j2 | 26 -
app-packages/storm-v0_91/resources.json | 31 -
app-packages/storm/README.txt | 37 ++
app-packages/storm/appConfig.json | 126 ++++
app-packages/storm/configuration/global.xml | 39 ++
app-packages/storm/configuration/storm-site.xml | 587 +++++++++++++++++++
app-packages/storm/ganglia_metrics.json | 31 +
app-packages/storm/jmx_metrics.json | 31 +
app-packages/storm/metainfo.xml | 145 +++++
...pache-storm-0.9.1.2.1.1.0-237.tar.gz.REPLACE | 16 +
.../storm/package/scripts/drpc_server.py | 55 ++
app-packages/storm/package/scripts/nimbus.py | 55 ++
app-packages/storm/package/scripts/params.py | 58 ++
app-packages/storm/package/scripts/rest_api.py | 57 ++
app-packages/storm/package/scripts/service.py | 95 +++
.../storm/package/scripts/status_params.py | 36 ++
app-packages/storm/package/scripts/storm.py | 50 ++
.../storm/package/scripts/supervisor.py | 61 ++
app-packages/storm/package/scripts/ui_server.py | 55 ++
.../storm/package/scripts/yaml_config.py | 69 +++
.../storm/package/templates/config.yaml.j2 | 48 ++
.../storm/package/templates/storm_jaas.conf.j2 | 26 +
app-packages/storm/resources.json | 31 +
pom.xml | 72 ++-
slider-agent/conf/agent.ini | 6 +-
slider-agent/pom.xml | 6 +-
.../src/main/python/agent/AgentConfig.py | 12 +-
.../src/main/python/agent/Controller.py | 32 +-
.../python/agent/CustomServiceOrchestrator.py | 114 +++-
slider-agent/src/main/python/agent/NetUtil.py | 8 +-
.../src/main/python/agent/ProcessHelper.py | 3 +-
.../src/main/python/agent/PythonExecutor.py | 7 +-
slider-agent/src/main/python/agent/main.py | 44 +-
slider-agent/src/main/python/agent/security.py | 7 +-
slider-agent/src/main/python/agent/shell.py | 102 +++-
.../python/resource_management/core/logger.py | 5 +-
.../core/providers/__init__.py | 5 +
.../core/providers/accounts.py | 20 +-
.../core/providers/system.py | 28 +-
.../core/providers/windows/__init__.py | 20 +
.../core/providers/windows/service.py | 65 ++
.../core/providers/windows/system.py | 190 ++++++
.../libraries/functions/__init__.py | 2 +-
.../libraries/functions/os_check.py | 166 ++++--
.../libraries/providers/__init__.py | 2 +
.../libraries/providers/monitor_webserver.py | 2 +-
.../libraries/script/script.py | 15 +-
.../src/test/python/agent/TestActionQueue.py | 2 +-
.../src/test/python/agent/TestController.py | 9 +-
.../agent/TestCustomServiceOrchestrator.py | 127 +++-
slider-agent/src/test/python/agent/TestGrep.py | 2 +-
slider-agent/src/test/python/agent/TestMain.py | 34 +-
.../src/test/python/agent/TestNetUtil.py | 2 +-
.../src/test/python/agent/TestRegistration.py | 10 +-
slider-agent/src/test/python/agent/TestShell.py | 33 +-
.../TestDirectoryResource.py | 2 +-
.../resource_management/TestGroupResource.py | 138 -----
.../TestGroupResource.py.disabled | 138 +++++
.../resource_management/TestUserResource.py | 192 ------
.../TestUserResource.py.disabled | 192 ++++++
slider-agent/src/test/python/unitTests.py | 3 +-
slider-assembly/pom.xml | 185 +++++-
slider-assembly/src/conf-hdp/log4j.properties | 58 ++
slider-assembly/src/conf-hdp/slider-client.xml | 77 +++
slider-assembly/src/conf/slider-client.xml | 3 -
slider-core/pom.xml | 17 +-
.../java/org/apache/slider/api/StatusKeys.java | 3 +
.../org/apache/slider/client/SliderClient.java | 151 ++++-
.../org/apache/slider/common/SliderKeys.java | 16 +-
.../common/SliderXMLConfKeysForTesting.java | 5 +
.../apache/slider/common/SliderXmlConfKeys.java | 2 +
.../common/params/AbstractActionArgs.java | 14 +-
.../slider/common/params/ActionUpdateArgs.java | 32 +
.../org/apache/slider/common/params/ArgOps.java | 7 +-
.../apache/slider/common/params/ClientArgs.java | 14 +-
.../apache/slider/common/params/CommonArgs.java | 11 +-
.../slider/common/params/SliderActions.java | 3 +
.../apache/slider/common/tools/Comparators.java | 58 ++
.../slider/common/tools/CoreFileSystem.java | 35 ++
.../apache/slider/common/tools/SliderUtils.java | 25 +-
.../slider/core/build/InstanceBuilder.java | 6 +-
.../slider/core/exceptions/ErrorStrings.java | 2 +-
.../slider/core/launch/AbstractLauncher.java | 3 +
.../slider/core/launch/AppMasterLauncher.java | 7 +-
.../core/launch/ClasspathConstructor.java | 1 -
.../core/launch/JavaCommandLineBuilder.java | 3 +
.../slider/core/main/ServiceLauncher.java | 116 +++-
.../registry/info/CustomRegistryConstants.java | 2 +-
.../slider/core/zk/BlockingZKWatcher.java | 8 +-
.../apache/slider/core/zk/ZKIntegration.java | 23 +-
.../providers/AbstractProviderService.java | 53 +-
.../slider/providers/ProviderService.java | 49 +-
.../providers/agent/AgentClientProvider.java | 22 +-
.../slider/providers/agent/AgentKeys.java | 6 +-
.../providers/agent/AgentProviderService.java | 577 +++++++++++-------
.../providers/agent/ComponentCommandOrder.java | 8 +-
.../providers/agent/ComponentInstanceState.java | 80 ++-
.../providers/agent/HeartbeatMonitor.java | 59 +-
.../agent/application/metadata/Application.java | 9 +
.../agent/application/metadata/Component.java | 13 +
.../application/metadata/MetainfoParser.java | 5 +
.../slideram/SliderAMClientProvider.java | 7 +-
.../slideram/SliderAMProviderService.java | 18 +-
.../server/appmaster/AMViewForProviders.java | 27 -
.../appmaster/AsyncRMOperationHandler.java | 51 --
.../appmaster/ContainerStartOperation.java | 40 --
.../server/appmaster/RoleLaunchService.java | 40 +-
.../server/appmaster/SliderAppMaster.java | 316 +++++++---
.../server/appmaster/actions/ActionHalt.java | 46 ++
.../appmaster/actions/ActionStartContainer.java | 51 ++
.../appmaster/actions/ActionStopQueue.java | 43 ++
.../appmaster/actions/ActionStopSlider.java | 39 ++
.../server/appmaster/actions/AsyncAction.java | 157 +++++
.../actions/ProviderReportedContainerLoss.java | 47 ++
.../actions/ProviderStartupCompleted.java | 37 ++
.../server/appmaster/actions/QueueAccess.java | 38 ++
.../server/appmaster/actions/QueueExecutor.java | 75 +++
.../server/appmaster/actions/QueueService.java | 76 +++
.../appmaster/actions/RenewingAction.java | 105 ++++
.../operations/AbstractRMOperation.java | 29 +
.../operations/AsyncRMOperationHandler.java | 51 ++
.../operations/ContainerReleaseOperation.java | 44 ++
.../operations/ContainerRequestOperation.java | 44 ++
.../ProviderNotifyingOperationHandler.java | 43 ++
.../operations/RMOperationHandler.java | 35 ++
.../operations/RMOperationHandlerActions.java | 28 +
.../appmaster/state/AbstractRMOperation.java | 31 -
.../slider/server/appmaster/state/AppState.java | 275 ++++++---
.../state/ContainerReleaseOperation.java | 44 --
.../state/ContainerReleaseSelector.java | 38 ++
.../state/ContainerRequestOperation.java | 44 --
.../MostRecentContainerReleaseSelector.java | 52 ++
.../server/appmaster/state/NodeEntry.java | 1 -
.../server/appmaster/state/NodeInstance.java | 12 +-
.../slider/server/appmaster/state/NodeMap.java | 54 --
.../appmaster/state/RMOperationHandler.java | 43 --
.../server/appmaster/state/RoleHistory.java | 20 +-
.../server/appmaster/state/RoleStatus.java | 4 +-
.../appmaster/state/SimpleReleaseSelector.java | 34 ++
.../server/appmaster/web/AgentService.java | 53 ++
.../server/appmaster/web/SliderAMWebApp.java | 2 +-
.../server/appmaster/web/SliderAmIpFilter.java | 19 +-
.../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 ++
.../server/services/curator/CuratorService.java | 2 +-
.../services/security/CertificateManager.java | 257 ++++++++
.../server/services/security/SecurityUtils.java | 225 +++++++
.../services/security/SignCertResponse.java | 67 +++
.../server/services/security/SignMessage.java | 54 ++
.../AbstractWorkflowExecutorService.java | 110 ----
.../services/workflow/ForkedProcessService.java | 6 +-
.../services/workflow/LongLivedProcess.java | 78 +--
.../workflow/WorkflowCallbackService.java | 3 +-
.../workflow/WorkflowExecutorService.java | 113 ++++
.../WorkflowScheduledExecutorService.java | 38 ++
.../server/services/workflow/package-info.java | 2 +-
.../providers/slideram/instance/appconf.json | 5 +-
.../main/resources/webapps/slideragent/.keep | 0
.../resources/webapps/static/yarn.dt.plugins.js | 4 +-
.../agent/AgentMiniClusterTestBase.groovy | 7 +-
.../agent/actions/TestActionExists.groovy | 9 +-
.../slider/agent/actions/TestActionList.groovy | 7 +-
.../agent/actions/TestActionStatus.groovy | 13 +-
.../agent/freezethaw/TestFreezeCommands.groovy | 9 +-
.../TestFreezeThawMasterlessAM.groovy | 8 +-
.../freezethaw/TestFreezeUnknownCluster.groovy | 3 +-
.../freezethaw/TestThawUnknownCluster.groovy | 3 +-
.../agent/standalone/TestBadAMHeap.groovy | 5 +-
.../agent/standalone/TestBadYarnQueue.groovy | 5 +-
.../standalone/TestBuildStandaloneAM.groovy | 62 +-
.../standalone/TestDestroyMasterlessAM.groovy | 154 -----
.../standalone/TestKillMasterlessAM.groovy | 74 ---
.../standalone/TestStandaloneAMDestroy.groovy | 154 +++++
.../standalone/TestStandaloneAMKill.groovy | 73 +++
.../standalone/TestStandaloneAMRestart.groovy | 96 +++
.../standalone/TestStandaloneAgentAM.groovy | 11 +-
.../TestStandaloneBadClusterName.groovy | 2 +-
.../standalone/TestStandaloneRegistryAM.groovy | 7 +-
.../slider/client/TestCommonArgParsing.groovy | 13 +
.../common/tools/TestZKIntegration.groovy | 53 ++
.../slider/providers/agent/AgentTestBase.groovy | 30 +
.../agent/TestAgentAMManagementWS.groovy | 65 +-
.../slider/providers/agent/TestAgentEcho.groovy | 4 +-
.../providers/agent/TestBuildBasicAgent.groovy | 171 ++++--
.../curator/TestRegistryRestResources.groovy | 10 +-
.../server/appmaster/actions/TestActions.groovy | 207 +++++++
.../TestAppStateContainerFailure.groovy | 166 ------
.../appstate/TestAppStateDynamicRoles.groovy | 91 ---
.../TestAppStateRebuildOnAMRestart.groovy | 122 ----
.../appstate/TestAppStateRolePlacement.groovy | 99 ----
.../appstate/TestAppStateRoleRelease.groovy | 82 ---
.../TestContainerResourceAllocations.groovy | 108 ----
.../model/appstate/TestFlexDynamicRoles.groovy | 187 ------
.../TestMockAppStateContainerFailure.groovy | 166 ++++++
.../TestMockAppStateDynamicRoles.groovy | 94 +++
.../TestMockAppStateFlexDynamicRoles.groovy | 190 ++++++
.../appstate/TestMockAppStateFlexing.groovy | 116 ++++
.../TestMockAppStateRMOperations.groovy | 180 ++++++
.../TestMockAppStateRebuildOnAMRestart.groovy | 125 ++++
.../TestMockAppStateRolePlacement.groovy | 102 ++++
.../appstate/TestMockAppStateRoleRelease.groovy | 82 +++
.../TestMockContainerResourceAllocations.groovy | 108 ++++
.../model/appstate/TestMockRMOperations.groovy | 213 -------
.../history/TestFindNodesForNewInstances.groovy | 128 ----
.../history/TestFindNodesForRelease.groovy | 146 -----
.../model/history/TestHistoryRW.groovy | 258 --------
.../model/history/TestHistoryRWOrdering.groovy | 145 -----
.../model/history/TestNIComparators.groovy | 77 ---
.../TestOutstandingRequestTracker.groovy | 73 ---
.../TestRoleHistoryContainerEvents.groovy | 19 +-
...stRoleHistoryFindNodesForNewInstances.groovy | 128 ++++
.../history/TestRoleHistoryNIComparators.groovy | 77 +++
...tRoleHistoryOutstandingRequestTracker.groovy | 73 +++
.../model/history/TestRoleHistoryRW.groovy | 258 ++++++++
.../history/TestRoleHistoryRWOrdering.groovy | 145 +++++
.../model/mock/BaseMockAppStateTest.groovy | 60 +-
.../appmaster/model/mock/MockContainer.groovy | 2 +-
.../model/mock/MockProviderService.groovy | 81 ++-
.../model/mock/MockRMOperationHandler.groovy | 8 +-
.../appmaster/model/mock/MockYarnEngine.groovy | 12 +-
.../publisher/TestPublisherRestResources.groovy | 5 +-
.../view/TestClusterSpecificationBlock.groovy | 2 +-
.../web/view/TestContainerStatsBlock.groovy | 2 +-
.../appmaster/web/view/TestIndexBlock.groovy | 2 +-
.../apache/slider/test/SliderTestBase.groovy | 22 +-
.../apache/slider/test/SliderTestUtils.groovy | 2 +-
.../slider/test/YarnMiniClusterTestBase.groovy | 36 +-
.../test/YarnZKMiniClusterTestBase.groovy | 22 +-
.../agent/TestAgentProviderService.java | 326 +++++-----
.../agent/TestComponentCommandOrder.java | 17 +-
.../agent/TestComponentInstanceState.java | 124 ++--
.../providers/agent/TestHeartbeatMonitor.java | 114 ++--
.../web/rest/agent/TestAMAgentWebServices.java | 219 +++----
.../management/TestAMManagementWebServices.java | 6 +-
.../publisher/TestAgentProviderService.java | 16 +-
.../security/TestCertificateManager.java | 60 ++
.../workflow/TestWorkflowExecutorService.java | 9 +-
slider-core/src/test/python/agent.py | 17 +-
slider-core/src/test/python/agent/main.py | 29 +-
slider-core/src/test/python/echo.py | 21 +-
slider-funtest/pom.xml | 34 +-
.../abstracttests/AbstractTestBuildSetup.groovy | 3 -
.../framework/AgentCommandTestBase.groovy | 190 ++++++
.../funtest/framework/CommandTestBase.groovy | 57 +-
.../funtest/framework/FuntestProperties.groovy | 3 -
.../slider/funtest/basic/BuildSetupIT.groovy | 36 ++
.../funtest/basic/ClusterConnectivityIT.groovy | 104 ++++
.../funtest/basic/SignCorrectionIT.groovy | 43 ++
.../slider/funtest/basic/TestBuildSetup.groovy | 36 --
.../basic/TestClusterConnectivity.groovy | 96 ---
.../funtest/basic/TestSignCorrection.groovy | 43 --
.../funtest/commands/ListCommandIT.groovy | 36 ++
.../funtest/commands/SimpleCommandsIT.groovy | 45 ++
.../funtest/commands/TestListCommand.groovy | 41 --
.../funtest/commands/TestSimpleCommands.groovy | 45 --
.../TestUnknownClusterOperations.groovy | 105 ----
.../commands/UnknownClusterOperationsIT.groovy | 100 ++++
.../lifecycle/AgentClusterLifecycleIT.groovy | 192 ++++++
.../lifecycle/AgentCommandTestBase.groovy | 233 --------
.../funtest/lifecycle/AgentFailures2IT.groovy | 104 ++++
.../funtest/lifecycle/AgentFailuresIT.groovy | 104 ++++
.../funtest/lifecycle/AppsThroughAgentIT.groovy | 84 +++
.../lifecycle/ClusterBuildDestroyIT.groovy | 82 +++
.../lifecycle/TestAgentClusterLifecycle.groovy | 191 ------
.../funtest/lifecycle/TestAgentFailures.groovy | 103 ----
.../funtest/lifecycle/TestAgentFailures2.groovy | 103 ----
.../lifecycle/TestAppsThroughAgent.groovy | 83 ---
.../lifecycle/TestClusterBuildDestroy.groovy | 81 ---
slider-install/pom.xml | 111 ++++
.../accumulo/accumulo-funtests/pom.xml | 29 +-
.../slider/providers/accumulo/TestStub.groovy | 32 -
.../funtest/AccumuloBuildSetupIT.groovy | 37 ++
.../accumulo/funtest/AccumuloCIIT.groovy | 109 ++++
.../funtest/AccumuloCommandTestBase.groovy | 53 +-
.../funtest/FunctionalAccumuloClusterIT.groovy | 145 +++++
.../FunctionalAccumuloM1T1GC1Mon1IT.groovy | 57 ++
.../funtest/TestAccumuloBuildSetup.groovy | 38 --
.../accumulo/funtest/TestAccumuloCI.groovy | 115 ----
.../TestFunctionalAccumuloCluster.groovy | 146 -----
.../TestFunctionalAccumuloM1T1GC1Mon1.groovy | 59 --
.../StubToForceGroovyTestsToCompile.java | 22 +
.../accumulo/slider-accumulo-provider/pom.xml | 10 +-
.../accumulo/AccumuloProviderService.java | 4 +
.../providers/accumulo/AccumuloTestBase.groovy | 2 +-
.../live/TestAccCorrectInstanceName.groovy | 4 +-
.../live/TestAccFlexTablets133Mgr113.groovy | 3 +-
.../accumulo/live/TestAccFlexTablets1to3.groovy | 2 +-
.../accumulo/live/TestAccFreezeThaw.groovy | 4 +-
.../accumulo/live/TestAccLiveHDFSArchive.groovy | 4 +-
.../live/TestAccLiveLocalArchive.groovy | 4 +-
.../accumulo/live/TestAccM1T1GC1Mon1.groovy | 3 +-
.../accumulo/live/TestAccM2T2GC1Mon1.groovy | 4 +-
.../accumulo/live/TestAccumuloAMWebApp.groovy | 4 +-
.../live/TestInvalidMonitorAddress.groovy | 3 +-
slider-providers/hbase/hbase-funtests/pom.xml | 29 +-
.../slider/providers/hbase/TestStub.groovy | 32 -
.../hbase/funtest/DemoHBaseCluster.groovy | 2 +-
.../funtest/FunctionalHBaseClusterIT.groovy | 223 +++++++
.../hbase/funtest/HBaseBuildSetupIT.groovy | 36 ++
.../funtest/HBaseClusterBuildDestroyIT.groovy | 87 +++
.../funtest/HBaseClusterLifecycleIT.groovy | 183 ++++++
.../hbase/funtest/HBaseCommandTestBase.groovy | 1 -
.../hbase/funtest/HBaseIntegrationIT.groovy | 69 +++
.../providers/hbase/funtest/HBaseLoadIT.groovy | 64 ++
.../hbase/funtest/HBaseNodeFailureIT.groovy | 135 +++++
.../providers/hbase/funtest/ImagesIT.groovy | 64 ++
.../funtest/TestFunctionalHBaseCluster.groovy | 223 -------
.../hbase/funtest/TestHBaseBuildSetup.groovy | 37 --
.../funtest/TestHBaseClusterBuildDestroy.groovy | 88 ---
.../funtest/TestHBaseClusterLifecycle.groovy | 183 ------
.../hbase/funtest/TestHBaseIntegration.groovy | 69 ---
.../hbase/funtest/TestHBaseLoad.groovy | 64 --
.../hbase/funtest/TestHBaseNodeFailure.groovy | 135 -----
.../providers/hbase/funtest/TestImages.groovy | 65 --
.../hbase/slider-hbase-provider/pom.xml | 20 +-
.../providers/hbase/HBaseClientProvider.java | 6 +
.../slider/providers/hbase/HBaseKeys.java | 14 +
.../providers/hbase/HBaseProviderService.java | 20 +-
.../slider/providers/hbase/HBaseRoles.java | 8 +
.../minicluster/HBaseMiniClusterTestBase.groovy | 150 +++--
.../TestFreezeThawClusterFromArchive.groovy | 3 +-
.../archives/TestLiveClusterFromArchive.groovy | 4 +-
.../TestLiveClusterFromArchiveOnHDFS.groovy | 2 +-
.../build/TestBuildThawClusterM1W1.groovy | 3 +-
.../failures/TestFailedRegionService.groovy | 7 +-
.../failures/TestFailureThreshold.groovy | 5 +-
.../failures/TestKilledHBaseAM.groovy | 3 +-
.../failures/TestKilledHBaseMaster.groovy | 4 +-
.../flexing/TestClusterFlex0To1.groovy | 2 +-
.../flexing/TestClusterFlex1To1.groovy | 4 +-
.../flexing/TestClusterFlex1To2.groovy | 4 +-
.../flexing/TestClusterFlex2DownTo1.groovy | 2 +-
.../flexing/TestClusterFlex2To5.groovy | 4 +-
.../flexing/TestClusterFlexDownMultiple.groovy | 58 ++
.../flexing/TestClusterFlexDownToZero.groovy | 2 +-
.../TestClusterFlexHMasterFlex1To2.groovy | 45 ++
.../flexing/TestHMasterFlex1To2.groovy | 45 --
...reezeReconfigureThawLiveRegionService.groovy | 3 +-
.../TestFreezeThawLiveRegionService.groovy | 3 +-
.../minicluster/live/Test2Master2RS.groovy | 3 +-
.../minicluster/live/TestHBaseMaster.groovy | 3 +-
.../live/TestHBaseMasterOnHDFS.groovy | 4 +-
.../live/TestHBaseMasterWithBadHeap.groovy | 3 +-
.../live/TestLiveRegionServiceOnHDFS.groovy | 4 +-
.../live/TestLiveTwoNodeRegionService.groovy | 4 +-
.../minicluster/live/TestTwoLiveClusters.groovy | 9 +-
.../masterless/TestRoleOptPropagation.groovy | 6 +-
.../TestSliderConfDirToMasterlessAM.groovy | 3 +-
.../src/test/resources/log4j.properties | 1 +
src/test/clusters/c6401/slider/log4j.properties | 30 -
.../clusters/morzine/slider/log4j.properties | 30 -
.../clusters/offline/slider/log4j.properties | 30 -
.../clusters/offline/slider/slider-client.xml | 11 -
.../clusters/remote/slider/log4j.properties | 30 -
.../clusters/sandbox/slider/log4j.properties | 30 -
.../ubuntu-secure/slider/log4j.properties | 1 -
436 files changed, 15726 insertions(+), 8941 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfe71dc0/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfe71dc0/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java
----------------------------------------------------------------------
diff --cc
slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java
index 35d0f15,0571ca1..a97255e
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/RestPaths.java
@@@ -24,10 -24,12 +24,13 @@@ package org.apache.slider.server.appmas
public class RestPaths {
public static final String WS_CONTEXT = "ws";
+ public static final String AGENT_WS_CONTEXT = "ws";
public static final String WS_CONTEXT_ROOT = "/" + WS_CONTEXT;
+ public static final String WS_AGENT_CONTEXT_ROOT = "/" + AGENT_WS_CONTEXT;
public static final String SLIDER_CONTEXT_ROOT = WS_CONTEXT_ROOT
+"/v1/slider";
+ public static final String SLIDER_AGENT_CONTEXT_ROOT =
WS_AGENT_CONTEXT_ROOT +"/v1/slider";
- public static final String SLIDER_SUBPATH_MANAGEMENT = "/mgmt";
+ public static final String MANAGEMENT = "mgmt";
+ public static final String SLIDER_SUBPATH_MANAGEMENT = "/" + MANAGEMENT;
public static final String SLIDER_SUBPATH_AGENTS = "/agents";
public static final String SLIDER_SUBPATH_PUBLISHER = "/publisher";
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfe71dc0/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentResource.java
----------------------------------------------------------------------
diff --cc
slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentResource.java
index d9dcdd5,9d1e840..baa9611
---
a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentResource.java
+++
b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/agent/AgentResource.java
@@@ -17,7 -17,8 +17,9 @@@
package org.apache.slider.server.appmaster.web.rest.agent;
import org.apache.slider.server.appmaster.web.WebAppApi;
+import org.apache.slider.server.appmaster.web.rest.AbstractSliderResource;
+ import org.apache.slider.server.services.security.SignCertResponse;
+ import org.apache.slider.server.services.security.SignMessage;
import org.codehaus.jackson.annotate.JsonIgnoreProperties;
import org.codehaus.jackson.map.annotate.JsonSerialize;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfe71dc0/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/bfe71dc0/slider-providers/hbase/slider-hbase-provider/src/test/groovy/org/apache/slider/providers/hbase/minicluster/HBaseMiniClusterTestBase.groovy
----------------------------------------------------------------------
