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/06/30 17:37:39 UTC
[50/50] [abbrv] git commit: Merge branch 'develop' into
feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Merge branch 'develop' into feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/81a85495
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/81a85495
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/81a85495
Branch: refs/heads/feature/SLIDER-151_Implement_full_slider_API_in_REST_and_switch_client_to_it
Commit: 81a85495de9dcbf6aed1a37594d0e29b95a180d5
Parents: 6f5c5fa 0ad4fb4
Author: Steve Loughran <st...@apache.org>
Authored: Mon Jun 30 16:16:30 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Mon Jun 30 16:16:30 2014 +0100
----------------------------------------------------------------------
.gitignore | 10 +-
LICENSE | 423 ++++++++
LICENSE.txt | 423 --------
NOTICE | 5 +
NOTICE.txt | 5 -
app-packages/accumulo-v1_5/README.txt | 33 -
app-packages/accumulo-v1_5/appConfig.json | 62 --
.../configuration/accumulo-site.xml | 111 --
.../accumulo-v1_5/configuration/global.xml | 94 --
app-packages/accumulo-v1_5/jmx_metrics.json | 41 -
app-packages/accumulo-v1_5/metainfo.xml | 145 ---
.../files/accumulo-1.5.1-bin.tar.gz.REPLACE | 14 -
.../package/files/accumulo-metrics.xml | 60 --
.../accumulo-v1_5/package/files/auditLog.xml | 41 -
app-packages/accumulo-v1_5/package/files/gc | 16 -
.../package/files/generic_logger.xml | 83 --
.../package/files/log4j.properties | 41 -
.../accumulo-v1_5/package/files/masters | 16 -
.../accumulo-v1_5/package/files/monitor | 16 -
.../package/files/monitor_logger.xml | 64 --
app-packages/accumulo-v1_5/package/files/slaves | 16 -
.../accumulo-v1_5/package/files/tracers | 16 -
.../accumulo-v1_5/package/scripts/__init__.py | 19 -
.../package/scripts/accumulo_client.py | 43 -
.../package/scripts/accumulo_configuration.py | 134 ---
.../package/scripts/accumulo_gc.py | 24 -
.../package/scripts/accumulo_master.py | 24 -
.../package/scripts/accumulo_monitor.py | 24 -
.../package/scripts/accumulo_script.py | 110 --
.../package/scripts/accumulo_service.py | 52 -
.../package/scripts/accumulo_tracer.py | 24 -
.../package/scripts/accumulo_tserver.py | 24 -
.../accumulo-v1_5/package/scripts/params.py | 72 --
.../package/scripts/status_params.py | 26 -
.../package/templates/accumulo-env.sh.j2 | 42 -
app-packages/accumulo-v1_5/resources.json | 31 -
app-packages/accumulo/LICENSE.txt | 261 +++++
app-packages/accumulo/NOTICE.txt | 8 +
app-packages/accumulo/README.txt | 47 +
app-packages/accumulo/appConfig.json | 62 ++
.../accumulo/configuration/accumulo-site.xml | 111 ++
app-packages/accumulo/configuration/global.xml | 94 ++
app-packages/accumulo/jmx_metrics.json | 41 +
app-packages/accumulo/metainfo.xml | 147 +++
.../accumulo/package/files/accumulo-metrics.xml | 60 ++
.../accumulo/package/files/auditLog.xml | 41 +
app-packages/accumulo/package/files/gc | 16 +
.../accumulo/package/files/generic_logger.xml | 83 ++
.../accumulo/package/files/log4j.properties | 41 +
app-packages/accumulo/package/files/masters | 16 +
app-packages/accumulo/package/files/monitor | 16 +
.../accumulo/package/files/monitor_logger.xml | 64 ++
app-packages/accumulo/package/files/slaves | 16 +
app-packages/accumulo/package/files/tracers | 16 +
.../accumulo/package/scripts/__init__.py | 19 +
.../accumulo/package/scripts/accumulo_client.py | 43 +
.../package/scripts/accumulo_configuration.py | 135 +++
.../accumulo/package/scripts/accumulo_gc.py | 24 +
.../accumulo/package/scripts/accumulo_master.py | 24 +
.../package/scripts/accumulo_monitor.py | 24 +
.../accumulo/package/scripts/accumulo_script.py | 110 ++
.../package/scripts/accumulo_service.py | 52 +
.../accumulo/package/scripts/accumulo_tracer.py | 24 +
.../package/scripts/accumulo_tserver.py | 24 +
app-packages/accumulo/package/scripts/params.py | 76 ++
.../accumulo/package/scripts/status_params.py | 26 +
.../package/templates/accumulo-env.sh.j2 | 42 +
app-packages/accumulo/pom.xml | 93 ++
app-packages/accumulo/resources.json | 31 +
app-packages/accumulo/src/assembly/accumulo.xml | 71 ++
app-packages/hbase-v0_96/README.txt | 33 -
app-packages/hbase-v0_96/appConfig.json | 67 --
.../hbase-v0_96/configuration/global.xml | 160 ---
.../hbase-v0_96/configuration/hbase-log4j.xml | 142 ---
.../hbase-v0_96/configuration/hbase-policy.xml | 53 -
.../hbase-v0_96/configuration/hbase-site.xml | 365 -------
app-packages/hbase-v0_96/ganglia_metrics.json | 38 -
app-packages/hbase-v0_96/jmx_metrics.json | 56 -
app-packages/hbase-v0_96/metainfo.xml | 109 --
.../hbase-0.96.1-hadoop2-bin.tar.gz.REPLACE | 16 -
.../hbase-v0_96/package/scripts/__init__.py | 19 -
.../hbase-v0_96/package/scripts/functions.py | 40 -
.../hbase-v0_96/package/scripts/hbase.py | 125 ---
.../hbase-v0_96/package/scripts/hbase_client.py | 43 -
.../hbase-v0_96/package/scripts/hbase_master.py | 63 --
.../package/scripts/hbase_regionserver.py | 66 --
.../package/scripts/hbase_service.py | 45 -
.../hbase-v0_96/package/scripts/params.py | 109 --
.../package/scripts/status_params.py | 26 -
...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 62 --
...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 62 --
.../package/templates/hbase-env.sh.j2 | 81 --
.../package/templates/hbase_client_jaas.conf.j2 | 22 -
.../package/templates/hbase_master_jaas.conf.j2 | 25 -
.../templates/hbase_regionserver_jaas.conf.j2 | 25 -
.../package/templates/regionservers.j2 | 20 -
app-packages/hbase-v0_96/resources.json | 19 -
app-packages/hbase/README.txt | 54 +
app-packages/hbase/appConfig.json | 64 ++
app-packages/hbase/configuration/global.xml | 160 +++
.../hbase/configuration/hbase-log4j.xml | 142 +++
.../hbase/configuration/hbase-policy.xml | 53 +
app-packages/hbase/configuration/hbase-site.xml | 365 +++++++
app-packages/hbase/jmx_metrics.json | 56 +
app-packages/hbase/metainfo.xml | 107 ++
app-packages/hbase/package/scripts/__init__.py | 19 +
app-packages/hbase/package/scripts/functions.py | 40 +
app-packages/hbase/package/scripts/hbase.py | 125 +++
.../hbase/package/scripts/hbase_client.py | 43 +
.../hbase/package/scripts/hbase_master.py | 63 ++
.../hbase/package/scripts/hbase_regionserver.py | 66 ++
.../hbase/package/scripts/hbase_service.py | 45 +
app-packages/hbase/package/scripts/params.py | 109 ++
.../hbase/package/scripts/status_params.py | 26 +
...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 62 ++
...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 62 ++
.../hbase/package/templates/hbase-env.sh.j2 | 81 ++
.../package/templates/hbase_client_jaas.conf.j2 | 22 +
.../package/templates/hbase_master_jaas.conf.j2 | 25 +
.../templates/hbase_regionserver_jaas.conf.j2 | 25 +
.../hbase/package/templates/regionservers.j2 | 20 +
app-packages/hbase/pom.xml | 93 ++
app-packages/hbase/resources.json | 19 +
app-packages/hbase/src/assembly/hbase.xml | 71 ++
app-packages/storm-v0_91/metainfo.xml | 229 ++--
pom.xml | 141 +--
slider-agent/conf/agent.ini | 2 +
.../src/main/python/agent/AgentConfig.py | 21 +
slider-agent/src/main/python/agent/Constants.py | 3 +
.../src/main/python/agent/Controller.py | 23 +-
slider-agent/src/main/python/agent/main.py | 4 +
.../src/test/python/agent/TestController.py | 30 +
slider-agent/src/test/python/agent/TestMain.py | 5 +-
slider-assembly/pom.xml | 11 +-
slider-assembly/src/main/scripts/slider | 1 -
slider-assembly/src/main/scripts/slider.py | 190 ++++
.../providers/AbstractProviderService.java | 15 +-
.../slider/providers/ProviderService.java | 5 +-
.../providers/agent/AgentClientProvider.java | 29 +-
.../slider/providers/agent/AgentKeys.java | 4 +-
.../providers/agent/AgentLaunchParameter.java | 130 +++
.../providers/agent/AgentProviderService.java | 232 +++-
.../slider/providers/agent/AgentRoles.java | 18 +-
.../apache/slider/providers/agent/Command.java | 13 +-
.../slider/providers/agent/CommandResult.java | 16 +-
.../providers/agent/ComponentInstanceState.java | 24 +
.../slider/providers/agent/ContainerState.java | 41 +
.../providers/agent/HeartbeatMonitor.java | 116 ++
.../agent/application/metadata/Application.java | 121 +++
.../agent/application/metadata/Metainfo.java | 17 +-
.../application/metadata/MetainfoParser.java | 10 +-
.../agent/application/metadata/Service.java | 121 ---
.../server/appmaster/AMViewForProviders.java | 27 +
.../server/appmaster/SliderAppMaster.java | 32 +-
.../slider/server/appmaster/state/AppState.java | 20 +
.../appmaster/state/ContainerPriority.java | 8 +-
.../appmaster/state/OutstandingRequest.java | 7 +-
.../server/appmaster/state/RoleHistory.java | 8 +
.../server/appmaster/web/SliderAmIpFilter.java | 2 +-
.../services/workflow/ForkedProcessService.java | 25 +-
.../services/workflow/LongLivedProcess.java | 13 +
.../test_command_log/appConfig_fast_no_reg.json | 29 +
.../test_command_log/appConfig_no_hb.json | 29 +
.../app_packages/test_command_log/metainfo.xml | 62 +-
.../agent/AgentMiniClusterTestBase.groovy | 41 +-
.../slider/providers/agent/AgentTestBase.groovy | 44 +-
.../agent/TestAgentAMManagementWS.groovy | 3 +-
.../slider/providers/agent/TestAgentEcho.groovy | 6 +-
.../providers/agent/TestBuildBasicAgent.groovy | 78 +-
.../curator/TestRegistryRestResources.groovy | 3 +-
.../model/appstate/TestMockRMOperations.groovy | 2 +-
.../model/mock/MockProviderService.groovy | 4 +-
.../publisher/TestPublisherRestResources.groovy | 3 +-
.../slider/common/tools/TestSliderUtils.java | 23 +-
.../agent/TestAgentClientProvider.java | 40 +-
.../agent/TestAgentLaunchParameter.java | 76 ++
.../agent/TestAgentProviderService.java | 61 +-
.../providers/agent/TestHeartbeatMonitor.java | 136 +++
.../metadata/MetainfoParserTest.java | 15 +-
.../publisher/TestAgentProviderService.java | 5 +-
.../TestWorkflowForkedProcessService.java | 3 +-
.../org/apache/slider/tools/TestUtility.java | 71 ++
slider-core/src/test/python/appdef_1.zip | Bin 972 -> 0 bytes
slider-core/src/test/python/metainfo.xml | 68 +-
.../src/test/resources/example-slider-test.xml | 4 +-
.../org/apache/slider/common/tools/test.zip | Bin 1273 -> 0 bytes
.../slider/common/tools/test/metainfo.txt | 16 +
.../slider/common/tools/test/metainfo.xml | 95 ++
.../slider/common/tools/test/someOtherFile.txt | 16 +
.../slider/common/tools/test/someOtherFile.xml | 16 +
.../agent/application/metadata/metainfo.xml | 136 ++-
slider-funtest/pom.xml | 38 +-
.../funtest/framework/AgentUploads.groovy | 68 ++
.../funtest/framework/CommandTestBase.groovy | 9 +-
.../funtest/framework/FileUploader.groovy | 100 ++
.../funtest/framework/FuntestProperties.groovy | 12 +-
.../slider/funtest/framework/SudoClosure.groovy | 54 +
.../lifecycle/AgentCommandTestBase.groovy | 135 ++-
.../lifecycle/TestAgentClusterLifecycle.groovy | 2 +-
.../funtest/lifecycle/TestAgentFailures.groovy | 103 ++
.../funtest/lifecycle/TestAgentFailures2.groovy | 103 ++
.../lifecycle/TestAppsThroughAgent.groovy | 111 +-
.../lifecycle/TestClusterBuildDestroy.groovy | 2 +-
.../accumulo/accumulo-funtests/pom.xml | 2 +-
.../slider/providers/accumulo/TestStub.groovy | 32 +
slider-providers/hbase/hbase-funtests/pom.xml | 2 +-
.../slider/providers/hbase/TestStub.groovy | 32 +
.../providers/hbase/HBaseProviderService.java | 13 +-
.../slider/providers/hbase/HBaseRoles.java | 3 +-
src/site/markdown/architecture/architecture.md | 142 ---
src/site/markdown/architecture/index.md | 27 -
src/site/markdown/architecture/rolehistory.md | 1010 ------------------
src/site/markdown/client-configuration.md | 310 ------
src/site/markdown/configuration/core.md | 407 -------
.../example-app_configuration-resolved.json | 42 -
.../example-app_configuration.json | 25 -
.../markdown/configuration/example-empty.json | 8 -
.../configuration/example-internal.json | 21 -
.../example-overridden-resolved.json | 25 -
.../configuration/example-overridden.json | 23 -
.../configuration/example-resources.json | 25 -
.../markdown/configuration/index-markdown.md | 31 -
src/site/markdown/configuration/index.md | 38 -
.../markdown/configuration/original-hbase.json | 139 ---
.../markdown/configuration/proposed-hbase.json | 273 -----
src/site/markdown/configuration/redesign.md | 478 ---------
.../configuration/resolved-resources.json | 22 -
.../markdown/configuration/specification.md | 512 ---------
src/site/markdown/debugging.md | 92 --
src/site/markdown/developing/building.md | 374 -------
.../markdown/developing/functional_tests.md | 416 --------
src/site/markdown/developing/index.md | 35 -
src/site/markdown/developing/manual_testing.md | 53 -
src/site/markdown/developing/releasing.md | 195 ----
src/site/markdown/developing/testing.md | 182 ----
src/site/markdown/examples.md | 159 ---
src/site/markdown/exitcodes.md | 161 ---
src/site/markdown/getting_started.md | 509 ---------
src/site/markdown/index.md | 94 --
src/site/markdown/manpage.md | 483 ---------
.../registry/a_YARN_service_registry.md | 226 ----
src/site/markdown/registry/index.md | 47 -
.../registry/initial_registry_design.md | 110 --
.../markdown/registry/p2p_service_registries.md | 137 ---
src/site/markdown/registry/references.md | 49 -
src/site/markdown/registry/registry-model.md | 75 --
.../service_registry_end_to_end_scenario.md | 156 ---
...lication_registration_and_binding_problem.md | 192 ----
.../markdown/release_notes/release-0.30.0.md | 36 -
src/site/markdown/security.md | 197 ----
.../slider_specs/application_configuration.md | 82 --
.../slider_specs/application_definition.md | 182 ----
.../application_instance_configuration.md | 104 --
.../markdown/slider_specs/application_needs.md | 140 ---
.../slider_specs/application_package.md | 147 ---
.../slider_specs/canonical_scenarios.md | 165 ---
.../slider_specs/creating_app_definitions.md | 123 ---
src/site/markdown/slider_specs/index.md | 53 -
.../slider_specs/resource_specification.md | 53 -
.../slider_specs/writing_app_command_scripts.md | 211 ----
src/site/markdown/specification/cli-actions.md | 675 ------------
src/site/markdown/specification/index.md | 41 -
src/site/markdown/specification/slider-model.md | 286 -----
src/site/markdown/troubleshooting.md | 154 ---
src/site/resources/hoya_am_architecture.png | Bin 137154 -> 0 bytes
.../resources/images/app_config_folders_01.png | Bin 21050 -> 0 bytes
.../resources/images/app_package_sample_04.png | Bin 67927 -> 0 bytes
src/site/resources/images/image_0.png | Bin 194914 -> 0 bytes
src/site/resources/images/image_1.png | Bin 77882 -> 0 bytes
src/site/resources/images/managed_client.png | Bin 71352 -> 0 bytes
src/site/resources/images/slider-container.png | Bin 70265 -> 0 bytes
src/site/resources/images/unmanaged_client.png | Bin 58813 -> 0 bytes
src/site/site.xml | 84 --
src/test/clusters/c6401/slider/log4j.properties | 83 ++
.../clusters/c6401/slider/slider-client.xml | 71 ++
275 files changed, 7261 insertions(+), 14799 deletions(-)
----------------------------------------------------------------------