You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/03/14 06:41:37 UTC
[3/9] stratos git commit: Changed variable names,
method names according to standards. Used print usage method to print
the usage of a command. Removed unused constants in RestCommandLineService
class.
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java
index 62902f8..233d668 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddNetworkPartitionCommand.java
@@ -25,18 +25,17 @@ import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
+import org.apache.stratos.cli.utils.CliUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.IOException;
import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
public class AddNetworkPartitionCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddNetworkPartitionCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddNetworkPartitionCommand.class);
private final Options options;
@@ -103,15 +102,15 @@ public class AddNetworkPartitionCommand implements Command<StratosCommandContext
* @throws org.apache.stratos.cli.exception.CommandException if any errors occur when executing the command
*/
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
- logger.debug("Get name" + getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
+ log.debug("Get name" + getName());
}
if (args != null && args.length > 0) {
String resourcePath = null;
- String partitionJson = null;
+ String resourceFileContent = null;
final CommandLineParser parser = new GnuParser();
CommandLine commandLine;
@@ -119,32 +118,32 @@ public class AddNetworkPartitionCommand implements Command<StratosCommandContext
try {
commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if (logger.isDebugEnabled()) {
- logger.debug("Network Partition deployment");
+ if (log.isDebugEnabled()) {
+ log.debug("Network Partition deployment");
}
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Resource path option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Resource path option is passed");
}
resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
- partitionJson = readResource(resourcePath);
+ resourceFileContent = CliUtils.readResource(resourcePath);
}
if (resourcePath == null) {
- System.out.println("usage: " + getName() + " [-p <resource path>]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
- RestCommandLineService.getInstance().addNetworkPartition(partitionJson);
+ RestCommandLineService.getInstance().addNetworkPartition(resourceFileContent);
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
@@ -159,21 +158,4 @@ public class AddNetworkPartitionCommand implements Command<StratosCommandContext
return CliConstants.COMMAND_FAILED;
}
}
-
- private String readResource(String fileName) throws IOException {
- BufferedReader br = new BufferedReader(new FileReader(fileName));
- try {
- StringBuilder sb = new StringBuilder();
- String line = br.readLine();
-
- while (line != null) {
- sb.append(line);
- sb.append("\n");
- line = br.readLine();
- }
- return sb.toString();
- } finally {
- br.close();
- }
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java
index 9310071..9831569 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddTenantCommand.java
@@ -32,7 +32,7 @@ import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
public class AddTenantCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddTenantCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddTenantCommand.class);
private final Options options;
@@ -48,10 +48,10 @@ public class AddTenantCommand implements Command<StratosCommandContext> {
usernameOption.setArgName("username");
options.addOption(usernameOption);
- Option fistnameOption = new Option(CliConstants.FIRST_NAME_OPTION, CliConstants.FIRST_NAME_LONG_OPTION, true,
+ Option firstnameOption = new Option(CliConstants.FIRST_NAME_OPTION, CliConstants.FIRST_NAME_LONG_OPTION, true,
"Tenant first name");
- fistnameOption.setArgName("firstname");
- options.addOption(fistnameOption);
+ firstnameOption.setArgName("firstname");
+ options.addOption(firstnameOption);
Option lastnameOption = new Option(CliConstants.LAST_NAME_OPTION, CliConstants.LAST_NAME_LONG_OPTION, true,
"Tenant last name");
@@ -88,15 +88,15 @@ public class AddTenantCommand implements Command<StratosCommandContext> {
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length > 0) {
String admin = null;
String firstName = null;
- String lastaName = null;
+ String lastName = null;
String password = null;
String domain = null;
String email = null;
@@ -107,61 +107,61 @@ public class AddTenantCommand implements Command<StratosCommandContext> {
try {
commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if (logger.isDebugEnabled()) {
- logger.debug("Add tenant");
+ if (log.isDebugEnabled()) {
+ log.debug("Add tenant");
}
if (opts.hasOption(CliConstants.USERNAME_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Username option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Username option is passed");
}
admin = opts.getOption(CliConstants.USERNAME_OPTION).getValue();
}
if (opts.hasOption(CliConstants.FIRST_NAME_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("First name option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("First name option is passed");
}
firstName = opts.getOption(CliConstants.FIRST_NAME_OPTION).getValue();
}
if (opts.hasOption(CliConstants.LAST_NAME_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Last name option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Last name option is passed");
}
- lastaName = opts.getOption(CliConstants.LAST_NAME_OPTION).getValue();
+ lastName = opts.getOption(CliConstants.LAST_NAME_OPTION).getValue();
}
if (opts.hasOption(CliConstants.PASSWORD_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Password option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Password option is passed");
}
password = opts.getOption(CliConstants.PASSWORD_OPTION).getValue();
}
if (opts.hasOption(CliConstants.DOMAIN_NAME_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Domain name option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Domain name option is passed");
}
domain = opts.getOption(CliConstants.DOMAIN_NAME_OPTION).getValue();
}
if (opts.hasOption(CliConstants.EMAIL_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Email option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Email option is passed");
}
email = opts.getOption(CliConstants.EMAIL_OPTION).getValue();
}
- if (admin == null || firstName == null || lastaName == null || password == null || domain == null || email == null) {
- System.out.println("usage: " + getName() + " [-u <user name>] [-f <first name>] [-l <last name>] [-p <password>] [-d <domain name>] [-e <email>]");
+ if (admin == null || firstName == null || lastName == null || password == null || domain == null || email == null) {
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
- RestCommandLineService.getInstance().addTenant(admin, firstName, lastaName, password, domain, email);
+ RestCommandLineService.getInstance().addTenant(admin, firstName, lastName, password, domain, email);
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java
index 9e1689e..808a2a0 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddUserCommand.java
@@ -18,24 +18,20 @@
*/
package org.apache.stratos.cli.commands;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.*;
import org.apache.stratos.cli.Command;
import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
public class AddUserCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(AddUserCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(AddUserCommand.class);
private final Options options;
@@ -63,12 +59,12 @@ public class AddUserCommand implements Command<StratosCommandContext> {
Option fistnameOption = new Option(CliConstants.FIRST_NAME_OPTION, CliConstants.FIRST_NAME_LONG_OPTION, true,
"User first name");
- fistnameOption.setArgName("firstName");
+ fistnameOption.setArgName("firstname");
options.addOption(fistnameOption);
Option lastnameOption = new Option(CliConstants.LAST_NAME_OPTION, CliConstants.LAST_NAME_LONG_OPTION, true,
"User last name");
- lastnameOption.setArgName("lastName");
+ lastnameOption.setArgName("lastname");
options.addOption(lastnameOption);
Option emailOption = new Option(CliConstants.EMAIL_OPTION, CliConstants.EMAIL_LONG_OPTION, true,
@@ -96,9 +92,9 @@ public class AddUserCommand implements Command<StratosCommandContext> {
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length > 0) {
@@ -116,58 +112,58 @@ public class AddUserCommand implements Command<StratosCommandContext> {
try {
commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if (logger.isDebugEnabled()) {
- logger.debug("Add user");
+ if (log.isDebugEnabled()) {
+ log.debug("Add user");
}
if (opts.hasOption(CliConstants.USERNAME_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Username option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Username option is passed");
}
userName = opts.getOption(CliConstants.USERNAME_OPTION).getValue();
}
if (opts.hasOption(CliConstants.PASSWORD_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Credential option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Credential option is passed");
}
credential = opts.getOption(CliConstants.PASSWORD_OPTION).getValue();
}
if (opts.hasOption(CliConstants.ROLE_NAME_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Role option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Role option is passed");
}
role = opts.getOption(CliConstants.ROLE_NAME_OPTION).getValue();
}
if (opts.hasOption(CliConstants.FIRST_NAME_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("First name option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("First name option is passed");
}
firstName = opts.getOption(CliConstants.FIRST_NAME_OPTION).getValue();;
}
if (opts.hasOption(CliConstants.LAST_NAME_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Last name option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Last name option is passed");
}
lastName = opts.getOption(CliConstants.LAST_NAME_OPTION).getValue();
}
if (opts.hasOption(CliConstants.EMAIL_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Email option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Email option is passed");
}
email = opts.getOption(CliConstants.EMAIL_OPTION).getValue();
}
if (opts.hasOption(CliConstants.PROFILE_NAME_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Profile name option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Profile name option is passed");
}
profileName = opts.getOption(CliConstants.PROFILE_NAME_OPTION).getValue();
}
if (userName == null || credential == null || role == null || firstName == null || lastName == null || email == null) {
- System.out.println("usage: " + getName() + " [-u <user name>] [-p <credential>] [-r <role>] [-f <first name>] [-l <last name>] [-e <email>] [-pr <profile name>]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
@@ -175,8 +171,8 @@ public class AddUserCommand implements Command<StratosCommandContext> {
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java
index 0a07ee2..9fb8970 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CreateApplicationCommand.java
@@ -24,17 +24,17 @@ import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+import org.apache.stratos.cli.utils.CliUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.IOException;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
public class CreateApplicationCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(CreateApplicationCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(CreateApplicationCommand.class);
private final Options options;
@@ -65,14 +65,14 @@ public class CreateApplicationCommand implements Command<StratosCommandContext>
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length > 0) {
String resourcePath = null;
- String applicationDefinition = null;
+ String resourceFileContent = null;
final CommandLineParser parser = new GnuParser();
CommandLine commandLine;
@@ -80,31 +80,31 @@ public class CreateApplicationCommand implements Command<StratosCommandContext>
try {
commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if (logger.isDebugEnabled()) {
- logger.debug("Creating application...");
+ if (log.isDebugEnabled()) {
+ log.debug("Creating application...");
}
if (opts.hasOption(CliConstants.RESOURCE_PATH)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Resource path option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Resource path option is passed");
}
resourcePath = opts.getOption(CliConstants.RESOURCE_PATH).getValue();
- applicationDefinition = readResource(resourcePath);
+ resourceFileContent = CliUtils.readResource(resourcePath);
}
if (resourcePath == null) {
- System.out.println("usage: " + getName() + " [-p <resource path>]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
- RestCommandLineService.getInstance().addApplication(applicationDefinition);
+ RestCommandLineService.getInstance().addApplication(resourceFileContent);
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
@@ -118,23 +118,6 @@ public class CreateApplicationCommand implements Command<StratosCommandContext>
}
}
- private String readResource(String fileName) throws IOException {
- BufferedReader br = new BufferedReader(new FileReader(fileName));
- try {
- StringBuilder sb = new StringBuilder();
- String line = br.readLine();
-
- while (line != null) {
- sb.append(line);
- sb.append("\n");
- line = br.readLine();
- }
- return sb.toString();
- } finally {
- br.close();
- }
- }
-
public Options getOptions() {
return options;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java
index 6ebb3ca..c3ada94 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeactivateTenantCommand.java
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DeactivateTenantCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DeactivateTenantCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DeactivateTenantCommand.class);
@Override
public String getName() {
@@ -43,7 +43,7 @@ public class DeactivateTenantCommand implements Command<StratosCommandContext> {
@Override
public String getArgumentSyntax() {
- return "[Tenant Domain]";
+ return "[tenant-domain]";
}
@Override
@@ -52,14 +52,14 @@ public class DeactivateTenantCommand implements Command<StratosCommandContext> {
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting deactivate tenant info {}", id);
+ if (log.isDebugEnabled()) {
+ log.debug("Getting deactivate tenant info {}", id);
}
RestCommandLineService.getInstance().deactivateTenant(id);
return CliConstants.COMMAND_SUCCESSFULL;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java
index ee27f92..2919ed7 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationCommand.java
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DeleteApplicationCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DeleteApplicationCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DeleteApplicationCommand.class);
@Override
public String getName() {
@@ -52,14 +52,14 @@ public class DeleteApplicationCommand implements Command<StratosCommandContext>
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting delete application id {}", id);
+ if (log.isDebugEnabled()) {
+ log.debug("Getting delete application id {}", id);
}
RestCommandLineService.getInstance().deleteApplication(id);
return CliConstants.COMMAND_SUCCESSFULL;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java
index f8c1c0f..369c6a0 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteApplicationSignupCommand.java
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DeleteApplicationSignupCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DeleteApplicationSignupCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DeleteApplicationSignupCommand.class);
@Override
public String getName() {
@@ -43,7 +43,7 @@ public class DeleteApplicationSignupCommand implements Command<StratosCommandCon
@Override
public String getArgumentSyntax() {
- return "[Application Id]";
+ return "[application-id]";
}
@Override
@@ -52,16 +52,16 @@ public class DeleteApplicationSignupCommand implements Command<StratosCommandCon
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
- String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting delete application id {}", id);
+ String applicationId = args[0];
+ if (log.isDebugEnabled()) {
+ log.debug("Getting delete application id {}", applicationId);
}
- RestCommandLineService.getInstance().deleteApplicationSignup(id);
+ RestCommandLineService.getInstance().deleteApplicationSignup(applicationId);
return CliConstants.COMMAND_SUCCESSFULL;
} else {
context.getStratosApplication().printUsage(getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java
index 84d96c3..62a53db 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteAutoScalingPolicyCommand.java
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DeleteAutoScalingPolicyCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DeleteAutoScalingPolicyCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DeleteAutoScalingPolicyCommand.class);
@Override
public String getName() {
@@ -43,7 +43,7 @@ public class DeleteAutoScalingPolicyCommand implements Command<StratosCommandCon
@Override
public String getArgumentSyntax() {
- return "[Application Id]";
+ return "[application-id]";
}
@Override
@@ -52,16 +52,16 @@ public class DeleteAutoScalingPolicyCommand implements Command<StratosCommandCon
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
- String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting delete application id {}", id);
+ String autoScalingPolicyId = args[0];
+ if (log.isDebugEnabled()) {
+ log.debug("Getting delete application id {}", autoScalingPolicyId);
}
- RestCommandLineService.getInstance().deleteAutoSclaingPolicy(id);
+ RestCommandLineService.getInstance().deleteAutoSclaingPolicy(autoScalingPolicyId);
return CliConstants.COMMAND_SUCCESSFULL;
} else {
context.getStratosApplication().printUsage(getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java
index 1f82fa3..fcbac0f 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteTenantCommand.java
@@ -52,7 +52,7 @@ public class DeleteTenantCommand implements Command<StratosCommandContext> {
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
if (logger.isDebugEnabled()) {
logger.debug("Executing {} command...", getName());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java
index 82f37e0..ecdc3a6 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeleteUserCommand.java
@@ -29,7 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DeleteUserCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DeleteUserCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DeleteUserCommand.class);
@Override
public String getName() {
@@ -43,7 +43,7 @@ public class DeleteUserCommand implements Command<StratosCommandContext> {
@Override
public String getArgumentSyntax() {
- return "[UserName]";
+ return "[username]";
}
@Override
@@ -52,14 +52,14 @@ public class DeleteUserCommand implements Command<StratosCommandContext> {
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
String username = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting delete user info {}", username);
+ if (log.isDebugEnabled()) {
+ log.debug("Getting delete user info {}", username);
}
RestCommandLineService.getInstance().deleteUser(username);
return CliConstants.COMMAND_SUCCESSFULL;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java
index dbde8f9..6ab71d9 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DeployApplicationCommand.java
@@ -25,16 +25,17 @@ import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
/**
* Deploy application command.
*/
public class DeployApplicationCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DeployApplicationCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DeployApplicationCommand.class);
private Options options;
@@ -70,7 +71,7 @@ public class DeployApplicationCommand implements Command<StratosCommandContext>
@Override
public String getArgumentSyntax() {
- return "[application-id]";
+ return null;
}
@Override
@@ -79,9 +80,9 @@ public class DeployApplicationCommand implements Command<StratosCommandContext>
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length > 0) {
@@ -95,27 +96,27 @@ public class DeployApplicationCommand implements Command<StratosCommandContext>
commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if (logger.isDebugEnabled()) {
- logger.debug("Deploy application");
+ if (log.isDebugEnabled()) {
+ log.debug("Deploy application");
}
if (opts.hasOption(CliConstants.APPLICATION_ID_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Application Id option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Application Id option is passed");
}
applicationId = opts.getOption(CliConstants.APPLICATION_ID_OPTION).getValue();
}
if (opts.hasOption(CliConstants.APPLICATION_POLICY_ID_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Application policy Id option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Application policy Id option is passed");
}
applicationPolicyId = opts.getOption(CliConstants.APPLICATION_POLICY_ID_OPTION).getValue();
}
if (applicationId == null || applicationPolicyId == null) {
- System.out.println("usage: " + getName() + " [-a <application id>] [-ap <application policy id>]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
@@ -123,8 +124,8 @@ public class DeployApplicationCommand implements Command<StratosCommandContext>
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescibeApplicationPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescibeApplicationPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescibeApplicationPolicyCommand.java
deleted file mode 100644
index 5ceaeee..0000000
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescibeApplicationPolicyCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
-
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.stratos.cli.commands;
-
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.stratos.cli.Command;
-import org.apache.stratos.cli.RestCommandLineService;
-import org.apache.stratos.cli.StratosCommandContext;
-import org.apache.stratos.cli.exception.CommandException;
-import org.apache.stratos.cli.utils.CliConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DescibeApplicationPolicyCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescibeApplicationPolicyCommand.class);
-
- @Override
- public String getName() {
- return "describe-application-policy";
- }
-
- @Override
- public String getDescription() {
- return "Describing the application Policy";
- }
-
- @Override
- public String getArgumentSyntax() {
- return "[application-policy-id]";
- }
-
- @Override
- public Options getOptions() {
- return null;
- }
-
- @Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
- }
- if (args != null && args.length == 1) {
- String applicationPolicyId = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting application policy {}", applicationPolicyId);
- }
- RestCommandLineService.getInstance().describeApplicationPolicy(applicationPolicyId);
- return CliConstants.COMMAND_SUCCESSFULL;
- } else {
- context.getStratosApplication().printUsage(getName());
- return CliConstants.COMMAND_FAILED;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java
index a6f0bec..1b3c082 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationCommand.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
public class DescribeApplicationCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeApplicationCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeApplicationCommand.class);
public DescribeApplicationCommand() {
}
@@ -48,9 +48,9 @@ public class DescribeApplicationCommand implements Command<StratosCommandContext
return "[application-id]";
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing command: ", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing command: ", getName());
}
if ((args == null) || (args.length == 0)) {
context.getStratosApplication().printUsage(getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationPolicyCommand.java
new file mode 100644
index 0000000..d71fb51
--- /dev/null
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationPolicyCommand.java
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.stratos.cli.commands;
+
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.RestCommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DescribeApplicationPolicyCommand implements Command<StratosCommandContext> {
+ private static final Logger log = LoggerFactory.getLogger(DescribeApplicationPolicyCommand.class);
+
+ @Override
+ public String getName() {
+ return "describe-application-policy";
+ }
+
+ @Override
+ public String getDescription() {
+ return "Describing the application Policy";
+ }
+
+ @Override
+ public String getArgumentSyntax() {
+ return "[application-policy-id]";
+ }
+
+ @Override
+ public Options getOptions() {
+ return null;
+ }
+
+ @Override
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
+ }
+ if (args != null && args.length == 1) {
+ String applicationPolicyId = args[0];
+ if (log.isDebugEnabled()) {
+ log.debug("Getting application policy {}", applicationPolicyId);
+ }
+ RestCommandLineService.getInstance().describeApplicationPolicy(applicationPolicyId);
+ return CliConstants.COMMAND_SUCCESSFULL;
+ } else {
+ context.getStratosApplication().printUsage(getName());
+ return CliConstants.COMMAND_FAILED;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java
index 45bc3a0..c86581c 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationRuntimeCommand.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
public class DescribeApplicationRuntimeCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeApplicationRuntimeCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeApplicationRuntimeCommand.class);
public DescribeApplicationRuntimeCommand() {
}
@@ -48,9 +48,9 @@ public class DescribeApplicationRuntimeCommand implements Command<StratosCommand
return "[application-id]";
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing command: ", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing command: ", getName());
}
if ((args == null) || (args.length == 0)) {
context.getStratosApplication().printUsage(getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java
index 3983be2..259d2cf 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeApplicationSignupCommand.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
public class DescribeApplicationSignupCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeApplicationSignupCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeApplicationSignupCommand.class);
public DescribeApplicationSignupCommand() {
}
@@ -48,9 +48,9 @@ public class DescribeApplicationSignupCommand implements Command<StratosCommandC
return "[application-id]";
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing command: ", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing command: ", getName());
}
if ((args == null) || (args.length == 0)) {
context.getStratosApplication().printUsage(getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java
index 8773b33..ba650e3 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeAutoScalingPolicyCommand.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DescribeAutoScalingPolicyCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeAutoScalingPolicyCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeAutoScalingPolicyCommand.class);
@Override
public String getName() {
@@ -42,7 +42,7 @@ public class DescribeAutoScalingPolicyCommand implements Command<StratosCommandC
@Override
public String getArgumentSyntax() {
- return "[ID]";
+ return "[autoscaling-policy-id]";
}
@Override
@@ -51,14 +51,14 @@ public class DescribeAutoScalingPolicyCommand implements Command<StratosCommandC
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting Autoscale policy info {}", id);
+ if (log.isDebugEnabled()) {
+ log.debug("Getting Autoscale policy info {}", id);
}
RestCommandLineService.getInstance().describeAutoScalingPolicy(id);
return CliConstants.COMMAND_SUCCESSFULL;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java
index fcba2e7..891261c 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeCommand.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DescribeCartridgeCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeAutoScalingPolicyCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeCartridgeCommand.class);
@Override
public String getName() {
@@ -42,7 +42,7 @@ public class DescribeCartridgeCommand implements Command<StratosCommandContext>
@Override
public String getArgumentSyntax() {
- return "[Cartridge-Type]";
+ return "[cartridge-type]";
}
@Override
@@ -51,14 +51,14 @@ public class DescribeCartridgeCommand implements Command<StratosCommandContext>
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting cartridge info {}", id);
+ if (log.isDebugEnabled()) {
+ log.debug("Getting cartridge info {}", id);
}
RestCommandLineService.getInstance().describeCartridge(id);
return CliConstants.COMMAND_SUCCESSFULL;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java
index b22649c..4f0d98d 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeCartridgeGroupCommand.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
public class DescribeCartridgeGroupCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeCartridgeGroupCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeCartridgeGroupCommand.class);
public DescribeCartridgeGroupCommand() {
}
@@ -45,12 +45,12 @@ public class DescribeCartridgeGroupCommand implements Command<StratosCommandCont
}
public String getArgumentSyntax() {
- return "[group-name]";
+ return "[cartridge-group-name]";
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing command: ", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing command: ", getName());
}
if ((args == null) || (args.length == 0)) {
context.getStratosApplication().printUsage(getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
index eccb05a..ff90fb5 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeDeploymentPolicyCommand.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DescribeDeploymentPolicyCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeDeploymentPolicyCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeDeploymentPolicyCommand.class);
@Override
public String getName() {
@@ -51,14 +51,14 @@ public class DescribeDeploymentPolicyCommand implements Command<StratosCommandCo
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
String deploymentPolicyId = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting deployment policy {}", deploymentPolicyId);
+ if (log.isDebugEnabled()) {
+ log.debug("Getting deployment policy {}", deploymentPolicyId);
}
RestCommandLineService.getInstance().describeDeploymentPolicy(deploymentPolicyId);
return CliConstants.COMMAND_SUCCESSFULL;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java
index 70de471..9b3f4b0 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesClusterCommand.java
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DescribeKubernetesClusterCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeKubernetesClusterCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeKubernetesClusterCommand.class);
@Override
public String getName() {
@@ -53,14 +53,14 @@ public class DescribeKubernetesClusterCommand implements Command<StratosCommandC
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting Kubernetes cluster info {}", id);
+ if (log.isDebugEnabled()) {
+ log.debug("Getting Kubernetes cluster info {}", id);
}
RestCommandLineService.getInstance().describeKubernetesCluster(id);
return CliConstants.COMMAND_SUCCESSFULL;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java
index eb5d878..b03bae7 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeKubernetesMasterCommand.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
public class DescribeKubernetesMasterCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeKubernetesMasterCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeKubernetesMasterCommand.class);
@Override
public String getName() {
@@ -54,16 +54,16 @@ public class DescribeKubernetesMasterCommand implements Command<StratosCommandCo
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
- String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting Kubernetes master info {}", id);
+ String clusterId = args[0];
+ if (log.isDebugEnabled()) {
+ log.debug("Getting Kubernetes master info {}", clusterId);
}
- RestCommandLineService.getInstance().getKubernetesMaster(id);
+ RestCommandLineService.getInstance().getKubernetesMaster(clusterId);
return CliConstants.COMMAND_SUCCESSFULL;
} else {
context.getStratosApplication().printUsage(getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java
index 5e9c5af..dd11226 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeNetworkPartitionCommand.java
@@ -30,7 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DescribeNetworkPartitionCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(DescribeAutoScalingPolicyCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(DescribeNetworkPartitionCommand.class);
@Override
public String getName() {
@@ -53,14 +53,14 @@ public class DescribeNetworkPartitionCommand implements Command<StratosCommandCo
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length == 1) {
String id = args[0];
- if (logger.isDebugEnabled()) {
- logger.debug("Getting cartridge info {}", id);
+ if (log.isDebugEnabled()) {
+ log.debug("Getting cartridge info {}", id);
}
RestCommandLineService.getInstance().describeNetworkPartition(id);
return CliConstants.COMMAND_SUCCESSFULL;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java
index 8add681..25feb37 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/DescribeTenantCommand.java
@@ -80,7 +80,7 @@ public class DescribeTenantCommand implements Command<StratosCommandContext> {
* @throws org.apache.stratos.cli.exception.CommandException if any errors occur when executing the command
*/
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
if (logger.isDebugEnabled()) {
logger.debug("Executing {} command...", getName());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java
index 5f8b407..a4b3147 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ExitCommand.java
@@ -50,7 +50,7 @@ public class ExitCommand implements Command<StratosCommandContext> {
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
// Nothing to execute here. This is a special command.
if (logger.isDebugEnabled()) {
logger.debug("Executing {} command...", getName());
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java
index 8c1ed13..629a0a3 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/HelpCommand.java
@@ -50,7 +50,7 @@ public class HelpCommand implements Command<StratosCommandContext> {
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
if (logger.isDebugEnabled()) {
logger.debug("Executing {} command...", getName());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java
index 962413f..5aafb27 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/InfoCommand.java
@@ -51,7 +51,7 @@ public class InfoCommand implements Command<StratosCommandContext> {
}
@Override
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
if (logger.isDebugEnabled()) {
logger.debug("Executing {} command...", getName());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java
index a17ab12..a1f6e5e 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationPoliciesCommand.java
@@ -47,7 +47,7 @@ public class ListApplicationPoliciesCommand implements Command<StratosCommandCon
return null;
}
- public int execute(StratosCommandContext context, String[] args,Option[] already_parsed_opts) throws CommandException {
+ public int execute(StratosCommandContext context, String[] args,Option[] alreadyParsedOpts) throws CommandException {
if (logger.isDebugEnabled()) {
logger.debug("Executing {} command...", getName());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java
index a80d67a..38ccc5f 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListApplicationsCommand.java
@@ -47,7 +47,7 @@ public class ListApplicationsCommand implements Command<StratosCommandContext> {
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
if (logger.isDebugEnabled()) {
logger.debug("Executing {} command...", getName());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java
index e8a8060..e56afff 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListAutoscalePolicyCommand.java
@@ -47,7 +47,7 @@ public class ListAutoscalePolicyCommand implements Command<StratosCommandContext
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
if (logger.isDebugEnabled()) {
logger.debug("Executing {} command...", getName());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java
index a80364a..bdfb782 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgeGroupsCommand.java
@@ -47,7 +47,7 @@ public class ListCartridgeGroupsCommand implements Command<StratosCommandContext
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
if (logger.isDebugEnabled()) {
logger.debug("Executing {} command...", getName());
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesByFilterCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesByFilterCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesByFilterCommand.java
index 3a9497d..bc75379 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesByFilterCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesByFilterCommand.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+
+ * http://www.apache.org/licenses/LICENSE-2.0
+
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
package org.apache.stratos.cli.commands;
import org.apache.commons.cli.*;
@@ -6,16 +25,14 @@ import org.apache.stratos.cli.RestCommandLineService;
import org.apache.stratos.cli.StratosCommandContext;
import org.apache.stratos.cli.exception.CommandException;
import org.apache.stratos.cli.utils.CliConstants;
-import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- * Created by dinithi on 2/11/15.
- */
+import static org.apache.stratos.cli.utils.CliUtils.mergeOptionArrays;
+
public class ListCartridgesByFilterCommand implements Command<StratosCommandContext>{
- private static final Logger logger = LoggerFactory.getLogger(ListCartridgesByFilterCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(ListCartridgesByFilterCommand.class);
private final Options options;
@@ -27,7 +44,7 @@ public class ListCartridgesByFilterCommand implements Command<StratosCommandCont
final Options options = new Options();
Option filterOption = new Option(CliConstants.CARTRIDGE_FILTER_OPTION, CliConstants.CARTRIDGE_FILTER_LONG_OPTION, true,
- "Filter");
+ "Filter - type of the cartridge");
filterOption.setArgName("filter");
options.addOption(filterOption);
@@ -46,9 +63,9 @@ public class ListCartridgesByFilterCommand implements Command<StratosCommandCont
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args != null && args.length > 0) {
@@ -60,21 +77,21 @@ public class ListCartridgesByFilterCommand implements Command<StratosCommandCont
try {
commandLine = parser.parse(options, args);
//merge newly discovered options with previously discovered ones.
- Options opts = mergeOptionArrays(already_parsed_opts, commandLine.getOptions());
+ Options opts = mergeOptionArrays(alreadyParsedOpts, commandLine.getOptions());
- if (logger.isDebugEnabled()) {
- logger.debug("List cartridges by a filter");
+ if (log.isDebugEnabled()) {
+ log.debug("List cartridges by a filter");
}
if (opts.hasOption(CliConstants.CARTRIDGE_FILTER_OPTION)) {
- if (logger.isTraceEnabled()) {
- logger.trace("Filter option is passed");
+ if (log.isTraceEnabled()) {
+ log.trace("Filter option is passed");
}
filter = opts.getOption(CliConstants.CARTRIDGE_FILTER_OPTION).getValue();
}
if (filter == null) {
- System.out.println("usage: " + getName() + "usage: " + getName() + " [-f <filter>]");
+ context.getStratosApplication().printUsage(getName());
return CliConstants.COMMAND_FAILED;
}
@@ -82,8 +99,8 @@ public class ListCartridgesByFilterCommand implements Command<StratosCommandCont
return CliConstants.COMMAND_SUCCESSFULL;
} catch (ParseException e) {
- if (logger.isErrorEnabled()) {
- logger.error("Error parsing arguments", e);
+ if (log.isErrorEnabled()) {
+ log.error("Error parsing arguments", e);
}
System.out.println(e.getMessage());
return CliConstants.COMMAND_FAILED;
http://git-wip-us.apache.org/repos/asf/stratos/blob/11e1c8a6/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java
index f998d89..8272fec 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCartridgesCommand.java
@@ -30,7 +30,7 @@ import org.apache.stratos.cli.utils.CliConstants;
public class ListCartridgesCommand implements Command<StratosCommandContext> {
- private static final Logger logger = LoggerFactory.getLogger(ListCartridgesCommand.class);
+ private static final Logger log = LoggerFactory.getLogger(ListCartridgesCommand.class);
public ListCartridgesCommand() {
}
@@ -47,9 +47,9 @@ public class ListCartridgesCommand implements Command<StratosCommandContext> {
return null;
}
- public int execute(StratosCommandContext context, String[] args, Option[] already_parsed_opts) throws CommandException {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing {} command...", getName());
+ public int execute(StratosCommandContext context, String[] args, Option[] alreadyParsedOpts) throws CommandException {
+ if (log.isDebugEnabled()) {
+ log.debug("Executing {} command...", getName());
}
if (args == null || args.length == 0) {
RestCommandLineService.getInstance().listCartridges();