Change package

adrienlauer · adrienlauer · commit 451d006e3946 · 2016-10-14T12:32:44.000+02:00
diff --git a/src/it/java/org/seedstack/shell/ConnectionIT.java b/src/it/java/org/seedstack/shell/ConnectionIT.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell;
+package org.seedstack.shell;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.connection.channel.direct.Session;
diff --git a/src/it/java/org/seedstack/shell/ShellIT.java b/src/it/java/org/seedstack/shell/ShellIT.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell;
+package org.seedstack.shell;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.connection.channel.direct.Session;
diff --git a/src/it/java/org/seedstack/shell/internal/commands/AllowedSecuredTestCommand.java b/src/it/java/org/seedstack/shell/internal/commands/AllowedSecuredTestCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import org.seedstack.seed.security.RequiresRoles;
 import org.seedstack.seed.spi.command.Command;
diff --git a/src/it/java/org/seedstack/shell/internal/commands/CollectionTestCommand.java b/src/it/java/org/seedstack/shell/internal/commands/CollectionTestCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import org.seedstack.seed.spi.command.Command;
 import org.seedstack.seed.spi.command.CommandDefinition;
diff --git a/src/it/java/org/seedstack/shell/internal/commands/DeniedSecuredTestCommand.java b/src/it/java/org/seedstack/shell/internal/commands/DeniedSecuredTestCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import org.seedstack.seed.security.RequiresRoles;
 import org.seedstack.seed.spi.command.Command;
diff --git a/src/it/java/org/seedstack/shell/internal/commands/ErroneousTestCommand.java b/src/it/java/org/seedstack/shell/internal/commands/ErroneousTestCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import org.seedstack.seed.spi.command.Command;
 import org.seedstack.seed.spi.command.CommandDefinition;
diff --git a/src/it/java/org/seedstack/shell/internal/commands/WithOptionsTestCommand.java b/src/it/java/org/seedstack/shell/internal/commands/WithOptionsTestCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import org.seedstack.seed.spi.command.Command;
 import org.seedstack.seed.spi.command.CommandDefinition;
diff --git a/src/main/java/org/seedstack/shell/ShellConfig.java b/src/main/java/org/seedstack/shell/ShellConfig.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell;
+package org.seedstack.shell;
 
 
 import org.seedstack.coffig.Config;
diff --git a/src/main/java/org/seedstack/shell/internal/AbstractShell.java b/src/main/java/org/seedstack/shell/internal/AbstractShell.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
 import com.google.common.base.Strings;
 import org.apache.commons.cli.CommandLine;
@@ -16,7 +16,7 @@
 import org.apache.commons.cli.ParseException;
 import org.apache.sshd.server.ExitCallback;
 import org.seedstack.seed.CommandRegistry;
-import org.seedstack.shed.exception.SeedException;
+import org.seedstack.seed.SeedException;
 import org.seedstack.seed.spi.command.Command;
 
 import javax.inject.Inject;
diff --git a/src/main/java/org/seedstack/shell/internal/CRLFOutputStream.java b/src/main/java/org/seedstack/shell/internal/CRLFOutputStream.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
 import java.io.FilterOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/org/seedstack/shell/internal/InteractiveShell.java b/src/main/java/org/seedstack/shell/internal/InteractiveShell.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
 import com.google.common.base.Strings;
 import jline.Terminal;
@@ -18,7 +18,7 @@
 import org.apache.sshd.server.Environment;
 import org.fusesource.jansi.Ansi;
 import org.seedstack.seed.Application;
-import org.seedstack.shed.exception.SeedException;
+import org.seedstack.seed.SeedException;
 import org.seedstack.seed.spi.command.Command;
 import org.seedstack.seed.spi.command.PrettyCommand;
 import org.slf4j.Logger;
diff --git a/src/main/java/org/seedstack/shell/internal/NonInteractiveShell.java b/src/main/java/org/seedstack/shell/internal/NonInteractiveShell.java
@@ -5,15 +5,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
 
 import com.google.common.collect.Lists;
 import com.google.inject.assistedinject.Assisted;
 import org.apache.shiro.concurrent.SubjectAwareExecutorService;
 import org.apache.shiro.util.ThreadContext;
 import org.apache.sshd.server.Environment;
-import org.seedstack.seed.shell.internal.commands.JsonCommand;
+import org.seedstack.shell.internal.commands.JsonCommand;
 import org.seedstack.seed.spi.command.Command;
 import org.seedstack.seed.spi.command.StreamCommand;
 
