Merge branch 'master' into site
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/1fb6c78d Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/1fb6c78d Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/1fb6c78d Branch: refs/heads/site Commit: 1fb6c78da4d33085c2e347989e34c2259cf2bb97 Parents: 356f9ea d835caf Author: Terence Yim <[email protected]> Authored: Fri Jul 24 11:29:19 2015 -0700 Committer: Terence Yim <[email protected]> Committed: Fri Jul 24 11:29:19 2015 -0700 ---------------------------------------------------------------------- pom.xml | 4 +- twill-api/pom.xml | 2 +- .../org/apache/twill/api/ClassAcceptor.java | 39 ++++++++++ .../org/apache/twill/api/ResourceReport.java | 10 +-- .../apache/twill/api/ResourceSpecification.java | 6 +- .../org/apache/twill/api/TwillController.java | 28 +++++++ .../org/apache/twill/api/TwillPreparer.java | 20 +++++ twill-common/pom.xml | 2 +- .../org/apache/twill/filesystem/Location.java | 2 +- twill-core/pom.xml | 2 +- .../twill/internal/AbstractTwillController.java | 81 +++++++++++++++++++- .../internal/AbstractZKServiceController.java | 1 + .../twill/internal/ApplicationBundler.java | 80 ++++++++++--------- .../org/apache/twill/internal/Constants.java | 7 ++ .../org/apache/twill/internal/ZKMessages.java | 2 +- .../internal/kafka/EmbeddedKafkaServer.java | 74 ++++++++++++++++-- .../apache/twill/internal/state/Message.java | 3 +- .../twill/internal/state/SystemMessages.java | 27 ++++++- .../twill/internal/utils/Dependencies.java | 18 +---- .../apache/twill/kafka/client/Compression.java | 2 +- .../twill/kafka/client/KafkaPublisher.java | 2 +- .../apache/twill/launcher/TwillLauncher.java | 34 ++++---- twill-discovery-api/pom.xml | 2 +- twill-discovery-core/pom.xml | 2 +- twill-examples/echo/pom.xml | 2 +- twill-examples/pom.xml | 2 +- twill-examples/yarn/pom.xml | 2 +- .../apache/twill/example/yarn/HelloWorld.java | 26 ++++++- twill-ext/pom.xml | 2 +- twill-java8-test/pom.xml | 2 +- twill-yarn/pom.xml | 2 +- .../yarn/Hadoop21YarnContainerInfo.java | 2 +- .../org/apache/twill/internal/ServiceMain.java | 2 +- .../appmaster/ApplicationMasterMain.java | 8 +- .../appmaster/ApplicationMasterService.java | 79 +++++++++++++++++++ .../internal/appmaster/RunningContainers.java | 65 ++++++++++------ .../internal/appmaster/TrackerService.java | 1 - .../apache/twill/yarn/YarnTwillPreparer.java | 40 ++++++++-- .../apache/twill/yarn/EchoServerTestRun.java | 76 ++++++++++++++++++ twill-zookeeper/pom.xml | 2 +- 40 files changed, 625 insertions(+), 138 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/1fb6c78d/pom.xml ----------------------------------------------------------------------
