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/08/28 13:19:51 UTC
[03/12] git commit: Merge branch 'develop' into
feature/hbase_win_package
Merge branch 'develop' into feature/hbase_win_package
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/a6afba78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a6afba78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a6afba78
Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry
Commit: a6afba78b2f5787e9cdc3d9512dd831613482cf3
Parents: 448d598 41599dc
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Sat Aug 23 19:57:45 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Sat Aug 23 19:57:45 2014 -0700
----------------------------------------------------------------------
.../command-logger/slider-pkg/appConfig.json | 2 -
.../command-logger/slider-pkg/metainfo.xml | 8 +
app-packages/hbase/appConfig.json | 38 +----
app-packages/hbase/configuration/global.xml | 160 -------------------
app-packages/hbase/configuration/hbase-env.xml | 117 ++++++++++++++
.../hbase/configuration/hbase-log4j.xml | 1 +
app-packages/hbase/configuration/hbase-site.xml | 19 ++-
app-packages/hbase/metainfo.xml | 24 +++
app-packages/hbase/package/scripts/hbase.py | 26 +--
app-packages/hbase/package/scripts/params.py | 26 ++-
.../hbase/package/templates/hbase-env.sh.j2 | 81 ----------
app-packages/storm/appConfig.json | 88 +---------
app-packages/storm/configuration/global.xml | 39 -----
app-packages/storm/configuration/storm-env.xml | 40 +++++
app-packages/storm/configuration/storm-site.xml | 15 +-
app-packages/storm/metainfo.xml | 14 ++
app-packages/storm/package/scripts/params.py | 8 +-
app-packages/storm/package/scripts/storm.py | 7 +-
.../storm/package/scripts/yaml_config.py | 7 +-
pom.xml | 1 +
.../core/providers/system.py | 8 +
.../core/resources/system.py | 1 +
slider-assembly/src/main/scripts/slider | 3 +-
slider-assembly/src/main/scripts/slider.py | 21 ++-
.../providers/agent/AgentProviderService.java | 119 +++++++++++---
.../slider/providers/agent/AgentUtils.java | 31 +++-
.../agent/application/metadata/Application.java | 11 +-
.../agent/application/metadata/Component.java | 6 +
.../agent/application/metadata/ConfigFile.java | 53 ++++++
.../metadata/ConfigurationDependencies.java | 39 -----
.../application/metadata/DefaultConfig.java | 39 +++++
.../metadata/DefaultConfigParser.java | 54 +++++++
.../application/metadata/MetainfoParser.java | 9 +-
.../application/metadata/PropertyInfo.java | 54 +++++++
.../server/appmaster/SliderAppMaster.java | 2 +-
.../server/appmaster/web/AgentService.java | 28 +---
.../appmaster/web/rest/agent/AgentWebApp.java | 16 +-
.../LaunchedWorkflowCompositeService.java | 4 +
.../services/workflow/ClosingService.java | 3 +
.../test_command_log/appConfig.json | 2 -
.../test_command_log/appConfig_fast_no_reg.json | 2 -
.../test_command_log/appConfig_no_hb.json | 2 -
.../agent/AgentMiniClusterTestBase.groovy | 9 +-
.../common/tools/TestWindowsSupport.groovy | 106 ++++++++++++
.../publisher/TestPublisherRestResources.groovy | 11 +-
.../slider/test/YarnMiniClusterTestBase.groovy | 4 +-
.../agent/TestAgentProviderService.java | 101 ++++++++++--
.../application/metadata/TestConfigParser.java | 107 +++++++++++++
.../metadata/TestMetainfoParser.java | 7 +
.../web/rest/agent/TestAMAgentWebServices.java | 3 +-
.../workflow/TestWorkflowClosingService.java | 4 +-
.../slider/common/tools/test/metainfo.xml | 11 +-
.../providers/accumulo/AccumuloTestBase.groovy | 7 +-
.../minicluster/HBaseMiniClusterTestBase.groovy | 9 +-
54 files changed, 1016 insertions(+), 591 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a6afba78/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
----------------------------------------------------------------------