Merge branch 'develop' into feature/SLIDER-149_Support_a_YARN_service_registry
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/9a8ee801 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/9a8ee801 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/9a8ee801 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: 9a8ee801bd0239acd4586e4b706b4a847965af0c Parents: dbae537 72daf37 Author: Steve Loughran <ste...@apache.org> Authored: Mon Aug 18 12:02:52 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Aug 18 12:02:52 2014 +0100 ---------------------------------------------------------------------- app-packages/accumulo/metainfo.xml | 3 +- app-packages/hbase/appConfig.json | 1 + app-packages/hbase/metainfo.xml | 30 ++- app-packages/hbase/pom.xml | 2 +- app-packages/storm/metainfo.xml | 28 +-- .../providers/agent/AgentProviderService.java | 216 +++++++++++-------- .../agent/application/metadata/Component.java | 21 +- .../application/metadata/ComponentExport.java | 54 +++++ .../application/metadata/MetainfoParser.java | 9 +- .../agent/TestAgentProviderService.java | 55 +++-- .../metadata/MetainfoParserTest.java | 59 ----- .../metadata/TestMetainfoParser.java | 63 ++++++ .../agent/application/metadata/metainfo.xml | 74 ++++++- 13 files changed, 411 insertions(+), 204 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/9a8ee801/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ----------------------------------------------------------------------
