You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/01/21 15:07:20 UTC
[1/4] git commit: Merge branch 'S4-24' into piper
Updated Branches:
refs/heads/piper 25c379f2c -> 5e38aa220
Merge branch 'S4-24' into piper
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/5e38aa22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/5e38aa22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/5e38aa22
Branch: refs/heads/piper
Commit: 5e38aa2202a1955416d9f9adf3590fb86d40cb4a
Parents: 25c379f 7eb4882
Author: Matthieu Morel <mm...@apache.org>
Authored: Sat Jan 21 16:05:44 2012 +0100
Committer: Matthieu Morel <mm...@apache.org>
Committed: Sat Jan 21 16:05:44 2012 +0100
----------------------------------------------------------------------
settings.gradle | 16 +-
.../java/org/apache/s4/comm/tools/TaskSetup.java | 8 +-
.../apache/s4/comm/topology/AssignmentFromZK.java | 4 +-
.../java/org/apache/s4/comm/topology/ZNRecord.java | 26 +-
.../java/org/apache/s4/fixtures/CommTestUtils.java | 4 +-
.../src/main/java/org/apache/s4/core/App.java | 3 +-
.../main/java/org/apache/s4/core/CustomModule.java | 103 ++++
.../src/main/java/org/apache/s4/core/Main.java | 92 ++++-
.../src/main/java/org/apache/s4/core/Module.java | 9 +-
.../src/main/java/org/apache/s4/core/Server.java | 65 ++-
.../s4/deploy/DeploymentFailedException.java | 22 +
.../org/apache/s4/deploy/DeploymentManager.java | 12 +
.../s4/deploy/DistributedDeploymentManager.java | 191 ++++++++
.../org/apache/s4/deploy/FileSystemS4RFetcher.java | 23 +
.../java/org/apache/s4/deploy/HttpS4RFetcher.java | 167 +++++++
.../apache/s4/deploy/NoOpDeploymentManager.java | 13 +
.../main/java/org/apache/s4/deploy/S4RFetcher.java | 24 +
.../java/org/apache/s4/core/CountTriggerTest.java | 16 -
.../java/org/apache/s4/core/NoTriggerTest.java | 17 -
.../java/org/apache/s4/core/TimeTriggerTest.java | 19 -
.../test/java/org/apache/s4/core/TriggerTest.java | 14 +-
.../java/org/apache/s4/core/TriggerablePE.java | 73 ---
.../test/java/org/apache/s4/core/TriggeredApp.java | 54 --
.../java/org/apache/s4/core/TriggeredModule.java | 6 -
.../apache/s4/core/apploading/AppLoadingTest.java | 163 ------
.../org/apache/s4/core/apploading/SimpleApp.java | 47 --
.../apache/s4/core/apploading/SimpleModule.java | 7 -
.../org/apache/s4/core/apploading/SimplePE.java | 66 ---
.../apache/s4/core/triggers/CountTriggerTest.java | 17 +
.../org/apache/s4/core/triggers/NoTriggerTest.java | 18 +
.../apache/s4/core/triggers/TimeTriggerTest.java | 20 +
.../org/apache/s4/core/triggers/TriggerablePE.java | 75 +++
.../org/apache/s4/core/triggers/TriggeredApp.java | 57 +++
.../apache/s4/core/triggers/TriggeredModule.java | 6 +
.../java/org/apache/s4/deploy/AppConstants.java | 10 +
.../apache/s4/deploy/TestAutomaticDeployment.java | 381 +++++++++++++++
.../test/java/org/apache/s4/deploy/TestModule.java | 62 +++
.../java/org/apache/s4/fixtures/CoreTestUtils.java | 83 +++-
.../org/apache/s4/wordcount/WordCountTest.java | 37 +-
.../apache/s4/wordcount/zk/WordCountTestZk.java | 14 +-
.../src/test/resources/default.s4.properties | 4 +-
.../resources/org.apache.s4.deploy.s4.properties | 11 +
subprojects/s4-example/s4-example.gradle | 1 +
test-apps/simple-deployable-app-1/build.gradle | 223 +++++++++
.../src/main/java/org/apache/s4/deploy/A.java | 17 +
.../java/org/apache/s4/deploy/AppConstants.java | 10 +
.../main/java/org/apache/s4/deploy/SimplePE.java | 63 +++
.../java/org/apache/s4/deploy/SocketAdapter.java | 80 +++
.../main/java/org/apache/s4/deploy/TestApp.java | 60 +++
test-apps/simple-deployable-app-2/build.gradle | 223 +++++++++
.../src/main/java/org/apache/s4/deploy/A.java | 16 +
.../java/org/apache/s4/deploy/AppConstants.java | 10 +
.../main/java/org/apache/s4/deploy/TestApp.java | 38 ++
53 files changed, 2248 insertions(+), 552 deletions(-)
----------------------------------------------------------------------