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 2013/02/27 18:44:30 UTC
git commit: S4-66 Remove generatedS4R option from s4 deploy task,
in order to simplify commands
Updated Branches:
refs/heads/S4-66 6b42486d8 -> 60a75a078
S4-66 Remove generatedS4R option from s4 deploy task, in order to simplify commands
Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/60a75a07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/60a75a07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/60a75a07
Branch: refs/heads/S4-66
Commit: 60a75a078603125a28395ae0b4e99c751e18b5b8
Parents: 6b42486
Author: Matthieu Morel <mm...@apache.org>
Authored: Wed Feb 27 19:43:22 2013 +0100
Committer: Matthieu Morel <mm...@apache.org>
Committed: Wed Feb 27 19:43:22 2013 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/s4/tools/Deploy.java | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/60a75a07/subprojects/s4-tools/src/main/java/org/apache/s4/tools/Deploy.java
----------------------------------------------------------------------
diff --git 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
index 8c0c916..9f9310c 100644
--- 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
@@ -64,11 +64,6 @@ public class Deploy extends S4ArgsBase {
tmpAppsDir = Files.createTempDir();
- if (!Strings.isNullOrEmpty(deployArgs.s4rPath) && !Strings.isNullOrEmpty(deployArgs.generatedS4R)) {
- logger.error("-s4r and -generatedS4R options are mutually exclusive");
- System.exit(1);
- }
-
URI s4rURI = null;
if (deployArgs.s4rPath != null) {
@@ -77,9 +72,7 @@ public class Deploy extends S4ArgsBase {
// default is file
s4rURI = new File(deployArgs.s4rPath).toURI();
}
- logger.info(
- "Using specified S4R [{}], the S4R archive will not be built from source (and corresponding parameters are ignored)",
- s4rURI.toString());
+ logger.info("Using specified S4R [{}]", s4rURI.toString());
} else {
if (!Strings.isNullOrEmpty(deployArgs.appClass)) {
// 3. otherwise if there is at least an app class specified (e.g. for running "s4 adapter"), we use
@@ -124,12 +117,9 @@ public class Deploy extends S4ArgsBase {
@Parameters(commandNames = "s4 deploy", commandDescription = "Package and deploy application to S4 cluster", separators = "=")
static class DeployAppArgs extends S4ArgsBase {
- @Parameter(names = "-s4r", description = "Path to existing s4r file", required = false)
+ @Parameter(names = "-s4r", description = "URI to existing s4r file", required = false)
String s4rPath;
- @Parameter(names = { "-generatedS4R", "-g" }, description = "Location of generated s4r (incompatible with -s4r option). By default, s4r is generated in a temporary directory on the local file system. In a distributed environment, you probably want to specify a location accessible through a distributed file system like NFS. That's the purpose of this option.", required = false)
- String generatedS4R;
-
@Parameter(names = { "-a", "-appClass" }, description = "Full class name of the application class (extending App or AdapterApp)", required = false)
String appClass = "";