Repository: karaf Updated Branches: refs/heads/master 6e253c938 -> 3f078732d
KARAF-2772 Moving some util classes and test to simplify separation. Forgot some mods Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3f078732 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3f078732 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3f078732 Branch: refs/heads/master Commit: 3f078732de1676451a58e3b55f5ac0aeee62509c Parents: 6e253c9 Author: Christian Schneider <[email protected]> Authored: Fri Feb 21 14:24:30 2014 +0100 Committer: Christian Schneider <[email protected]> Committed: Fri Feb 21 14:24:30 2014 +0100 ---------------------------------------------------------------------- shell/console/pom.xml | 1 + .../felix/gogo/commands/CommandException.java | 2 +- .../commands/basic/DefaultActionPreparator.java | 15 ++-- .../karaf/shell/commands/CommandException.java | 3 +- .../karaf/shell/commands/ansi/SimpleAnsi.java | 2 +- .../commands/basic/DefaultActionPreparator.java | 17 +++-- .../shell/commands/meta/ActionMetaData.java | 78 +++++++++++++++++--- .../org/apache/karaf/shell/util/ShellUtil.java | 42 +---------- .../karaf/shell/commands/basic/Context.java | 2 +- .../shell/commands/basic/SimpleSubShell.java | 3 +- .../shell/commands/basic/TestCommands.java | 8 +- .../shell/commands/meta/TestFormatting.java | 7 +- .../shell/console/completer/CompletionTest.java | 4 +- .../shell/console/impl/ExampleSubclassMain.java | 2 +- 14 files changed, 113 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/pom.xml ---------------------------------------------------------------------- diff --git a/shell/console/pom.xml b/shell/console/pom.xml index 0e39177..f7bd2f5 100644 --- a/shell/console/pom.xml +++ b/shell/console/pom.xml @@ -163,6 +163,7 @@ org.apache.felix.service.threadio;version=${felix.gogo.version};status=provisional;mandatory:=status, </Export-Package> <Private-Package> + org.apache.karaf.shell.commands.ansi, org.apache.karaf.shell.console.impl*, org.apache.karaf.shell.security.impl*, org.apache.karaf.shell.inject.impl*, http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java b/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java index 01c652a..3c02d63 100644 --- a/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java +++ b/shell/console/src/main/java/org/apache/felix/gogo/commands/CommandException.java @@ -18,7 +18,7 @@ */ package org.apache.felix.gogo.commands; -import org.apache.karaf.shell.util.SimpleAnsi; +import org.apache.karaf.shell.commands.ansi.SimpleAnsi; /** * Base class for exceptions thrown when executing commands. http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java b/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java index e099294..6b7865e 100644 --- a/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java +++ b/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java @@ -18,10 +18,10 @@ */ package org.apache.felix.gogo.commands.basic; -import static org.apache.karaf.shell.util.SimpleAnsi.COLOR_DEFAULT; -import static org.apache.karaf.shell.util.SimpleAnsi.COLOR_RED; -import static org.apache.karaf.shell.util.SimpleAnsi.INTENSITY_BOLD; -import static org.apache.karaf.shell.util.SimpleAnsi.INTENSITY_NORMAL; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.COLOR_DEFAULT; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.COLOR_RED; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.INTENSITY_BOLD; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.INTENSITY_NORMAL; import java.io.IOException; import java.io.InputStream; @@ -45,7 +45,6 @@ import org.apache.felix.gogo.commands.converter.DefaultConverter; import org.apache.felix.gogo.commands.converter.GenericType; import org.apache.felix.service.command.CommandSession; import org.apache.karaf.shell.console.NameScoping; -import org.apache.karaf.shell.util.CommandSessionUtil; @Deprecated public class DefaultActionPreparator implements ActionPreparator { @@ -408,7 +407,7 @@ public class DefaultActionPreparator implements ActionPreparator { } } } - int width = CommandSessionUtil.getWidth(session); + int width = getWidth(session); out.println(INTENSITY_BOLD + "SYNTAX" + INTENSITY_NORMAL); out.print(" "); out.println(syntax.toString()); @@ -560,4 +559,8 @@ public class DefaultActionPreparator implements ActionPreparator { return new DefaultConverter(action.getClass().getClassLoader()).convert(value, toType); } + private int getWidth(CommandSession session) { + Object cols = session.get("COLUMNS"); + return (cols != null && cols instanceof Integer) ? (Integer)cols : 80; + } } http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandException.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandException.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandException.java index 7bcaad5..1ffa25d 100644 --- a/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandException.java +++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandException.java @@ -18,7 +18,8 @@ */ package org.apache.karaf.shell.commands; -import org.apache.karaf.shell.util.SimpleAnsi; +import org.apache.karaf.shell.commands.ansi.SimpleAnsi; + /** * Base class for exceptions thrown when executing commands. http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/main/java/org/apache/karaf/shell/commands/ansi/SimpleAnsi.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/ansi/SimpleAnsi.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/ansi/SimpleAnsi.java index b4dc23b..8437949 100644 --- a/shell/console/src/main/java/org/apache/karaf/shell/commands/ansi/SimpleAnsi.java +++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/ansi/SimpleAnsi.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.karaf.shell.util; +package org.apache.karaf.shell.commands.ansi; import org.fusesource.jansi.Ansi; import org.fusesource.jansi.Ansi.Color; http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java index baa0b43..3ad8d29 100644 --- a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java +++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/DefaultActionPreparator.java @@ -18,9 +18,10 @@ */ package org.apache.karaf.shell.commands.basic; -import static org.apache.karaf.shell.util.SimpleAnsi.COLOR_RED; -import static org.apache.karaf.shell.util.SimpleAnsi.INTENSITY_BOLD; -import static org.apache.karaf.shell.util.SimpleAnsi.INTENSITY_NORMAL; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.COLOR_DEFAULT; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.COLOR_RED; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.INTENSITY_BOLD; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.INTENSITY_NORMAL; import java.lang.reflect.Field; import java.lang.reflect.Type; @@ -43,8 +44,6 @@ import org.apache.karaf.shell.commands.converter.GenericType; import org.apache.karaf.shell.commands.meta.ActionMetaData; import org.apache.karaf.shell.commands.meta.ActionMetaDataFactory; import org.apache.karaf.shell.console.NameScoping; -import org.apache.karaf.shell.util.CommandSessionUtil; -import org.apache.karaf.shell.util.SimpleAnsi; public class DefaultActionPreparator implements ActionPreparator { @@ -63,11 +62,11 @@ public class DefaultActionPreparator implements ActionPreparator { String commandErrorSt = (command2 != null) ? COLOR_RED + "Error executing command " + command2.scope() + ":" + INTENSITY_BOLD + command2.name() + INTENSITY_NORMAL - + SimpleAnsi.COLOR_DEFAULT + ": " : ""; + + COLOR_DEFAULT + ": " : ""; for (Iterator<Object> it = params.iterator(); it.hasNext(); ) { Object param = it.next(); if (HelpOption.HELP.name().equals(param)) { - int termWidth = CommandSessionUtil.getWidth(session); + int termWidth = getWidth(session); boolean globalScope = NameScoping.isGlobalScope(session, actionMetaData.getCommand().scope()); actionMetaData.printUsage(action, System.out, globalScope, termWidth); return false; @@ -217,4 +216,8 @@ public class DefaultActionPreparator implements ActionPreparator { return new DefaultConverter(action.getClass().getClassLoader()).convert(value, toType); } + private int getWidth(CommandSession session) { + Object cols = session.get("COLUMNS"); + return (cols != null && cols instanceof Integer) ? (Integer)cols : 80; + } } http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java index 9fd5189..e0bd11a 100644 --- a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java +++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java @@ -18,10 +18,15 @@ */ package org.apache.karaf.shell.commands.meta; -import static org.apache.karaf.shell.util.SimpleAnsi.INTENSITY_BOLD; -import static org.apache.karaf.shell.util.SimpleAnsi.INTENSITY_NORMAL; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.INTENSITY_BOLD; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.INTENSITY_NORMAL; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.io.PrintStream; +import java.io.Reader; +import java.io.StringWriter; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.Collections; @@ -30,16 +35,16 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.apache.felix.gogo.commands.Action; import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.commands.HelpOption; import org.apache.karaf.shell.commands.Option; +import org.apache.karaf.shell.commands.ansi.SimpleAnsi; import org.apache.karaf.shell.console.Completer; -import org.apache.karaf.shell.util.IndentFormatter; -import org.apache.karaf.shell.util.ShellUtil; -import org.apache.karaf.shell.util.SimpleAnsi; public class ActionMetaData { @@ -141,7 +146,7 @@ public class ActionMetaData { for (Argument argument : argumentsSet) { out.print(" "); out.println(INTENSITY_BOLD + argument.name() + INTENSITY_NORMAL); - IndentFormatter.printFormatted(" ", argument.description(), termWidth, out); + ActionMetaData.printFormatted(" ", argument.description(), termWidth, out, true); if (!argument.required()) { if (argument.valueToShowInHelp() != null && argument.valueToShowInHelp().length() != 0) { if (Argument.DEFAULT_STRING.equals(argument.valueToShowInHelp())) { @@ -167,7 +172,7 @@ public class ActionMetaData { } out.print(" "); out.println(INTENSITY_BOLD + opt + INTENSITY_NORMAL); - IndentFormatter.printFormatted(" ", option.description(), termWidth, out); + ActionMetaData.printFormatted(" ", option.description(), termWidth, out, true); if (option.valueToShowInHelp() != null && option.valueToShowInHelp().length() != 0) { if (Option.DEFAULT_STRING.equals(option.valueToShowInHelp())) { Object o = getDefaultValue(action, option); @@ -185,7 +190,7 @@ public class ActionMetaData { if (command.detailedDescription().length() > 0) { out.println(INTENSITY_BOLD + "DETAILS" + INTENSITY_NORMAL); String desc = getDetailedDescription(); - IndentFormatter.printFormatted(" ", desc, termWidth, out); + ActionMetaData.printFormatted(" ", desc, termWidth, out, true); } } } @@ -215,7 +220,7 @@ public class ActionMetaData { private String loadDescription(Class<?> clazz, String desc) { if (desc != null && desc.startsWith("classpath:")) { - desc = ShellUtil.loadClassPathResource(clazz, desc.substring("classpath:".length())); + desc = loadClassPathResource(clazz, desc.substring("classpath:".length())); } return desc; } @@ -233,4 +238,59 @@ public class ActionMetaData { out.println(" (defaults to " + value + ")"); } + static void printFormatted(String prefix, String str, int termWidth, PrintStream out, boolean prefixFirstLine) { + int pfxLen = prefix.length(); + int maxwidth = termWidth - pfxLen; + Pattern wrap = Pattern.compile("(\\S\\S{" + maxwidth + ",}|.{1," + maxwidth + "})(\\s+|$)"); + int cur = 0; + while (cur >= 0) { + int lst = str.indexOf('\n', cur); + String s = (lst >= 0) ? str.substring(cur, lst) : str.substring(cur); + if (s.length() == 0) { + out.println(); + } else { + Matcher m = wrap.matcher(s); + while (m.find()) { + if (cur > 0 || prefixFirstLine) { + out.print(prefix); + } + out.println(m.group()); + } + } + if (lst >= 0) { + cur = lst + 1; + } else { + break; + } + } + } + + private String loadClassPathResource(Class<?> clazz, String path) { + InputStream is = clazz.getResourceAsStream(path); + if (is == null) { + is = clazz.getClassLoader().getResourceAsStream(path); + } + if (is == null) { + return "Unable to load description from " + path; + } + + try { + Reader r = new InputStreamReader(is); + StringWriter sw = new StringWriter(); + int c; + while ((c = r.read()) != -1) { + sw.append((char) c); + } + return sw.toString(); + } catch (IOException e) { + return "Unable to load description from " + path; + } finally { + try { + is.close(); + } catch (IOException e) { + // Ignore + } + } + } + } http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java ---------------------------------------------------------------------- diff --git a/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java b/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java index afa5828..388a0a6 100644 --- a/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java +++ b/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java @@ -18,21 +18,15 @@ */ package org.apache.karaf.shell.util; -import static org.apache.karaf.shell.util.SimpleAnsi.COLOR_DEFAULT; -import static org.apache.karaf.shell.util.SimpleAnsi.COLOR_RED; -import static org.apache.karaf.shell.util.SimpleAnsi.INTENSITY_BOLD; -import static org.apache.karaf.shell.util.SimpleAnsi.INTENSITY_NORMAL; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.COLOR_DEFAULT; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.COLOR_RED; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.INTENSITY_BOLD; +import static org.apache.karaf.shell.commands.ansi.SimpleAnsi.INTENSITY_NORMAL; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringWriter; import java.net.MalformedURLException; import java.net.URI; import java.net.URL; - import org.apache.felix.service.command.CommandSession; import org.apache.karaf.shell.commands.CommandException; import org.apache.karaf.shell.console.SessionProperties; @@ -129,34 +123,6 @@ public class ShellUtil { return level <= sbsl; } - public static String loadClassPathResource(Class<?> clazz, String path) { - InputStream is = clazz.getResourceAsStream(path); - if (is == null) { - is = clazz.getClassLoader().getResourceAsStream(path); - } - if (is == null) { - return "Unable to load description from " + path; - } - - try { - Reader r = new InputStreamReader(is); - StringWriter sw = new StringWriter(); - int c; - while ((c = r.read()) != -1) { - sw.append((char) c); - } - return sw.toString(); - } catch (IOException e) { - return "Unable to load description from " + path; - } finally { - try { - is.close(); - } catch (IOException e) { - // Ignore - } - } - } - public static boolean getBoolean(CommandSession session, String name) { Object s = session.get(name); if (s == null) { http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/Context.java ---------------------------------------------------------------------- diff --git a/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/Context.java b/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/Context.java index 7737c11..e378789 100644 --- a/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/Context.java +++ b/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/Context.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.karaf.shell.commands; +package org.apache.karaf.shell.commands.basic; import org.apache.felix.gogo.runtime.CommandProcessorImpl; import org.apache.felix.gogo.runtime.CommandSessionImpl; http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/SimpleSubShell.java ---------------------------------------------------------------------- diff --git a/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/SimpleSubShell.java b/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/SimpleSubShell.java index 59fe9a2..77e9b57 100644 --- a/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/SimpleSubShell.java +++ b/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/SimpleSubShell.java @@ -15,8 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.shell.commands; +package org.apache.karaf.shell.commands.basic; +import org.apache.karaf.shell.commands.Action; import org.apache.karaf.shell.commands.basic.SimpleCommand; import org.apache.karaf.shell.console.SubShellAction; http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/TestCommands.java ---------------------------------------------------------------------- diff --git a/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/TestCommands.java b/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/TestCommands.java index 7ad5b75..ce55446 100644 --- a/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/TestCommands.java +++ b/shell/console/src/test/java/org/apache/karaf/shell/commands/basic/TestCommands.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.karaf.shell.commands; +package org.apache.karaf.shell.commands.basic; import java.util.List; import java.util.Arrays; @@ -26,6 +26,12 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import junit.framework.TestCase; + +import org.apache.karaf.shell.commands.Action; +import org.apache.karaf.shell.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.CommandException; +import org.apache.karaf.shell.commands.Option; import org.apache.karaf.shell.commands.basic.SimpleCommand; import org.apache.felix.service.command.CommandSession; import org.apache.karaf.shell.console.ExitAction; http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/test/java/org/apache/karaf/shell/commands/meta/TestFormatting.java ---------------------------------------------------------------------- diff --git a/shell/console/src/test/java/org/apache/karaf/shell/commands/meta/TestFormatting.java b/shell/console/src/test/java/org/apache/karaf/shell/commands/meta/TestFormatting.java index d709e9c..24762f5 100644 --- a/shell/console/src/test/java/org/apache/karaf/shell/commands/meta/TestFormatting.java +++ b/shell/console/src/test/java/org/apache/karaf/shell/commands/meta/TestFormatting.java @@ -16,21 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.karaf.shell.util; +package org.apache.karaf.shell.commands.meta; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import junit.framework.TestCase; -import org.apache.karaf.shell.util.IndentFormatter; +import org.apache.karaf.shell.commands.meta.ActionMetaData; public class TestFormatting extends TestCase { public void testFormat() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); - IndentFormatter.printFormatted(" ", - " This is a test with a long paragraph\n\n with an indented paragraph\nAnd another one\n", 20, new PrintStream(baos, true)); + ActionMetaData.printFormatted(" ", " This is a test with a long paragraph\n\n with an indented paragraph\nAnd another one\n", 20, new PrintStream(baos, true), true); System.err.println(baos.toString()); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompletionTest.java ---------------------------------------------------------------------- diff --git a/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompletionTest.java b/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompletionTest.java index 5fa1c8e..25d0485 100644 --- a/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompletionTest.java +++ b/shell/console/src/test/java/org/apache/karaf/shell/console/completer/CompletionTest.java @@ -22,10 +22,10 @@ import java.util.Arrays; import org.apache.felix.service.command.CommandSession; import org.apache.karaf.shell.commands.Action; import org.apache.karaf.shell.commands.Argument; -import org.apache.karaf.shell.commands.Context; import org.apache.karaf.shell.commands.Option; -import org.apache.karaf.shell.commands.SimpleSubShell; +import org.apache.karaf.shell.commands.basic.Context; import org.apache.karaf.shell.commands.basic.SimpleCommand; +import org.apache.karaf.shell.commands.basic.SimpleSubShell; import org.apache.karaf.shell.console.CommandSessionHolder; import org.apache.karaf.shell.console.Completer; import org.apache.karaf.shell.console.ExitAction; http://git-wip-us.apache.org/repos/asf/karaf/blob/3f078732/shell/console/src/test/java/org/apache/karaf/shell/console/impl/ExampleSubclassMain.java ---------------------------------------------------------------------- diff --git a/shell/console/src/test/java/org/apache/karaf/shell/console/impl/ExampleSubclassMain.java b/shell/console/src/test/java/org/apache/karaf/shell/console/impl/ExampleSubclassMain.java index 8229d08..eb1be3e 100644 --- a/shell/console/src/test/java/org/apache/karaf/shell/console/impl/ExampleSubclassMain.java +++ b/shell/console/src/test/java/org/apache/karaf/shell/console/impl/ExampleSubclassMain.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.karaf.shell.console; +package org.apache.karaf.shell.console.impl; import java.io.InputStream; import java.io.PrintStream;
