Merge commit 'refs/pull/351/head' of https://github.com/apache/apex-core
Project: http://git-wip-us.apache.org/repos/asf/apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/apex-core/commit/cf814184 Tree: http://git-wip-us.apache.org/repos/asf/apex-core/tree/cf814184 Diff: http://git-wip-us.apache.org/repos/asf/apex-core/diff/cf814184 Branch: refs/heads/master Commit: cf81418464dc2fad2b75b68a9759c799ffff8b48 Parents: 5fb9d04 7ad1d75 Author: Thomas Weise <[email protected]> Authored: Mon Nov 21 13:19:11 2016 -0800 Committer: Thomas Weise <[email protected]> Committed: Mon Nov 21 13:19:11 2016 -0800 ---------------------------------------------------------------------- .idea/codeStyleSettings.xml | 2 +- .../java/com/datatorrent/api/LocalMode.java | 41 +--- .../apache/apex/api/EmbeddedAppLauncher.java | 94 +++++++++ .../main/java/org/apache/apex/api/Launcher.java | 192 +++++++++++++++++++ .../org/apache/apex/api/YarnAppLauncher.java | 88 +++++++++ .../com/datatorrent/stram/LocalModeImpl.java | 103 ---------- .../java/com/datatorrent/stram/StramUtils.java | 23 ++- .../java/com/datatorrent/stram/cli/ApexCli.java | 5 +- .../stram/client/StramAppLauncher.java | 28 +-- .../apex/engine/EmbeddedAppLauncherImpl.java | 173 +++++++++++++++++ .../apache/apex/engine/YarnAppLauncherImpl.java | 148 ++++++++++++++ .../apex/engine/util/StreamingAppFactory.java | 64 +++++++ .../services/com.datatorrent.api.LocalMode | 2 +- .../org.apache.apex.api.EmbeddedAppLauncher | 1 + .../org.apache.apex.api.YarnAppLauncher | 1 + 15 files changed, 796 insertions(+), 169 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/apex-core/blob/cf814184/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java ----------------------------------------------------------------------
