You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/04/29 13:58:41 UTC
[1/2] git commit: Fixed STRATOS-636 - Remove on termination and
persistant mapping values are not set correctly
Repository: incubator-stratos
Updated Branches:
refs/heads/master b4300d7b3 -> d87b9acba
Fixed STRATOS-636 - Remove on termination and persistant mapping values are not set correctly
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/07d8eebf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/07d8eebf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/07d8eebf
Branch: refs/heads/master
Commit: 07d8eebf789f9d035660d2897d423710f7b6e801
Parents: f888f85
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Tue Apr 29 11:51:19 2014 +0000
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Tue Apr 29 11:51:19 2014 +0000
----------------------------------------------------------------------
.../stratos/cli/commands/SubscribeCommand.java | 36 ++++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/07d8eebf/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java
index 6479a06..c540936 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SubscribeCommand.java
@@ -199,14 +199,46 @@ public class SubscribeCommand implements Command<StratosCommandContext> {
logger.trace("Remove on termination option is passed");
}
- removeOnTermination = true;
+
+ String optionValue = commandLine.getOptionValue(CliConstants.REMOVE_ON_TERMINATION_OPTION);
+ if (optionValue.equals("true")) {
+ removeOnTermination = true;
+ }
+ else if (optionValue.equals("false")) {
+ removeOnTermination = false;
+ }
+ else {
+ if (logger.isTraceEnabled()) {
+ logger.trace("Invalid remove on termination option value");
+
+ }
+ System.out.println("Invalid remove on termination option value.");
+ context.getStratosApplication().printUsage(getName());
+ return CliConstants.BAD_ARGS_CODE;
+ }
}
if (commandLine.hasOption(CliConstants.PERSISTANCE_VOLUME_OPTION)) {
if (logger.isTraceEnabled()) {
logger.trace("Persistance volume option is passed");
}
- persistanceMapping = true;
+
+ String optionValue = commandLine.getOptionValue(CliConstants.PERSISTANCE_VOLUME_OPTION);
+ if (optionValue.equals("true")) {
+ persistanceMapping = true;
+ }
+ else if (optionValue.equals("false")) {
+ persistanceMapping = false;
+ }
+ else {
+ if (logger.isTraceEnabled()) {
+ logger.trace("Invalid persistance mapping option value");
+
+ }
+ System.out.println("Invalid persistance mapping option value.");
+ context.getStratosApplication().printUsage(getName());
+ return CliConstants.BAD_ARGS_CODE;
+ }
}
if (commandLine.hasOption(CliConstants.USERNAME_OPTION)) {
if (logger.isTraceEnabled()) {
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/d87b9acb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d87b9acb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d87b9acb
Branch: refs/heads/master
Commit: d87b9acba74bf8e25e7c03077ec5c686130b634f
Parents: 07d8eeb b4300d7
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Tue Apr 29 11:52:44 2014 +0000
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Tue Apr 29 11:52:44 2014 +0000
----------------------------------------------------------------------
.../bean/SubscriptionDomainRequest.java | 39 ++++++++++++++++++++
1 file changed, 39 insertions(+)
----------------------------------------------------------------------