Merge branch 'STORM-2201' of https://github.com/Ethanlm/storm into STORM-2201-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e1dd247c Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e1dd247c Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e1dd247c Branch: refs/heads/master Commit: e1dd247ce97ad560c72554ed612e1ec8e69e9777 Parents: 08d9d5a f1f9544 Author: Jungtaek Lim <[email protected]> Authored: Wed Aug 30 10:41:07 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Wed Aug 30 10:41:07 2017 +0900 ---------------------------------------------------------------------- docs/IConfigLoader.md | 51 +++ pom.xml | 7 + storm-server/pom.xml | 5 + .../java/org/apache/storm/DaemonConfig.java | 94 +++-- .../multitenant/MultitenantScheduler.java | 62 ++- .../resource/ResourceAwareScheduler.java | 89 +++-- .../utils/ArtifactoryConfigLoader.java | 395 +++++++++++++++++++ .../utils/ArtifactoryConfigLoaderFactory.java | 50 +++ .../utils/ConfigLoaderFactoryService.java | 68 ++++ .../storm/scheduler/utils/FileConfigLoader.java | 72 ++++ .../utils/FileConfigLoaderFactory.java | 51 +++ .../storm/scheduler/utils/IConfigLoader.java | 32 ++ .../scheduler/utils/IConfigLoaderFactory.java | 35 ++ .../utils/ArtifactoryConfigLoaderTest.java | 235 +++++++++++ .../scheduler/utils/FileConfigLoaderTest.java | 115 ++++++ 15 files changed, 1275 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
