Merge branch 'S4-73' into dev
Conflicts:
subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/40ab313f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/40ab313f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/40ab313f
Branch: refs/heads/master
Commit: 40ab313fe90f497abfe41aa5ec1d5d6b31755f08
Parents: b7bd594 a638839
Author: Daniel Gómez Ferro <dferro@apache.org>
Authored: Tue Mar 5 14:56:13 2013 +0100
Committer: Daniel Gómez Ferro <dferro@apache.org>
Committed: Tue Mar 5 14:56:13 2013 +0100
----------------------------------------------------------------------
subprojects/s4-benchmarks/s4-benchmarks.gradle | 3 -
.../apache/s4/deploy/TestAutomaticDeployment.java | 26 +++++-----
.../s4/deploy/prodcon/TestProducerConsumer.java | 36 ++++++++++-----
.../src/main/java/org/apache/s4/tools/Deploy.java | 20 ++++-----
.../src/main/java/org/apache/s4/tools/Package.java | 2 +-
.../src/main/resources/templates/build.gradle | 10 ----
.../test/java/org/apache/s4/tools/TestDeploy.java | 5 +-
test-apps/consumer-app/build.gradle | 16 -------
test-apps/custom-modules/build.gradle | 6 ---
test-apps/producer-app/build.gradle | 15 ------
test-apps/simple-deployable-app-1/build.gradle | 15 ------
test-apps/twitter-adapter/build.gradle | 13 -----
test-apps/twitter-counter/build.gradle | 13 -----
13 files changed, 50 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/40ab313f/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
----------------------------------------------------------------------
diff --cc subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
index ab162d5,cae6266..de145cf
--- a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
+++ b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
@@@ -89,12 -86,13 +86,13 @@@ public class Deploy extends S4ArgsBase
List<String> params = new ArrayList<String>();
// prepare gradle -P parameters, including passed gradle opts
params.addAll(deployArgs.gradleOpts);
- params.add("appClass=" + deployArgs.appClass);
- params.add("appsDir=" + tmpAppsDir.getAbsolutePath());
- params.add("appName=" + deployArgs.appName);
- ExecGradle.exec(deployArgs.gradleBuildFile, "installS4R", params.toArray(new
String[] {}),
+ params.add("-appClass=" + deployArgs.appClass);
- // params.add("-appsDir=" + tmpAppsDir.getAbsolutePath());
+ params.add("-appName=" + deployArgs.appName);
+ params.add(deployArgs.appName);
- ExecGradle.exec(deployArgs.gradleBuildFile, "s4r", params.toArray(new String[]
{}));
++ ExecGradle.exec(deployArgs.gradleBuildFile, "s4r", params.toArray(new String[]
{}),
+ deployArgs.debug);
- File tmpS4R = new File(tmpAppsDir.getAbsolutePath() + "/" + deployArgs.appName
+ ".s4r");
+ File s4rFile = new File(deployArgs.gradleBuildFile.getParentFile(), "/build/libs/"
+ deployArgs.appName
+ + ".s4r");
if (!Strings.isNullOrEmpty(deployArgs.generatedS4R)) {
logger.info("Copying generated S4R to [{}]", deployArgs.generatedS4R);
s4rURI = new URI(deployArgs.generatedS4R);
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/40ab313f/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java
----------------------------------------------------------------------
diff --cc subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java
index 28e4bdb,0b315ba..209b5e9
--- a/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java
+++ b/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Package.java
@@@ -40,8 -40,7 +40,8 @@@ public class Package extends S4ArgsBas
// prepare gradle -P parameters, including passed gradle opts
params.add("appClass=" + packageArgs.appClass);
params.add("appName=" + packageArgs.appName.get(0));
- ExecGradle.exec(packageArgs.gradleBuildFile, "installS4R", params.toArray(new
String[] {}),
- ExecGradle.exec(packageArgs.gradleBuildFile, "s4r", params.toArray(new String[]
{}));
++ ExecGradle.exec(packageArgs.gradleBuildFile, "s4r", params.toArray(new String[]
{}),
+ packageArgs.debug);
// Explicitly shutdown the JVM since Gradle leaves non-daemon threads running
that delay the termination
System.exit(0);
|