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 2013/12/18 11:10:03 UTC
[1/3] git commit: Remove privite repo option
Updated Branches:
refs/heads/master 47a5f65ba -> 148aa4ef2
Remove privite repo option
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1731181b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1731181b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1731181b
Branch: refs/heads/master
Commit: 1731181b473540f9c581e261fbfcc4ed5f00d438
Parents: 2156741
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Wed Dec 18 15:37:00 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Wed Dec 18 15:37:00 2013 +0530
----------------------------------------------------------------------
.../org/apache/stratos/cli/RestCommandLineService.java | 12 ++++++------
.../apache/stratos/cli/commands/SubscribeCommand.java | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1731181b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index 20633b2..329e315 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -368,9 +368,9 @@ public class RestCommandLineService {
if (responseCode.equals(CliConstants.RESPONSE_AUTHORIZATION_FAIL)) {
System.out.println("Invalid operation. Authorization failed");
return;
- } else if (responseCode.equals(CliConstants.RESPONSE_NO_CONTENT)) {
- System.out.println("Duplicate alias. Please choose different alias");
- return;
+ //} else if (responseCode.equals(CliConstants.RESPONSE_NO_CONTENT)) {
+ // System.out.println("Duplicate alias. Please choose different alias");
+ // return;
} else if ( ! responseCode.equals(CliConstants.RESPONSE_OK)) {
System.out.println("Error occur in subscribe cartridge");
return;
@@ -418,9 +418,9 @@ public class RestCommandLineService {
if (responseCode.equals(CliConstants.RESPONSE_AUTHORIZATION_FAIL)) {
System.out.println("Invalid operation. Authorization failed");
return;
- } else if (responseCode.equals(CliConstants.RESPONSE_NO_CONTENT)) {
- System.out.println("Duplicate alias. Please choose different alias");
- return;
+ //} else if (responseCode.equals(CliConstants.RESPONSE_NO_CONTENT)) {
+ // System.out.println("Duplicate alias. Please choose different alias");
+ // return;
} else if ( ! responseCode.equals(CliConstants.RESPONSE_OK)) {
System.out.println("Error occur in subscribe cartridge");
return;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/1731181b/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 4b25944..06b1464 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
@@ -81,8 +81,8 @@ public class SubscribeCommand implements Command<StratosCommandContext> {
urlOption.setArgName("url");
options.addOption(urlOption);
- options.addOption(CliConstants.PRIVATE_REPO_OPTION, CliConstants.PRIVATE_REPO_LONG_OPTION, false,
- "Private repository");
+ //options.addOption(CliConstants.PRIVATE_REPO_OPTION, CliConstants.PRIVATE_REPO_LONG_OPTION, false,
+ // "Private repository");
Option usernameOption = new Option(CliConstants.USERNAME_OPTION, CliConstants.USERNAME_LONG_OPTION, true,
"GIT repository username");
[3/3] 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/148aa4ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/148aa4ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/148aa4ef
Branch: refs/heads/master
Commit: 148aa4ef261cdf7f9892e83b90323d9155894fc3
Parents: 32a4abb 47a5f65
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Wed Dec 18 15:39:46 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Wed Dec 18 15:39:46 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/autoscaler/AutoscalerContext.java | 4 ++++
.../receiver/health/HealthEventMessageDelegator.java | 15 +++++++++------
.../stratos/autoscaler/monitor/AbstractMonitor.java | 1 -
.../stratos/autoscaler/TestObsoletedMemberRule.java | 7 +------
4 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Remove private repo option
Posted by ma...@apache.org.
Remove private repo option
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/32a4abbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/32a4abbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/32a4abbf
Branch: refs/heads/master
Commit: 32a4abbf996e4e6af0bdcc9e810b2a66d706ada3
Parents: 1731181
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Wed Dec 18 15:39:30 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Wed Dec 18 15:39:30 2013 +0530
----------------------------------------------------------------------
.../apache/stratos/cli/commands/SubscribeCommand.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/32a4abbf/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 06b1464..9e0de49 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
@@ -165,12 +165,12 @@ public class SubscribeCommand implements Command<StratosCommandContext> {
}
repoURL = commandLine.getOptionValue(CliConstants.REPO_URL_OPTION);
}
- if (commandLine.hasOption(CliConstants.PRIVATE_REPO_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("privateRepo option is passed");
- }
- privateRepo = true;
- }
+ //if (commandLine.hasOption(CliConstants.PRIVATE_REPO_OPTION)) {
+ // if (logger.isTraceEnabled()) {
+ // logger.trace("privateRepo option is passed");
+ // }
+ // privateRepo = true;
+ //}
if (commandLine.hasOption(CliConstants.USERNAME_OPTION)) {
if (logger.isTraceEnabled()) {
logger.trace("Username option is passed");