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/07/12 13:18:57 UTC
[1/3] git commit: Merge branch 'S4-72' into piper
Updated Branches:
refs/heads/piper 53ed17008 -> 341f4bf97
Merge branch 'S4-72' 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/341f4bf9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/341f4bf9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/341f4bf9
Branch: refs/heads/piper
Commit: 341f4bf97f1e7821c6f3df402acbd983f3b84b40
Parents: 53ed170 7e94923
Author: Matthieu Morel <mm...@apache.org>
Authored: Thu Jul 12 15:14:39 2012 +0200
Committer: Matthieu Morel <mm...@apache.org>
Committed: Thu Jul 12 15:14:39 2012 +0200
----------------------------------------------------------------------
.../java/org/apache/s4/base/util/S4RLoader.java | 82 ++---------
.../org/apache/s4/base/util/S4RLoaderFactory.java | 111 +++++++++++++++
.../java/org/apache/s4/core/DefaultCoreModule.java | 4 +
.../src/main/java/org/apache/s4/core/Server.java | 4 +-
.../s4/core/gen/OverloadDispatcherGenerator.java | 30 ++---
.../s4/deploy/DistributedDeploymentManager.java | 2 +-
subprojects/s4-core/src/main/resources/logback.xml | 2 +-
.../apache/s4/deploy/TestAutomaticDeployment.java | 4 +
.../s4/deploy/prodcon/TestProducerConsumer.java | 2 +-
.../src/main/resources/templates/build.gradle | 29 +++-
test-apps/consumer-app/build.gradle | 25 +++-
.../src/main/java/s4app/ConsumerPE.java | 2 +-
test-apps/producer-app/build.gradle | 25 +++-
.../src/main/java/s4app/ProducerPE.java | 2 +-
test-apps/simple-deployable-app-1/build.gradle | 26 +++-
.../main/java/org/apache/s4/deploy/SimplePE.java | 39 ++---
.../src/main/resources/resource.txt | 1 +
test-apps/simple-deployable-app-2/build.gradle | 24 +++-
test-apps/twitter-adapter/build.gradle | 25 +++-
test-apps/twitter-counter/build.gradle | 25 +++-
20 files changed, 315 insertions(+), 149 deletions(-)
----------------------------------------------------------------------