You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2013/07/23 15:47:00 UTC
git commit: Apache Stratos CLI - Renamed to org.apache.stratos.cli
Updated Branches:
refs/heads/master 4f790fe52 -> ba618741f
Apache Stratos CLI - Renamed to org.apache.stratos.cli
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ba618741
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ba618741
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ba618741
Branch: refs/heads/master
Commit: ba618741fd73da97f07ebf8a34d9a8a86875b9a3
Parents: 4f790fe
Author: Isuru Perera <is...@apache.org>
Authored: Tue Jul 23 19:16:44 2013 +0530
Committer: Isuru Perera <is...@apache.org>
Committed: Tue Jul 23 19:16:44 2013 +0530
----------------------------------------------------------------------
components/org.apache.stratos.cli/pom.xml | 8 ++---
.../java/org/apache/stratos/cli/CliTool.java | 4 +--
.../java/org/apache/stratos/cli/Command.java | 6 ++--
.../org/apache/stratos/cli/CommandContext.java | 2 +-
.../stratos/cli/CommandLineApplication.java | 4 +--
.../apache/stratos/cli/CommandLineService.java | 8 ++---
.../apache/stratos/cli/StratosApplication.java | 34 ++++++++++----------
.../stratos/cli/StratosCommandContext.java | 2 +-
.../cli/commands/AddDomainMappingCommand.java | 12 +++----
.../stratos/cli/commands/CartridgesCommand.java | 12 +++----
.../stratos/cli/commands/ExitCommand.java | 10 +++---
.../stratos/cli/commands/HelpCommand.java | 10 +++---
.../stratos/cli/commands/InfoCommand.java | 12 +++----
.../stratos/cli/commands/ListCommand.java | 12 +++----
.../stratos/cli/commands/PoliciesCommand.java | 12 +++----
.../commands/RemoveDomainMappingCommand.java | 12 +++----
.../stratos/cli/commands/SubscribeCommand.java | 12 +++----
.../stratos/cli/commands/SyncCommand.java | 12 +++----
.../cli/commands/UnsubscribeCommand.java | 12 +++----
.../stratos/cli/completer/CommandCompleter.java | 10 +++---
.../stratos/cli/exception/CommandException.java | 2 +-
.../apache/stratos/cli/utils/CliConstants.java | 6 ++--
.../stratos/cli/utils/CommandLineUtils.java | 2 +-
.../org/apache/stratos/cli/utils/RowMapper.java | 2 +-
components/pom.xml | 3 +-
products/stratos_cli/distribution/pom.xml | 6 ++--
.../distribution/src/main/assembly/bin.xml | 4 +--
.../distribution/src/main/bin/stratos.bat | 4 +--
.../distribution/src/main/bin/stratos.sh | 2 +-
products/stratos_cli/pom.xml | 4 +--
30 files changed, 121 insertions(+), 120 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/pom.xml b/components/org.apache.stratos.cli/pom.xml
index effe542..136818f 100644
--- a/components/org.apache.stratos.cli/pom.xml
+++ b/components/org.apache.stratos.cli/pom.xml
@@ -27,10 +27,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.stratos.adc.mgt.cli</artifactId>
+ <artifactId>org.apache.stratos.cli</artifactId>
<packaging>jar</packaging>
- <name>Apache Stratos - ADC Management CLI</name>
- <description>ADC management CLI bundle</description>
+ <name>Apache Stratos - CLI</name>
+ <description>Apache Stratos CLI</description>
<url>http://apache.org</url>
<properties>
@@ -109,7 +109,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>org.apache.stratos.adc.mgt.cli.CliTool</mainClass>
+ <mainClass>org.apache.stratos.cli.CliTool</mainClass>
</manifest>
</archive>
<descriptors>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CliTool.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CliTool.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CliTool.java
index 4a824a4..d0dd7de 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CliTool.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CliTool.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli;
+package org.apache.stratos.cli;
-import static org.apache.stratos.adc.mgt.cli.utils.CliConstants.STRATOS_DIR;
+import static org.apache.stratos.cli.utils.CliConstants.STRATOS_DIR;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
index caebaa4..91338d3 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/Command.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli;
+package org.apache.stratos.cli;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
+import org.apache.stratos.cli.exception.CommandException;
import org.apache.commons.cli.Options;
public interface Command<T extends CommandContext> {
@@ -59,7 +59,7 @@ public interface Command<T extends CommandContext> {
* @param args
* The arguments for the command
* @return The status code
- * @throws org.apache.stratos.adc.mgt.cli.exception.CommandException
+ * @throws org.apache.stratos.cli.exception.CommandException
* if any errors occur when executing the command
*/
int execute(T context, String[] args) throws CommandException;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandContext.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandContext.java
index 745b2f4..cf677c4 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandContext.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli;
+package org.apache.stratos.cli;
import java.util.HashMap;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java
index 010948f..c0c2dce 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineApplication.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli;
+package org.apache.stratos.cli;
import java.io.File;
import java.io.IOException;
@@ -24,7 +24,7 @@ import java.io.IOException;
import jline.console.ConsoleReader;
import jline.console.history.FileHistory;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.utils.CliConstants;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java
index 2aa9f2b..a31b4ea 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/CommandLineService.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli;
+package org.apache.stratos.cli;
import java.rmi.RemoteException;
import java.util.ArrayList;
@@ -40,9 +40,6 @@ import org.apache.axis2.transport.http.HttpTransportProperties;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
-import org.apache.stratos.adc.mgt.cli.utils.CommandLineUtils;
-import org.apache.stratos.adc.mgt.cli.utils.RowMapper;
import org.apache.stratos.adc.mgt.dto.xsd.Cartridge;
import org.apache.stratos.adc.mgt.dto.xsd.PolicyDefinition;
import org.apache.stratos.adc.mgt.dto.xsd.SubscriptionInfo;
@@ -59,6 +56,9 @@ import org.apache.stratos.adc.mgt.stub.ApplicationManagementServiceRepositoryReq
import org.apache.stratos.adc.mgt.stub.ApplicationManagementServiceRepositoryTransportExceptionException;
import org.apache.stratos.adc.mgt.stub.ApplicationManagementServiceStub;
import org.apache.stratos.adc.mgt.stub.ApplicationManagementServiceUnregisteredCartridgeExceptionException;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CommandLineUtils;
+import org.apache.stratos.cli.utils.RowMapper;
import com.google.gson.Gson;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
index 74caf39..97e1844 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosApplication.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli;
+package org.apache.stratos.cli;
-import static org.apache.stratos.adc.mgt.cli.utils.CliConstants.STRATOS_DIR;
-import static org.apache.stratos.adc.mgt.cli.utils.CliConstants.STRATOS_HISTORY_DIR;
+import static org.apache.stratos.cli.utils.CliConstants.STRATOS_DIR;
+import static org.apache.stratos.cli.utils.CliConstants.STRATOS_HISTORY_DIR;
import java.io.File;
import java.io.PrintWriter;
@@ -28,8 +28,6 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.stratos.adc.mgt.cli.completer.CommandCompleter;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
@@ -44,18 +42,20 @@ import org.apache.log4j.Level;
import org.apache.log4j.LogManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.commands.AddDomainMappingCommand;
-import org.apache.stratos.adc.mgt.cli.commands.CartridgesCommand;
-import org.apache.stratos.adc.mgt.cli.commands.ExitCommand;
-import org.apache.stratos.adc.mgt.cli.commands.HelpCommand;
-import org.apache.stratos.adc.mgt.cli.commands.InfoCommand;
-import org.apache.stratos.adc.mgt.cli.commands.ListCommand;
-import org.apache.stratos.adc.mgt.cli.commands.PoliciesCommand;
-import org.apache.stratos.adc.mgt.cli.commands.RemoveDomainMappingCommand;
-import org.apache.stratos.adc.mgt.cli.commands.SubscribeCommand;
-import org.apache.stratos.adc.mgt.cli.commands.SyncCommand;
-import org.apache.stratos.adc.mgt.cli.commands.UnsubscribeCommand;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.commands.AddDomainMappingCommand;
+import org.apache.stratos.cli.commands.CartridgesCommand;
+import org.apache.stratos.cli.commands.ExitCommand;
+import org.apache.stratos.cli.commands.HelpCommand;
+import org.apache.stratos.cli.commands.InfoCommand;
+import org.apache.stratos.cli.commands.ListCommand;
+import org.apache.stratos.cli.commands.PoliciesCommand;
+import org.apache.stratos.cli.commands.RemoveDomainMappingCommand;
+import org.apache.stratos.cli.commands.SubscribeCommand;
+import org.apache.stratos.cli.commands.SyncCommand;
+import org.apache.stratos.cli.commands.UnsubscribeCommand;
+import org.apache.stratos.cli.completer.CommandCompleter;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class StratosApplication extends CommandLineApplication<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosCommandContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosCommandContext.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosCommandContext.java
index e4f7652..8a8459c 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosCommandContext.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/StratosCommandContext.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli;
+package org.apache.stratos.cli;
public class StratosCommandContext extends CommandContext {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java
index fe25f02..daafc61 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/AddDomainMappingCommand.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
import org.apache.commons.cli.Options;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.CommandLineService;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.CommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class AddDomainMappingCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgesCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgesCommand.java
index fc7461f..ec4c2d6 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgesCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/CartridgesCommand.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.CommandLineService;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.CommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class CartridgesCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/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 e0ff8c3..646b685 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
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class ExitCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/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 ca74687..0593b4e 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
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class HelpCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/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 a4ac08e..d3c071a 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
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.CommandLineService;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.CommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class InfoCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCommand.java
index 1b96182..d5eb79e 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/ListCommand.java
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
@@ -28,9 +26,11 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.CommandLineService;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.CommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class ListCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java
index 4811efd..b63f400 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/PoliciesCommand.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.CommandLineService;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.CommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class PoliciesCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
index a3b4cc0..06e6b11 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/RemoveDomainMappingCommand.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.CommandLineService;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.CommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/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 90908e9..40a75ea 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
@@ -16,12 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.CommandLineService;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
@@ -31,7 +27,11 @@ import org.apache.commons.cli.ParseException;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.CommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class SubscribeCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java
index 6e21a4d..7c32a27 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/SyncCommand.java
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
import org.apache.commons.cli.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.CommandLineService;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.CommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class SyncCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java
index 9b178e4..9979340 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/commands/UnsubscribeCommand.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.commands;
+package org.apache.stratos.cli.commands;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
@@ -26,11 +26,11 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.CommandLineService;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.exception.CommandException;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.CommandLineService;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.exception.CommandException;
+import org.apache.stratos.cli.utils.CliConstants;
public class UnsubscribeCommand implements Command<StratosCommandContext> {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/completer/CommandCompleter.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/completer/CommandCompleter.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/completer/CommandCompleter.java
index 3405762..4f7eb09 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/completer/CommandCompleter.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/completer/CommandCompleter.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.completer;
+package org.apache.stratos.cli.completer;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,10 +34,10 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.text.StrTokenizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stratos.adc.mgt.cli.Command;
-import org.apache.stratos.adc.mgt.cli.StratosApplication;
-import org.apache.stratos.adc.mgt.cli.StratosCommandContext;
-import org.apache.stratos.adc.mgt.cli.utils.CliConstants;
+import org.apache.stratos.cli.Command;
+import org.apache.stratos.cli.StratosApplication;
+import org.apache.stratos.cli.StratosCommandContext;
+import org.apache.stratos.cli.utils.CliConstants;
public class CommandCompleter implements Completer {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/exception/CommandException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/exception/CommandException.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/exception/CommandException.java
index a462500..cae002b 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/exception/CommandException.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/exception/CommandException.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.exception;
+package org.apache.stratos.cli.exception;
public class CommandException extends Exception {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/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 986bb72..a7e91ac 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
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.utils;
+package org.apache.stratos.cli.utils;
/**
* Constants for CLI Tool
@@ -94,10 +94,10 @@ public class CliConstants {
public static final String EXIT_ACTION = "exit";
public static final String REPO_URL_OPTION = "r";
- public static final String REPO_URL_LONG_OPTION = "repoURL";
+ public static final String REPO_URL_LONG_OPTION = "repo-url";
public static final String PRIVATE_REPO_OPTION = "i";
- public static final String PRIVATE_REPO_LONG_OPTION = "privateRepo";
+ public static final String PRIVATE_REPO_LONG_OPTION = "private-repo";
public static final String USERNAME_OPTION = "u";
public static final String USERNAME_LONG_OPTION = "username";
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java
index c6167f2..91e2251 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/CommandLineUtils.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.utils;
+package org.apache.stratos.cli.utils;
import java.text.MessageFormat;
import java.util.ResourceBundle;
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/RowMapper.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/RowMapper.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/RowMapper.java
index 0a61ad7..7c3dd98 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/RowMapper.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/utils/RowMapper.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.adc.mgt.cli.utils;
+package org.apache.stratos.cli.utils;
public interface RowMapper<T> {
String[] getData(T t);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/components/pom.xml
----------------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index d51027f..bec3e4f 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -53,8 +53,9 @@
<module>org.apache.stratos.adc.topology.mgt</module>
<module>org.apache.stratos.adc.mgt</module>
<module>org.apache.stratos.adc.mgt.repository.synchronizer</module>
- <module>org.apache.stratos.adc.mgt.cli</module>
<module>org.apache.stratos.deployment</module>
+ <!-- CLI -->
+ <module>org.apache.stratos.cli</module>
<!-- ELB -->
<module>org.apache.stratos.lb.common</module>
<module>org.apache.stratos.lb.endpoint</module>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/products/stratos_cli/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/pom.xml b/products/stratos_cli/distribution/pom.xml
index 3735548..ee37542 100644
--- a/products/stratos_cli/distribution/pom.xml
+++ b/products/stratos_cli/distribution/pom.xml
@@ -21,16 +21,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.stratos</groupId>
- <artifactId>apache-s2cli-parent</artifactId>
+ <artifactId>apache-stratos-cli-parent</artifactId>
<version>3.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>apaches2cli</artifactId>
+ <artifactId>apache-stratos-cli</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - CLI</name>
- <url>http://apache.org/cloud/stratos/</url>
+ <url>http://apache.org/</url>
<description>Apache Stratos CLI Distribution</description>
<profiles>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/products/stratos_cli/distribution/src/main/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/assembly/bin.xml b/products/stratos_cli/distribution/src/main/assembly/bin.xml
index 1f8b1cc..a3bf082 100644
--- a/products/stratos_cli/distribution/src/main/assembly/bin.xml
+++ b/products/stratos_cli/distribution/src/main/assembly/bin.xml
@@ -25,10 +25,10 @@
<fileSets>
<fileSet>
- <directory>../../../../../components/stratos/artifact-deployment-coordinator/org.apache.stratos.adc.mgt.cli/3.0.0-SNAPSHOT/target</directory>
+ <directory>../../../components/org.apache.stratos.cli/target</directory>
<outputDirectory>${pom.artifactId}-${pom.version}</outputDirectory>
<includes>
- <include>org.apache.stratos.adc.mgt.cli-3.0.0-SNAPSHOT-Tool.jar</include>
+ <include>org.apache.stratos.cli-${pom.version}-Tool.jar</include>
</includes>
</fileSet>
<fileSet>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/products/stratos_cli/distribution/src/main/bin/stratos.bat
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/bin/stratos.bat b/products/stratos_cli/distribution/src/main/bin/stratos.bat
index c7aad09..9bf9523 100644
--- a/products/stratos_cli/distribution/src/main/bin/stratos.bat
+++ b/products/stratos_cli/distribution/src/main/bin/stratos.bat
@@ -17,7 +17,7 @@ rem KIND, either express or implied. See the License for the
rem specific language governing permissions and limitations
rem under the License.
rem ---------------------------------------------------------------------------
-rem Main Script for WSO2 Carbon
+rem Main Script for Apache Stratos CLI
rem
rem Environment Variable Prequisites
rem
@@ -32,5 +32,5 @@ if "%STRATOS_CLI_HOME%"=="" set STRATOS_CLI_HOME=%CD%
cd %STRATOS_CLI_HOME%
-java -jar "org.apache.stratos.adc.mgt.cli-3.0.0-SNAPSHOT-Tool.jar" %*
+java -jar "org.apache.stratos.cli-3.0.0-SNAPSHOT-Tool.jar" %*
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/products/stratos_cli/distribution/src/main/bin/stratos.sh
----------------------------------------------------------------------
diff --git a/products/stratos_cli/distribution/src/main/bin/stratos.sh b/products/stratos_cli/distribution/src/main/bin/stratos.sh
index 3ef1aae..7622f40 100755
--- a/products/stratos_cli/distribution/src/main/bin/stratos.sh
+++ b/products/stratos_cli/distribution/src/main/bin/stratos.sh
@@ -29,5 +29,5 @@ if [ -z $STRATOS_CLI_HOME ] ; then
STRATOS_CLI_HOME="$PWD"
fi
-java -jar $STRATOS_CLI_HOME/org.apache.stratos.mgt.cli-3.0.0-SNAPSHOT-Tool.jar $*
+java -jar $STRATOS_CLI_HOME/org.apache.stratos.cli-3.0.0-SNAPSHOT-Tool.jar $*
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ba618741/products/stratos_cli/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos_cli/pom.xml b/products/stratos_cli/pom.xml
index b21017b..db37994 100644
--- a/products/stratos_cli/pom.xml
+++ b/products/stratos_cli/pom.xml
@@ -29,10 +29,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>apache-s2cli-parent</artifactId>
+ <artifactId>apache-stratos-cli-parent</artifactId>
<packaging>pom</packaging>
<name>Apache Stratos - CLI - Distribution</name>
- <url>http://apache.org/cloud/stratos/</url>
+ <url>http://apache.org</url>
<description>Apache Stratos CLI</description>