diff --git a/src/main/java/org/seedstack/shell/internal/OutputMode.java b/src/main/java/org/seedstack/shell/internal/OutputMode.java
@@ -5,10 +5,10 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
-import org.seedstack.seed.shell.internal.commands.JsonCommand;
-import org.seedstack.seed.shell.internal.commands.StrCommand;
+import org.seedstack.shell.internal.commands.JsonCommand;
+import org.seedstack.shell.internal.commands.StrCommand;
 import org.seedstack.seed.spi.command.Command;
 
 enum OutputMode {
diff --git a/src/main/java/org/seedstack/shell/internal/RemoteTerminal.java b/src/main/java/org/seedstack/shell/internal/RemoteTerminal.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
 import jline.TerminalSupport;
 
diff --git a/src/main/java/org/seedstack/shell/internal/ShellErrorCode.java b/src/main/java/org/seedstack/shell/internal/ShellErrorCode.java
@@ -5,17 +5,16 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
-import org.seedstack.shed.exception.ErrorCode;
+import org.seedstack.seed.ErrorCode;
 
 enum ShellErrorCode implements ErrorCode {
-    MODE_SYNTAX_ERROR,
-    ILLEGAL_MODE,
-    ILLEGAL_MODE_OPTION,
     COMMAND_PARSING_ERROR,
     COMMAND_SYNTAX_ERROR,
-    COMMAND_PREPARATION_ERROR,
-    OPTIONS_SYNTAX_ERROR,
-    UNKNOWN_KEY_TYPE, MISSING_COMMAND
+    ILLEGAL_MODE,
+    ILLEGAL_MODE_OPTION,
+    MISSING_COMMAND,
+    MODE_SYNTAX_ERROR,
+    OPTIONS_SYNTAX_ERROR
 }
diff --git a/src/main/java/org/seedstack/shell/internal/ShellFactory.java b/src/main/java/org/seedstack/shell/internal/ShellFactory.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
 interface ShellFactory {
     /**
diff --git a/src/main/java/org/seedstack/shell/internal/ShellModule.java b/src/main/java/org/seedstack/shell/internal/ShellModule.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
diff --git a/src/main/java/org/seedstack/shell/internal/ShellPlugin.java b/src/main/java/org/seedstack/shell/internal/ShellPlugin.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
 import com.google.inject.Module;
 import io.nuun.kernel.api.plugin.InitState;
@@ -26,7 +26,7 @@
 import org.seedstack.seed.core.internal.AbstractSeedPlugin;
 import org.seedstack.seed.security.internal.SecurityGuiceConfigurer;
 import org.seedstack.seed.security.internal.SecurityProvider;
-import org.seedstack.seed.shell.ShellConfig;
+import org.seedstack.shell.ShellConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/seedstack/shell/internal/ShellSecurityModule.java b/src/main/java/org/seedstack/shell/internal/ShellSecurityModule.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal;
+package org.seedstack.shell.internal;
 
 import com.google.inject.name.Names;
 import org.apache.shiro.guice.ShiroModule;
diff --git a/src/main/java/org/seedstack/shell/internal/commands/CountCommand.java b/src/main/java/org/seedstack/shell/internal/commands/CountCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import org.seedstack.seed.spi.command.Command;
 import org.seedstack.seed.spi.command.CommandDefinition;
diff --git a/src/main/java/org/seedstack/shell/internal/commands/GetCommand.java b/src/main/java/org/seedstack/shell/internal/commands/GetCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.seedstack.seed.spi.command.Argument;
diff --git a/src/main/java/org/seedstack/shell/internal/commands/JsonCommand.java b/src/main/java/org/seedstack/shell/internal/commands/JsonCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/src/main/java/org/seedstack/shell/internal/commands/PropertiesCommand.java b/src/main/java/org/seedstack/shell/internal/commands/PropertiesCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import org.seedstack.seed.spi.command.Command;
 import org.seedstack.seed.spi.command.CommandDefinition;
diff --git a/src/main/java/org/seedstack/shell/internal/commands/StrCommand.java b/src/main/java/org/seedstack/shell/internal/commands/StrCommand.java
@@ -5,7 +5,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.seedstack.seed.spi.command.Argument;
diff --git a/src/main/java/org/seedstack/shell/internal/commands/package-info.java b/src/main/java/org/seedstack/shell/internal/commands/package-info.java
@@ -8,4 +8,4 @@
 /**
  * Provides commands for the Shell.
  */
-package org.seedstack.seed.shell.internal.commands;
+package org.seedstack.shell.internal.commands;
diff --git a/src/main/resources/META-INF/errors/org.seedstack.seed.shell.internal.ShellErrorCode.properties b/src/main/resources/META-INF/errors/org.seedstack.seed.shell.internal.ShellErrorCode.properties
diff --git a/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin b/src/main/resources/META-INF/services/io.nuun.kernel.api.Plugin
@@ -1 +1 @@
-org.seedstack.seed.shell.internal.ShellPlugin
+org.seedstack.shell.internal.ShellPlugin
diff --git a/src/main/resources/org/seedstack/shell/internal/ShellErrorCode.properties b/src/main/resources/org/seedstack/shell/internal/ShellErrorCode.properties
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+COMMAND_PARSING_ERROR=Unable to parse the command.
+COMMAND_PARSING_ERROR.fix=Make sure the command starts with [scope:]name and try again.
+COMMAND_SYNTAX_ERROR=Syntax error when parsing ${value}.
+COMMAND_SYNTAX_ERROR.fix=Try correcting command arguments and options and try again.
+ILLEGAL_MODE=Illegal mode. Supported modes are: ${supportedModes}.
+ILLEGAL_MODE_OPTION=Illegal mode option. Supported options are: ${supportedOptions}.
+MISSING_COMMAND=Missing command.
+MODE_SYNTAX_ERROR=Syntax error when parsing ${value}.
+MODE_SYNTAX_ERROR.fix=Syntax for altering mode is: set mode_name [mode_value].
+OPTIONS_SYNTAX_ERROR=Syntax error in command options.
