From 61896ffe3757df03d5a6d4d8563d989ac6061e47 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 7 Jan 2022 10:40:42 +0100 Subject: [PATCH] Reintegrate CLI into CMS --- dep/org.argeo.slc.dep.minimal/pom.xml | 8 - .../src/org/argeo/cli/jcr/JcrCommands.java | 2 +- .../src/org/argeo/cli/jcr/JcrSync.java | 6 +- org.argeo.slc.runtime/pom.xml | 8 +- .../org/argeo/cli/CommandArgsException.java | 32 ---- .../argeo/cli/CommandRuntimeException.java | 35 ----- .../src/org/argeo/cli/CommandsCli.java | 131 ---------------- .../src/org/argeo/cli/DescribedCommand.java | 55 ------- .../src/org/argeo/cli/HelpCommand.java | 143 ------------------ .../src/org/argeo/cli/package-info.java | 2 - .../src/org/argeo/cli/posix/package-info.java | 2 - .../argeo/slc/{runtime => cli}/ArgeoCli.java | 8 +- .../org/argeo/{ => slc}/cli/fs/FileSync.java | 6 +- .../argeo/{ => slc}/cli/fs/FsCommands.java | 4 +- .../org/argeo/{ => slc}/cli/fs/PathSync.java | 2 +- .../{ => slc}/cli/fs/SyncFileVisitor.java | 2 +- .../argeo/{ => slc}/cli/fs/package-info.java | 2 +- .../org/argeo/{ => slc}/cli/posix/Echo.java | 4 +- .../{ => slc}/cli/posix/PosixCommands.java | 4 +- .../org/argeo/slc/cli/posix/package-info.java | 2 + 20 files changed, 28 insertions(+), 430 deletions(-) delete mode 100644 org.argeo.slc.runtime/src/org/argeo/cli/CommandArgsException.java delete mode 100644 org.argeo.slc.runtime/src/org/argeo/cli/CommandRuntimeException.java delete mode 100644 org.argeo.slc.runtime/src/org/argeo/cli/CommandsCli.java delete mode 100644 org.argeo.slc.runtime/src/org/argeo/cli/DescribedCommand.java delete mode 100644 org.argeo.slc.runtime/src/org/argeo/cli/HelpCommand.java delete mode 100644 org.argeo.slc.runtime/src/org/argeo/cli/package-info.java delete mode 100644 org.argeo.slc.runtime/src/org/argeo/cli/posix/package-info.java rename org.argeo.slc.runtime/src/org/argeo/slc/{runtime => cli}/ArgeoCli.java (82%) rename org.argeo.slc.runtime/src/org/argeo/{ => slc}/cli/fs/FileSync.java (96%) rename org.argeo.slc.runtime/src/org/argeo/{ => slc}/cli/fs/FsCommands.java (80%) rename org.argeo.slc.runtime/src/org/argeo/{ => slc}/cli/fs/PathSync.java (98%) rename org.argeo.slc.runtime/src/org/argeo/{ => slc}/cli/fs/SyncFileVisitor.java (95%) rename org.argeo.slc.runtime/src/org/argeo/{ => slc}/cli/fs/package-info.java (53%) rename org.argeo.slc.runtime/src/org/argeo/{ => slc}/cli/posix/Echo.java (92%) rename org.argeo.slc.runtime/src/org/argeo/{ => slc}/cli/posix/PosixCommands.java (84%) create mode 100644 org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/package-info.java diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml index 8c8a7d40c..2b4d6bb17 100644 --- a/dep/org.argeo.slc.dep.minimal/pom.xml +++ b/dep/org.argeo.slc.dep.minimal/pom.xml @@ -105,14 +105,6 @@ - - org.argeo.tp.apache.commons - org.apache.commons.exec - - - org.argeo.tp.apache.commons - org.apache.commons.cli - org.argeo.tp.apache.commons org.apache.commons.vfs diff --git a/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrCommands.java b/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrCommands.java index ea7467462..15830f842 100644 --- a/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrCommands.java +++ b/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrCommands.java @@ -1,6 +1,6 @@ package org.argeo.cli.jcr; -import org.argeo.cli.CommandsCli; +import org.argeo.cms.cli.CommandsCli; /** File utilities. */ public class JcrCommands extends CommandsCli { diff --git a/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrSync.java b/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrSync.java index 401f447c9..53ea25940 100644 --- a/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrSync.java +++ b/org.argeo.slc.jcr/src/org/argeo/cli/jcr/JcrSync.java @@ -20,9 +20,9 @@ import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.config.RepositoryConfig; -import org.argeo.cli.CommandArgsException; -import org.argeo.cli.CommandRuntimeException; -import org.argeo.cli.DescribedCommand; +import org.argeo.cms.cli.CommandArgsException; +import org.argeo.cms.cli.CommandRuntimeException; +import org.argeo.cms.cli.DescribedCommand; import org.argeo.jackrabbit.client.ClientDavexRepositoryFactory; import org.argeo.jcr.JcrUtils; import org.argeo.sync.SyncResult; diff --git a/org.argeo.slc.runtime/pom.xml b/org.argeo.slc.runtime/pom.xml index 8ae2f9918..a8805e23c 100644 --- a/org.argeo.slc.runtime/pom.xml +++ b/org.argeo.slc.runtime/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 org.argeo.slc @@ -16,10 +18,12 @@ 2.3-SNAPSHOT + org.argeo.commons - org.argeo.api + org.argeo.cms ${version.argeo-commons} + \ No newline at end of file diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/CommandArgsException.java b/org.argeo.slc.runtime/src/org/argeo/cli/CommandArgsException.java deleted file mode 100644 index d7a615a8e..000000000 --- a/org.argeo.slc.runtime/src/org/argeo/cli/CommandArgsException.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.argeo.cli; - -public class CommandArgsException extends IllegalArgumentException { - private static final long serialVersionUID = -7271050747105253935L; - private String commandName; - private volatile CommandsCli commandsCli; - - public CommandArgsException(Exception cause) { - super(cause.getMessage(), cause); - } - - public CommandArgsException(String message) { - super(message); - } - - public String getCommandName() { - return commandName; - } - - public void setCommandName(String commandName) { - this.commandName = commandName; - } - - public CommandsCli getCommandsCli() { - return commandsCli; - } - - public void setCommandsCli(CommandsCli commandsCli) { - this.commandsCli = commandsCli; - } - -} diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/CommandRuntimeException.java b/org.argeo.slc.runtime/src/org/argeo/cli/CommandRuntimeException.java deleted file mode 100644 index 68b9a18cf..000000000 --- a/org.argeo.slc.runtime/src/org/argeo/cli/CommandRuntimeException.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.argeo.cli; - -import java.util.List; - -/** {@link RuntimeException} referring during a command run. */ -public class CommandRuntimeException extends RuntimeException { - private static final long serialVersionUID = 5595999301269377128L; - - private final DescribedCommand command; - private final List arguments; - - public CommandRuntimeException(Throwable e, DescribedCommand command, List arguments) { - this(null, e, command, arguments); - } - - public CommandRuntimeException(String message, DescribedCommand command, List arguments) { - this(message, null, command, arguments); - } - - public CommandRuntimeException(String message, Throwable e, DescribedCommand command, List arguments) { - super(message == null ? "(" + command.getClass().getName() + " " + arguments.toString() + ")" - : message + " (" + command.getClass().getName() + " " + arguments.toString() + ")", e); - this.command = command; - this.arguments = arguments; - } - - public DescribedCommand getCommand() { - return command; - } - - public List getArguments() { - return arguments; - } - -} diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/CommandsCli.java b/org.argeo.slc.runtime/src/org/argeo/cli/CommandsCli.java deleted file mode 100644 index b0879f0a4..000000000 --- a/org.argeo.slc.runtime/src/org/argeo/cli/CommandsCli.java +++ /dev/null @@ -1,131 +0,0 @@ -package org.argeo.cli; - -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeMap; -import java.util.function.Function; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.CommandLineParser; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; - -/** Base class for a CLI managing sub commands. */ -public abstract class CommandsCli implements DescribedCommand { - public final static String HELP = "help"; - - private final String commandName; - private Map, ?>> commands = new TreeMap<>(); - - protected final Options options = new Options(); - - public CommandsCli(String commandName) { - this.commandName = commandName; - } - - @Override - public Object apply(List args) { - String cmd = null; - List newArgs = new ArrayList<>(); - try { - CommandLineParser clParser = new DefaultParser(); - CommandLine commonCl = clParser.parse(getOptions(), args.toArray(new String[args.size()]), true); - List leftOvers = commonCl.getArgList(); - for (String arg : leftOvers) { - if (!arg.startsWith("-") && cmd == null) { - cmd = arg; - } else { - newArgs.add(arg); - } - } - } catch (ParseException e) { - CommandArgsException cae = new CommandArgsException(e); - throw cae; - } - - Function, ?> function = cmd != null ? getCommand(cmd) : getDefaultCommand(); - if (function == null) - throw new IllegalArgumentException("Uknown command " + cmd); - try { - return function.apply(newArgs).toString(); - } catch (CommandArgsException e) { - if (e.getCommandName() == null) { - e.setCommandName(cmd); - e.setCommandsCli(this); - } - throw e; - } catch (IllegalArgumentException e) { - CommandArgsException cae = new CommandArgsException(e); - cae.setCommandName(cmd); - throw cae; - } - } - - @Override - public Options getOptions() { - return options; - } - - protected void addCommand(String cmd, Function, ?> function) { - commands.put(cmd, function); - - } - - @Override - public String getUsage() { - return "[command]"; - } - - protected void addCommandsCli(CommandsCli commandsCli) { - addCommand(commandsCli.getCommandName(), commandsCli); - commandsCli.addCommand(HELP, new HelpCommand(this, commandsCli)); - } - - public String getCommandName() { - return commandName; - } - - public Set getSubCommands() { - return commands.keySet(); - } - - public Function, ?> getCommand(String command) { - return commands.get(command); - } - - public HelpCommand getHelpCommand() { - return (HelpCommand) getCommand(HELP); - } - - public Function, String> getDefaultCommand() { - return getHelpCommand(); - } - - /** In order to implement quickly a main method. */ - public static void mainImpl(CommandsCli cli, String[] args) { - try { - cli.addCommand(CommandsCli.HELP, new HelpCommand(null, cli)); - Object output = cli.apply(Arrays.asList(args)); - System.out.println(output); - System.exit(0); - } catch (CommandArgsException e) { - System.err.println("Wrong arguments " + Arrays.toString(args) + ": " + e.getMessage()); - if (e.getCommandName() != null) { - StringWriter out = new StringWriter(); - HelpCommand.printHelp(e.getCommandsCli(), e.getCommandName(), out); - System.err.println(out.toString()); - } else { - e.printStackTrace(); - } - System.exit(1); - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - } -} diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/DescribedCommand.java b/org.argeo.slc.runtime/src/org/argeo/cli/DescribedCommand.java deleted file mode 100644 index 9587206b8..000000000 --- a/org.argeo.slc.runtime/src/org/argeo/cli/DescribedCommand.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.argeo.cli; - -import java.io.StringWriter; -import java.util.Arrays; -import java.util.List; -import java.util.function.Function; - -import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.DefaultParser; -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; - -/** A command that can be described. */ -public interface DescribedCommand extends Function, T> { - default Options getOptions() { - return new Options(); - } - - String getDescription(); - - default String getUsage() { - return null; - } - - default String getExamples() { - return null; - } - - default CommandLine toCommandLine(List args) { - try { - DefaultParser parser = new DefaultParser(); - return parser.parse(getOptions(), args.toArray(new String[args.size()])); - } catch (ParseException e) { - throw new CommandArgsException(e); - } - } - - /** In order to implement quickly a main method. */ - public static void mainImpl(DescribedCommand command, String[] args) { - try { - Object output = command.apply(Arrays.asList(args)); - System.out.println(output); - System.exit(0); - } catch (IllegalArgumentException e) { - StringWriter out = new StringWriter(); - HelpCommand.printHelp(command, out); - System.err.println(out.toString()); - System.exit(1); - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - -} diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/HelpCommand.java b/org.argeo.slc.runtime/src/org/argeo/cli/HelpCommand.java deleted file mode 100644 index 755ce599e..000000000 --- a/org.argeo.slc.runtime/src/org/argeo/cli/HelpCommand.java +++ /dev/null @@ -1,143 +0,0 @@ -package org.argeo.cli; - -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.List; -import java.util.function.Function; - -import org.apache.commons.cli.HelpFormatter; -import org.apache.commons.cli.Options; - -/** A special command that can describe {@link DescribedCommand}. */ -public class HelpCommand implements DescribedCommand { - private CommandsCli commandsCli; - private CommandsCli parentCommandsCli; - - // Help formatting - private static int helpWidth = 80; - private static int helpLeftPad = 4; - private static int helpDescPad = 20; - - public HelpCommand(CommandsCli parentCommandsCli, CommandsCli commandsCli) { - super(); - this.parentCommandsCli = parentCommandsCli; - this.commandsCli = commandsCli; - } - - @Override - public String apply(List args) { - StringWriter out = new StringWriter(); - - if (args.size() == 0) {// overview - printHelp(commandsCli, out); - } else { - String cmd = args.get(0); - Function, ?> function = commandsCli.getCommand(cmd); - if (function == null) - return "Command " + cmd + " not found."; - Options options; - String examples; - DescribedCommand command = null; - if (function instanceof DescribedCommand) { - command = (DescribedCommand) function; - options = command.getOptions(); - examples = command.getExamples(); - } else { - options = new Options(); - examples = null; - } - String description = getShortDescription(function); - String commandCall = getCommandUsage(cmd, command); - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp(new PrintWriter(out), helpWidth, commandCall, description, options, helpLeftPad, - helpDescPad, examples, false); - } - return out.toString(); - } - - private static String getShortDescription(Function, ?> function) { - if (function instanceof DescribedCommand) { - return ((DescribedCommand) function).getDescription(); - } else { - return function.toString(); - } - } - - public String getCommandUsage(String cmd, DescribedCommand command) { - String commandCall = getCommandCall(commandsCli) + " " + cmd; - assert command != null; - if (command != null && command.getUsage() != null) { - commandCall = commandCall + " " + command.getUsage(); - } - return commandCall; - } - - @Override - public String getDescription() { - return "Shows this help or describes a command"; - } - - @Override - public String getUsage() { - return "[command]"; - } - - public CommandsCli getParentCommandsCli() { - return parentCommandsCli; - } - - protected String getCommandCall(CommandsCli commandsCli) { - HelpCommand hc = commandsCli.getHelpCommand(); - if (hc.getParentCommandsCli() != null) { - return getCommandCall(hc.getParentCommandsCli()) + " " + commandsCli.getCommandName(); - } else { - return commandsCli.getCommandName(); - } - } - - public static void printHelp(DescribedCommand command, StringWriter out) { - String usage = "java " + command.getClass().getName() - + (command.getUsage() != null ? " " + command.getUsage() : ""); - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp(new PrintWriter(out), helpWidth, usage, command.getDescription(), command.getOptions(), - helpLeftPad, helpDescPad, command.getExamples(), false); - - } - - public static void printHelp(CommandsCli commandsCli, String commandName, StringWriter out) { - DescribedCommand command = (DescribedCommand) commandsCli.getCommand(commandName); - String usage = commandsCli.getHelpCommand().getCommandUsage(commandName, command); - HelpFormatter formatter = new HelpFormatter(); - formatter.printHelp(new PrintWriter(out), helpWidth, usage, command.getDescription(), command.getOptions(), - helpLeftPad, helpDescPad, command.getExamples(), false); - - } - - public static void printHelp(CommandsCli commandsCli, StringWriter out) { - out.append(commandsCli.getDescription()).append('\n'); - String leftPad = spaces(helpLeftPad); - for (String cmd : commandsCli.getSubCommands()) { - Function, ?> function = commandsCli.getCommand(cmd); - assert function != null; - out.append(leftPad); - out.append(cmd); - // TODO deal with long commands - out.append(spaces(helpDescPad - cmd.length())); - out.append(getShortDescription(function)); - out.append('\n'); - } - } - - private static String spaces(int count) { - // Java 11 - // return " ".repeat(count); - if (count <= 0) - return ""; - else { - StringBuilder sb = new StringBuilder(count); - for (int i = 0; i < count; i++) - sb.append(' '); - return sb.toString(); - } - } -} diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/package-info.java b/org.argeo.slc.runtime/src/org/argeo/cli/package-info.java deleted file mode 100644 index 23895935f..000000000 --- a/org.argeo.slc.runtime/src/org/argeo/cli/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Command line API. */ -package org.argeo.cli; \ No newline at end of file diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/posix/package-info.java b/org.argeo.slc.runtime/src/org/argeo/cli/posix/package-info.java deleted file mode 100644 index b0d1a46f9..000000000 --- a/org.argeo.slc.runtime/src/org/argeo/cli/posix/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Posix CLI commands. */ -package org.argeo.cli.posix; \ No newline at end of file diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ArgeoCli.java b/org.argeo.slc.runtime/src/org/argeo/slc/cli/ArgeoCli.java similarity index 82% rename from org.argeo.slc.runtime/src/org/argeo/slc/runtime/ArgeoCli.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cli/ArgeoCli.java index 21cca7547..b573a67b5 100644 --- a/org.argeo.slc.runtime/src/org/argeo/slc/runtime/ArgeoCli.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cli/ArgeoCli.java @@ -1,9 +1,9 @@ -package org.argeo.slc.runtime; +package org.argeo.slc.cli; import org.apache.commons.cli.Option; -import org.argeo.cli.CommandsCli; -import org.argeo.cli.fs.FsCommands; -import org.argeo.cli.posix.PosixCommands; +import org.argeo.cms.cli.CommandsCli; +import org.argeo.slc.cli.fs.FsCommands; +import org.argeo.slc.cli.posix.PosixCommands; /** Argeo command line tools. */ public class ArgeoCli extends CommandsCli { diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/fs/FileSync.java b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/FileSync.java similarity index 96% rename from org.argeo.slc.runtime/src/org/argeo/cli/fs/FileSync.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/FileSync.java index ba529eae2..308f04953 100644 --- a/org.argeo.slc.runtime/src/org/argeo/cli/fs/FileSync.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/FileSync.java @@ -1,4 +1,4 @@ -package org.argeo.cli.fs; +package org.argeo.slc.cli.fs; import java.net.URI; import java.net.URISyntaxException; @@ -9,8 +9,8 @@ import java.util.List; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; -import org.argeo.cli.CommandArgsException; -import org.argeo.cli.DescribedCommand; +import org.argeo.cms.cli.CommandArgsException; +import org.argeo.cms.cli.DescribedCommand; import org.argeo.sync.SyncResult; public class FileSync implements DescribedCommand> { diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/fs/FsCommands.java b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/FsCommands.java similarity index 80% rename from org.argeo.slc.runtime/src/org/argeo/cli/fs/FsCommands.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/FsCommands.java index c08ad0091..6df81f844 100644 --- a/org.argeo.slc.runtime/src/org/argeo/cli/fs/FsCommands.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/FsCommands.java @@ -1,6 +1,6 @@ -package org.argeo.cli.fs; +package org.argeo.slc.cli.fs; -import org.argeo.cli.CommandsCli; +import org.argeo.cms.cli.CommandsCli; /** File utilities. */ public class FsCommands extends CommandsCli { diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/fs/PathSync.java b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/PathSync.java similarity index 98% rename from org.argeo.slc.runtime/src/org/argeo/cli/fs/PathSync.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/PathSync.java index 9ab9cafad..e687d5689 100644 --- a/org.argeo.slc.runtime/src/org/argeo/cli/fs/PathSync.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/PathSync.java @@ -1,4 +1,4 @@ -package org.argeo.cli.fs; +package org.argeo.slc.cli.fs; import java.net.URI; import java.nio.file.FileSystems; diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/fs/SyncFileVisitor.java b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/SyncFileVisitor.java similarity index 95% rename from org.argeo.slc.runtime/src/org/argeo/cli/fs/SyncFileVisitor.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/SyncFileVisitor.java index 2d5def5c5..4d696eea2 100644 --- a/org.argeo.slc.runtime/src/org/argeo/cli/fs/SyncFileVisitor.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/SyncFileVisitor.java @@ -1,4 +1,4 @@ -package org.argeo.cli.fs; +package org.argeo.slc.cli.fs; import java.nio.file.Path; diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/fs/package-info.java b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/package-info.java similarity index 53% rename from org.argeo.slc.runtime/src/org/argeo/cli/fs/package-info.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/package-info.java index 8ad42b25d..8c61d93c6 100644 --- a/org.argeo.slc.runtime/src/org/argeo/cli/fs/package-info.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cli/fs/package-info.java @@ -1,2 +1,2 @@ /** File system CLI commands. */ -package org.argeo.cli.fs; \ No newline at end of file +package org.argeo.slc.cli.fs; \ No newline at end of file diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/posix/Echo.java b/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/Echo.java similarity index 92% rename from org.argeo.slc.runtime/src/org/argeo/cli/posix/Echo.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/Echo.java index 5746ebd0f..d773760bc 100644 --- a/org.argeo.slc.runtime/src/org/argeo/cli/posix/Echo.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/Echo.java @@ -1,11 +1,11 @@ -package org.argeo.cli.posix; +package org.argeo.slc.cli.posix; import java.util.List; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.Option; import org.apache.commons.cli.Options; -import org.argeo.cli.DescribedCommand; +import org.argeo.cms.cli.DescribedCommand; public class Echo implements DescribedCommand { diff --git a/org.argeo.slc.runtime/src/org/argeo/cli/posix/PosixCommands.java b/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/PosixCommands.java similarity index 84% rename from org.argeo.slc.runtime/src/org/argeo/cli/posix/PosixCommands.java rename to org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/PosixCommands.java index bb6af67b8..bb5920e55 100644 --- a/org.argeo.slc.runtime/src/org/argeo/cli/posix/PosixCommands.java +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/PosixCommands.java @@ -1,6 +1,6 @@ -package org.argeo.cli.posix; +package org.argeo.slc.cli.posix; -import org.argeo.cli.CommandsCli; +import org.argeo.cms.cli.CommandsCli; /** POSIX commands. */ public class PosixCommands extends CommandsCli { diff --git a/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/package-info.java b/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/package-info.java new file mode 100644 index 000000000..f6da26503 --- /dev/null +++ b/org.argeo.slc.runtime/src/org/argeo/slc/cli/posix/package-info.java @@ -0,0 +1,2 @@ +/** Posix CLI commands. */ +package org.argeo.slc.cli.posix; \ No newline at end of file -- 2.39.2