Repository: incubator-stratos Updated Branches: refs/heads/master b0d393991 -> fb97ac99e
removing data cartirdge parameter from the subscribe command Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/fb97ac99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/fb97ac99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/fb97ac99 Branch: refs/heads/master Commit: fb97ac99e78b0be4c7f50fc3490873b52948be98 Parents: b0d3939 Author: Udara Liyanage <[email protected]> Authored: Tue Mar 25 02:31:51 2014 -0400 Committer: Udara Liyanage <[email protected]> Committed: Tue Mar 25 02:31:51 2014 -0400 ---------------------------------------------------------------------- .../stratos/cli/RestCommandLineService.java | 43 +------------------- .../cli/beans/cartridge/CartridgeInfoBean.java | 19 --------- .../stratos/cli/commands/SubscribeCommand.java | 32 +-------------- .../apache/stratos/cli/utils/CliConstants.java | 3 -- 4 files changed, 3 insertions(+), 94 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fb97ac99/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 890e888..e3b45bd 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 @@ -718,7 +718,7 @@ public class RestCommandLineService { // This method does the cartridge subscription public void subscribe(String cartridgeType, String alias, String externalRepoURL, boolean privateRepo, String username, - String password, String dataCartridgeType, String dataCartridgeAlias, String asPolicy, + String password,String asPolicy, String depPolicy, String size, boolean remoOnTermination, boolean persistanceMapping, boolean enableCommits) throws CommandException { @@ -733,8 +733,6 @@ public class RestCommandLineService { cartridgeInfoBean.setRepoPassword(null); cartridgeInfoBean.setAutoscalePolicy(null); cartridgeInfoBean.setDeploymentPolicy(null); - cartridgeInfoBean.setDataCartridgeType(dataCartridgeType); - cartridgeInfoBean.setDataCartridgeAlias(dataCartridgeAlias); cartridgeInfoBean.setSize(size); cartridgeInfoBean.setRemoveOnTermination(remoOnTermination); cartridgeInfoBean.setPersistanceRequired(persistanceMapping); @@ -746,43 +744,6 @@ public class RestCommandLineService { String jsonSubscribeString = gson.toJson(cartridgeInfoBean, CartridgeInfoBean.class); SubscriptionInfo subcriptionConnectInfo = null; - if (StringUtils.isNotBlank(dataCartridgeType) && StringUtils.isNotBlank(dataCartridgeAlias)) { - System.out.format("Subscribing to data cartridge %s with alias %s.%n", dataCartridgeType, - dataCartridgeAlias); - try { - HttpResponse response = restClientService.doPost(httpClient, restClientService.getUrl() + subscribCartridgeRestEndpoint, - jsonSubscribeString, restClientService.getUsername(), restClientService.getPassword()); - - String responseCode = "" + response.getStatusLine().getStatusCode(); - - if ( ! responseCode.equals(CliConstants.RESPONSE_OK)) { - String resultString = getHttpResponseString(response); - ExceptionMapper exception = gson.fromJson(resultString, ExceptionMapper.class); - System.out.println(exception); - return; - } - - String subscription = getHttpResponseString(response); - - if (subscription == null) { - System.out.println("Error in response"); - return; - } - - String subscriptionJSON = subscription.substring(20, subscription.length() -1); - subcriptionConnectInfo = gson.fromJson(subscriptionJSON, SubscriptionInfo.class); - - System.out.format("You have successfully subscribed to %s cartridge with alias %s.%n", - dataCartridgeType, dataCartridgeAlias); - System.out.format("%nSubscribing to %s cartridge and connecting with %s data cartridge.%n", alias, - dataCartridgeAlias); - } catch (Exception e) { - handleException("Exception in subscribing to data cartridge", e); - } - finally { - httpClient.getConnectionManager().shutdown(); - } - } if (httpClient == null) { httpClient = new DefaultHttpClient(); @@ -795,8 +756,6 @@ public class RestCommandLineService { cartridgeInfoBean.setPrivateRepo(privateRepo); cartridgeInfoBean.setRepoUsername(username); cartridgeInfoBean.setRepoPassword(password); - cartridgeInfoBean.setDataCartridgeType(dataCartridgeType); - cartridgeInfoBean.setDataCartridgeAlias(dataCartridgeAlias); cartridgeInfoBean.setAutoscalePolicy(asPolicy); cartridgeInfoBean.setDeploymentPolicy(depPolicy); cartridgeInfoBean.setSize(size); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fb97ac99/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java index 02a3091..1bd7a57 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/beans/cartridge/CartridgeInfoBean.java @@ -27,9 +27,6 @@ public class CartridgeInfoBean { String repoURL; String repoUsername; String repoPassword; - String dataCartridgeType; - String dataCartridgeAlias; - private String autoscalePolicy; private String deploymentPolicy; private String size; @@ -95,22 +92,6 @@ public class CartridgeInfoBean { this.repoPassword = repoPassword; } - public String getDataCartridgeType() { - return dataCartridgeType; - } - - public void setDataCartridgeType(String dataCartridgeType) { - this.dataCartridgeType = dataCartridgeType; - } - - public String getDataCartridgeAlias() { - return dataCartridgeAlias; - } - - public void setDataCartridgeAlias(String dataCartridgeAlias) { - this.dataCartridgeAlias = dataCartridgeAlias; - } - public String getAutoscalePolicy() { return autoscalePolicy; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fb97ac99/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 f19c57c..6479a06 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 @@ -80,16 +80,6 @@ public class SubscribeCommand implements Command<StratosCommandContext> { persistance.setArgName("persistance-volume"); options.addOption(persistance); - Option connectOption = new Option(CliConstants.CONNECT_OPTION, CliConstants.CONNECT_LONG_OPTION, true, - "Data cartridge type"); - connectOption.setArgName("data cartridge type"); - options.addOption(connectOption); - - Option aliasOption = new Option(CliConstants.DATA_ALIAS_OPTION, CliConstants.DATA_ALIAS_LONG_OPTION, true, - "Data cartridge alias"); - aliasOption.setArgName("alias"); - options.addOption(aliasOption); - Option urlOption = new Option(CliConstants.REPO_URL_OPTION, CliConstants.REPO_URL_LONG_OPTION, true, "GIT repository URL"); urlOption.setArgName("url"); @@ -141,7 +131,7 @@ public class SubscribeCommand implements Command<StratosCommandContext> { String policy = null; String asPolicy = null; String depPolicy = null; - String repoURL = null, dataCartridgeType = null, dataCartridgeAlias = null, username = "", password = ""; + String repoURL = null, username = "", password = ""; String size = null; boolean removeOnTermination = false; @@ -230,18 +220,6 @@ public class SubscribeCommand implements Command<StratosCommandContext> { } password = commandLine.getOptionValue(CliConstants.PASSWORD_OPTION); } - if (commandLine.hasOption(CliConstants.CONNECT_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Connect option is passed"); - } - dataCartridgeType = commandLine.getOptionValue(CliConstants.CONNECT_OPTION); - } - if (commandLine.hasOption(CliConstants.DATA_ALIAS_OPTION)) { - if (logger.isTraceEnabled()) { - logger.trace("Data alias option is passed"); - } - dataCartridgeAlias = commandLine.getOptionValue(CliConstants.DATA_ALIAS_OPTION); - } if (commandLine.hasOption(CliConstants.ENABLE_COMMITS_OPTION)) { if (logger.isTraceEnabled()) { logger.trace("Upstream git commits are enabled"); @@ -271,14 +249,8 @@ public class SubscribeCommand implements Command<StratosCommandContext> { password = context.getApplication().getInput("GIT Repository Password", '*'); } - if (StringUtils.isNotBlank(dataCartridgeType) && !StringUtils.isNotBlank(dataCartridgeAlias)) { - System.out.println("Data cartridge alias is required."); - context.getStratosApplication().printUsage(getName()); - return CliConstants.BAD_ARGS_CODE; - } - RestCommandLineService.getInstance().subscribe(type, alias, repoURL, privateRepo, username, - password, dataCartridgeType, dataCartridgeAlias, asPolicy, depPolicy, size, removeOnTermination, + password, asPolicy, depPolicy, size, removeOnTermination, persistanceMapping, commitsEnabled); return CliConstants.SUCCESSFUL_CODE; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/fb97ac99/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java index 892b465..0f6a901 100644 --- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java +++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CliConstants.java @@ -233,9 +233,6 @@ public class CliConstants { public static final String DEPLOYMENT_POLICY_OPTION = "dp"; public static final String DEPLOYMENT_POLICY_LONG_OPTION = "deployment-policy"; - public static final String CONNECT_OPTION = "c"; - public static final String CONNECT_LONG_OPTION = "connect"; - public static final String DATA_ALIAS_OPTION = "d"; public static final String DATA_ALIAS_LONG_OPTION = "data-alias";
