You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/03/06 01:40:06 UTC
[3/6] git commit: [KARAF-2805] Flag all classes from shell/console as
deprecated
[KARAF-2805] Flag all classes from shell/console as deprecated
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/66c52d19
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/66c52d19
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/66c52d19
Branch: refs/heads/master
Commit: 66c52d19b0b779a1c54cb43ffeb342d144cce7e4
Parents: 7ccf13c
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Thu Mar 6 01:03:23 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Mar 6 01:03:23 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/shell/commands/Action.java | 1 +
.../src/main/java/org/apache/karaf/shell/commands/Argument.java | 1 +
.../src/main/java/org/apache/karaf/shell/commands/Command.java | 1 +
.../main/java/org/apache/karaf/shell/commands/CommandException.java | 1 +
.../java/org/apache/karaf/shell/commands/CommandWithAction.java | 1 +
.../src/main/java/org/apache/karaf/shell/commands/Completer.java | 1 +
.../main/java/org/apache/karaf/shell/commands/CompleterValues.java | 1 +
.../src/main/java/org/apache/karaf/shell/commands/HelpOption.java | 1 +
.../src/main/java/org/apache/karaf/shell/commands/InfoProvider.java | 1 +
.../src/main/java/org/apache/karaf/shell/commands/Option.java | 1 +
.../main/java/org/apache/karaf/shell/commands/ansi/SimpleAnsi.java | 1 +
.../java/org/apache/karaf/shell/commands/basic/AbstractCommand.java | 1 +
.../org/apache/karaf/shell/commands/basic/ActionPreparator.java | 1 +
.../apache/karaf/shell/commands/basic/DefaultActionPreparator.java | 1 +
.../java/org/apache/karaf/shell/commands/basic/SimpleCommand.java | 1 +
.../org/apache/karaf/shell/commands/converter/DefaultConverter.java | 1 +
.../java/org/apache/karaf/shell/commands/converter/GenericType.java | 1 +
.../java/org/apache/karaf/shell/commands/converter/ReifiedType.java | 1 +
.../main/java/org/apache/karaf/shell/console/AbstractAction.java | 1 +
.../org/apache/karaf/shell/console/BlueprintContainerAware.java | 1 +
.../java/org/apache/karaf/shell/console/BundleContextAware.java | 1 +
.../java/org/apache/karaf/shell/console/CloseShellException.java | 1 +
.../java/org/apache/karaf/shell/console/CommandSessionHolder.java | 1 +
.../java/org/apache/karaf/shell/console/CompletableFunction.java | 1 +
.../src/main/java/org/apache/karaf/shell/console/Completer.java | 1 +
.../src/main/java/org/apache/karaf/shell/console/Console.java | 1 +
.../src/main/java/org/apache/karaf/shell/console/ExitAction.java | 1 +
.../src/main/java/org/apache/karaf/shell/console/HelpProvider.java | 1 +
.../main/java/org/apache/karaf/shell/console/MultiException.java | 1 +
.../src/main/java/org/apache/karaf/shell/console/NameScoping.java | 1 +
.../java/org/apache/karaf/shell/console/OsgiCommandSupport.java | 1 +
.../main/java/org/apache/karaf/shell/console/SessionProperties.java | 1 +
.../src/main/java/org/apache/karaf/shell/console/SubShell.java | 1 +
.../main/java/org/apache/karaf/shell/console/SubShellAction.java | 1 +
.../org/apache/karaf/shell/console/commands/AnnotatedSubShell.java | 1 +
.../java/org/apache/karaf/shell/console/commands/BasicSubShell.java | 1 +
.../org/apache/karaf/shell/console/commands/BlueprintCommand.java | 1 +
.../java/org/apache/karaf/shell/console/commands/GenericType.java | 1 +
.../org/apache/karaf/shell/console/commands/NamespaceHandler.java | 1 +
.../karaf/shell/console/commands/NumberToStringConverter.java | 1 +
.../apache/karaf/shell/console/completer/AggregateCompleter.java | 1 +
.../org/apache/karaf/shell/console/completer/ArgumentCompleter.java | 1 +
.../apache/karaf/shell/console/completer/CommandNamesCompleter.java | 1 +
.../org/apache/karaf/shell/console/completer/CommandsCompleter.java | 1 +
.../org/apache/karaf/shell/console/completer/FileCompleter.java | 1 +
.../org/apache/karaf/shell/console/completer/NullCompleter.java | 1 +
.../apache/karaf/shell/console/completer/OldArgumentCompleter.java | 1 +
.../main/java/org/apache/karaf/shell/console/completer/Parser.java | 1 +
.../org/apache/karaf/shell/console/completer/StringsCompleter.java | 1 +
.../java/org/apache/karaf/shell/console/factory/ConsoleFactory.java | 1 +
.../src/main/java/org/apache/karaf/shell/inject/Destroy.java | 1 +
shell/console/src/main/java/org/apache/karaf/shell/inject/Init.java | 1 +
.../src/main/java/org/apache/karaf/shell/inject/Reference.java | 1 +
.../src/main/java/org/apache/karaf/shell/inject/Service.java | 1 +
.../karaf/shell/security/impl/SecuredCommandConfigTransformer.java | 1 +
.../karaf/shell/security/impl/SecuredCommandProcessorImpl.java | 1 +
.../src/main/java/org/apache/karaf/shell/util/ShellUtil.java | 1 +
57 files changed, 57 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java
index c3421e3..6e1d212 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/Action.java
@@ -33,6 +33,7 @@ import org.apache.felix.service.command.CommandSession;
* is necessary so the help generator can instantiate the class and get the
* default values.
*/
+@Deprecated
public interface Action extends org.apache.felix.gogo.commands.Action {
Object execute(CommandSession session) throws Exception;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java
index eced53d..d878cec 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/Argument.java
@@ -28,6 +28,7 @@ import java.lang.annotation.ElementType;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
+@Deprecated
public @interface Argument
{
public static final String DEFAULT_STRING= "DEFAULT";
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/Command.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/Command.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/Command.java
index 490785d..36fd665 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/Command.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/Command.java
@@ -29,6 +29,7 @@ import java.lang.annotation.ElementType;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
+@Deprecated
public @interface Command
{
/**
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/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 1ffa25d..41280bd 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
@@ -25,6 +25,7 @@ import org.apache.karaf.shell.commands.ansi.SimpleAnsi;
* Base class for exceptions thrown when executing commands.
*/
@SuppressWarnings("serial")
+@Deprecated
public class CommandException extends Exception {
private String help;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java
index 9209eb1..d4be812 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/CommandWithAction.java
@@ -20,6 +20,7 @@ package org.apache.karaf.shell.commands;
import org.apache.felix.service.command.Function;
+@Deprecated
public interface CommandWithAction extends Function {
Class<? extends org.apache.felix.gogo.commands.Action> getActionClass();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/Completer.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/Completer.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/Completer.java
index ece3e1d..93a939c 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/Completer.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/Completer.java
@@ -23,6 +23,7 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
+@Deprecated
public @interface Completer {
Class<? extends org.apache.karaf.shell.console.Completer> value();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/CompleterValues.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/CompleterValues.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/CompleterValues.java
index 4463d35..d3388cd 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/CompleterValues.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/CompleterValues.java
@@ -31,6 +31,7 @@ import java.lang.annotation.Target;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD})
+@Deprecated
public @interface CompleterValues
{
int index() default 0;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.java
index b5a0fa5..dac319b 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/HelpOption.java
@@ -20,6 +20,7 @@ package org.apache.karaf.shell.commands;
import java.lang.annotation.Annotation;
+@Deprecated
public class HelpOption {
public static final Option HELP = new Option() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java
index e253af1..2945e83 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/InfoProvider.java
@@ -21,6 +21,7 @@ import java.util.Properties;
/**
* A bundle can publish a service with this interface to offer some informations for the shell:info command
*/
+@Deprecated
public interface InfoProvider {
public String getName();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java
index b0a9e9c..44a3e0a 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/Option.java
@@ -28,6 +28,7 @@ import java.lang.annotation.Target;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
+@Deprecated
public @interface Option
{
public static final String DEFAULT_STRING= "DEFAULT";
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/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 8437949..0ea9ff2 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
@@ -21,6 +21,7 @@ package org.apache.karaf.shell.commands.ansi;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.Ansi.Color;
+@Deprecated
public class SimpleAnsi {
public static String COLOR_RED = Ansi.ansi().fg(Color.RED).toString();
public static String COLOR_DEFAULT = Ansi.ansi().fg(Color.DEFAULT).toString();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/AbstractCommand.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/AbstractCommand.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/AbstractCommand.java
index 41d4a51..17ca14c 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/AbstractCommand.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/AbstractCommand.java
@@ -24,6 +24,7 @@ import org.apache.felix.gogo.commands.Action;
import org.apache.felix.service.command.CommandSession;
import org.apache.karaf.shell.commands.CommandWithAction;
+@Deprecated
public abstract class AbstractCommand implements CommandWithAction {
public Object execute(CommandSession session, List<Object> arguments) throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java
index a6d2f8f..e1681b0 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/ActionPreparator.java
@@ -23,6 +23,7 @@ import java.util.List;
import org.apache.felix.gogo.commands.Action;
import org.apache.felix.service.command.CommandSession;
+@Deprecated
public interface ActionPreparator {
/**
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/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 3ad8d29..b230e1e 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
@@ -45,6 +45,7 @@ import org.apache.karaf.shell.commands.meta.ActionMetaData;
import org.apache.karaf.shell.commands.meta.ActionMetaDataFactory;
import org.apache.karaf.shell.console.NameScoping;
+@Deprecated
public class DefaultActionPreparator implements ActionPreparator {
public boolean prepare(Action action, CommandSession session, List<Object> params) throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java
index 4ea5dfc..9fc389c 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java
@@ -30,6 +30,7 @@ import org.osgi.framework.BundleContext;
/**
* A very simple {@link Function} which creates {@link Action} based on a class name.
*/
+@Deprecated
public class SimpleCommand extends AbstractCommand {
private Class<? extends Action> actionClass;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java
index 54fe81a..3f3aad9 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java
@@ -51,6 +51,7 @@ import java.lang.reflect.Array;
import java.lang.reflect.Type;
import java.lang.reflect.InvocationTargetException;
+@Deprecated
public class DefaultConverter
{
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/GenericType.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/GenericType.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/GenericType.java
index 2f2b5e0..a8d1718 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/GenericType.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/GenericType.java
@@ -29,6 +29,7 @@ import java.util.Map;
import org.osgi.framework.Bundle;
+@Deprecated
public class GenericType extends ReifiedType {
private static final GenericType[] EMPTY = new GenericType[0];
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/ReifiedType.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/ReifiedType.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/ReifiedType.java
index dda4477..8f28dc2 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/ReifiedType.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/ReifiedType.java
@@ -35,6 +35,7 @@ package org.apache.karaf.shell.commands.converter;
*
* @Immutable
*/
+@Deprecated
public class ReifiedType {
final static ReifiedType ALL = new ReifiedType(Object.class);
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java b/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java
index f9990c5..634f264 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/AbstractAction.java
@@ -23,6 +23,7 @@ import org.apache.felix.service.command.CommandSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public abstract class AbstractAction implements Action {
protected final Logger log = LoggerFactory.getLogger(getClass());
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/BlueprintContainerAware.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/BlueprintContainerAware.java b/shell/console/src/main/java/org/apache/karaf/shell/console/BlueprintContainerAware.java
index d566f48..8467baa 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/BlueprintContainerAware.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/BlueprintContainerAware.java
@@ -20,6 +20,7 @@ package org.apache.karaf.shell.console;
import org.osgi.service.blueprint.container.BlueprintContainer;
+@Deprecated
public interface BlueprintContainerAware {
void setBlueprintContainer(BlueprintContainer blueprintContainer);
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/BundleContextAware.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/BundleContextAware.java b/shell/console/src/main/java/org/apache/karaf/shell/console/BundleContextAware.java
index bbd03c5..9abd862 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/BundleContextAware.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/BundleContextAware.java
@@ -20,6 +20,7 @@ package org.apache.karaf.shell.console;
import org.osgi.framework.BundleContext;
+@Deprecated
public interface BundleContextAware {
void setBundleContext(BundleContext bundleContext);
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/CloseShellException.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/CloseShellException.java b/shell/console/src/main/java/org/apache/karaf/shell/console/CloseShellException.java
index 81cee88..3a67fd8 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/CloseShellException.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/CloseShellException.java
@@ -22,6 +22,7 @@ package org.apache.karaf.shell.console;
* Exception thrown to indicate the console to close.
*/
@SuppressWarnings("serial")
+@Deprecated
public class CloseShellException extends Exception {
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java b/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
index f07554f..679c2d8 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
@@ -20,6 +20,7 @@ package org.apache.karaf.shell.console;
import org.apache.felix.service.command.CommandSession;
+@Deprecated
public class CommandSessionHolder {
private static final ThreadLocal<CommandSession> session = new ThreadLocal<CommandSession>();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java b/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java
index fcb96da..b3f1771 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/CompletableFunction.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.felix.service.command.Function;
+@Deprecated
public interface CompletableFunction extends Function {
List<Completer> getCompleters();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/Completer.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/Completer.java b/shell/console/src/main/java/org/apache/karaf/shell/console/Completer.java
index 59f7897..e73a5a3 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/Completer.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/Completer.java
@@ -20,6 +20,7 @@ package org.apache.karaf.shell.console;
import java.util.List;
+@Deprecated
public interface Completer {
int complete(String buffer, int cursor, List<String> candidates);
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/Console.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/Console.java b/shell/console/src/main/java/org/apache/karaf/shell/console/Console.java
index fcca7ad..ba87851 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/Console.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/Console.java
@@ -20,6 +20,7 @@ package org.apache.karaf.shell.console;
import org.apache.felix.service.command.CommandSession;
+@Deprecated
public interface Console extends Runnable {
CommandSession getSession();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java b/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java
index 1449315..d50cc91 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/ExitAction.java
@@ -24,6 +24,7 @@ import org.apache.karaf.shell.commands.Command;
* Exit from the current sub-shell and get back to the previous one.
*/
@Command(scope = "*", name = "exit", description = "Exit from the current shell")
+@Deprecated
public class ExitAction extends AbstractAction {
public Object doExecute() throws Exception {
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/HelpProvider.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/HelpProvider.java b/shell/console/src/main/java/org/apache/karaf/shell/console/HelpProvider.java
index 7e3bca7..d71cfdf 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/HelpProvider.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/HelpProvider.java
@@ -19,6 +19,7 @@ package org.apache.karaf.shell.console;
import org.apache.felix.service.command.CommandSession;
+@Deprecated
public interface HelpProvider {
String getHelp(CommandSession session, String path);
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java b/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java
index 6e6185c..cef676d 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
@SuppressWarnings("serial")
+@Deprecated
public class MultiException extends Exception {
private List<Exception> exceptions = new ArrayList<Exception>();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java b/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
index 355464d..3fcdad3 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/NameScoping.java
@@ -23,6 +23,7 @@ import org.apache.felix.service.command.CommandSession;
/**
* A helper class for name scoping
*/
+@Deprecated
public class NameScoping {
public static final String MULTI_SCOPE_MODE_KEY = "MULTI_SCOPE_MODE";
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java b/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
index d737865..ed7e67e 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
@@ -29,6 +29,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+@Deprecated
public abstract class OsgiCommandSupport extends AbstractAction implements Action, BundleContextAware {
protected BundleContext bundleContext;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.java b/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.java
index 30f3433..70cc64a 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/SessionProperties.java
@@ -18,6 +18,7 @@
*/
package org.apache.karaf.shell.console;
+@Deprecated
public class SessionProperties {
public static final String PRINT_STACK_TRACES = "karaf.printStackTraces";
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/SubShell.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/SubShell.java b/shell/console/src/main/java/org/apache/karaf/shell/console/SubShell.java
index 2de0d20..8f627a6 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/SubShell.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/SubShell.java
@@ -18,6 +18,7 @@
*/
package org.apache.karaf.shell.console;
+@Deprecated
public interface SubShell {
/**
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java b/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java
index 8774927..78f12e0 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/SubShellAction.java
@@ -22,6 +22,7 @@ package org.apache.karaf.shell.console;
/**
* Switch to a sub-shell.
*/
+@Deprecated
public class SubShellAction extends AbstractAction {
private String subShell;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/commands/AnnotatedSubShell.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/AnnotatedSubShell.java b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/AnnotatedSubShell.java
index 9cd3dda..7d16b46 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/AnnotatedSubShell.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/AnnotatedSubShell.java
@@ -19,6 +19,7 @@ package org.apache.karaf.shell.console.commands;
import org.apache.karaf.shell.console.SubShell;
+@Deprecated
public class AnnotatedSubShell implements SubShell {
public String getName() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BasicSubShell.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BasicSubShell.java b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BasicSubShell.java
index 3e40c5a..eb5e4ae 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BasicSubShell.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BasicSubShell.java
@@ -19,6 +19,7 @@ package org.apache.karaf.shell.console.commands;
import org.apache.karaf.shell.console.SubShell;
+@Deprecated
public class BasicSubShell implements SubShell {
private String name;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
index 83fa1ec..c334cf3 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/BlueprintCommand.java
@@ -34,6 +34,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.service.blueprint.container.BlueprintContainer;
import org.osgi.service.blueprint.container.Converter;
+@Deprecated
public class
BlueprintCommand extends AbstractCommand implements CompletableFunction
{
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/commands/GenericType.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/GenericType.java b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/GenericType.java
index faf7c18..d71c15c 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/GenericType.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/GenericType.java
@@ -29,6 +29,7 @@ import java.util.Map;
import org.osgi.framework.Bundle;
import org.osgi.service.blueprint.container.ReifiedType;
+@Deprecated
public class GenericType extends ReifiedType {
private static final GenericType[] EMPTY = new GenericType[0];
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
index 6c3a5b3..075b986 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
@@ -68,6 +68,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+@Deprecated
public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHandler {
public static final String ID = "id";
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NumberToStringConverter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NumberToStringConverter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NumberToStringConverter.java
index fb68c3a..42b25f3 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NumberToStringConverter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NumberToStringConverter.java
@@ -21,6 +21,7 @@ package org.apache.karaf.shell.console.commands;
import org.osgi.service.blueprint.container.Converter;
import org.osgi.service.blueprint.container.ReifiedType;
+@Deprecated
public class NumberToStringConverter implements Converter {
@Override
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java
index dbba436..37eee53 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java
@@ -29,6 +29,7 @@ import org.apache.karaf.shell.console.Completer;
/**
* Completer which contains multipule completers and aggregates them together.
*/
+@Deprecated
public class AggregateCompleter implements Completer
{
private final Collection<Completer> completers;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
index 745489e..bdf1733 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
@@ -52,6 +52,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.karaf.shell.console.completer.CommandsCompleter.unProxy;
+@Deprecated
public class ArgumentCompleter implements Completer {
private static final Logger LOGGER = LoggerFactory.getLogger(ArgumentCompleter.class);
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java
index 23f5447..1749acc 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java
@@ -36,6 +36,7 @@ import org.osgi.framework.ServiceListener;
/**
* Completes command names
*/
+@Deprecated
public class CommandNamesCompleter implements Completer {
public static final String COMMANDS = ".commands";
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
index ba95b0c..7011059 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
@@ -48,6 +48,7 @@ import org.slf4j.LoggerFactory;
* Like the {@link org.apache.karaf.shell.console.completer.CommandsCompleter} but does not use OSGi but is
* instead used from the non-OSGi {@link org.apache.karaf.shell.console.impl.Main}
*/
+@Deprecated
public class CommandsCompleter implements Completer {
public static final String COMMANDS = ".commands";
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java
index dbb3034..477aad0 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/FileCompleter.java
@@ -43,6 +43,7 @@ import org.apache.karaf.shell.console.Completer;
* @author <a href="mailto:jason@planet57.com">Jason Dillon</a>
* @since 2.3
*/
+@Deprecated
public class FileCompleter implements Completer
{
private static String OS = System.getProperty("os.name").toLowerCase();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/completer/NullCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/NullCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/NullCompleter.java
index 13da2df..0aaea01 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/NullCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/NullCompleter.java
@@ -22,6 +22,7 @@ import java.util.List;
import org.apache.karaf.shell.console.Completer;
+@Deprecated
public class NullCompleter implements Completer {
public static final NullCompleter INSTANCE = new NullCompleter();
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java
index 583d6f8..90c3b1a 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java
@@ -44,6 +44,7 @@ import org.apache.karaf.shell.console.NameScoping;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class OldArgumentCompleter implements Completer {
private static final Logger LOGGER = LoggerFactory.getLogger(OldArgumentCompleter.class);
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java
index dcdab7d..4018efa 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java
@@ -23,6 +23,7 @@ package org.apache.karaf.shell.console.completer;
import java.util.ArrayList;
import java.util.List;
+@Deprecated
public class Parser {
int current = 0;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java
index a3f7c6d..d8296bd 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java
@@ -29,6 +29,7 @@ import org.apache.karaf.shell.console.Completer;
/**
* Completer for a set of strings.
*/
+@Deprecated
public class StringsCompleter
implements Completer
{
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/console/factory/ConsoleFactory.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/factory/ConsoleFactory.java b/shell/console/src/main/java/org/apache/karaf/shell/console/factory/ConsoleFactory.java
index cf16648..6c27434 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/factory/ConsoleFactory.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/factory/ConsoleFactory.java
@@ -25,6 +25,7 @@ import jline.Terminal;
import org.apache.karaf.shell.console.Console;
+@Deprecated
public interface ConsoleFactory {
Console create(InputStream in, PrintStream out, PrintStream err, final Terminal term, String encoding, Runnable closeCallback);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/inject/Destroy.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/inject/Destroy.java b/shell/console/src/main/java/org/apache/karaf/shell/inject/Destroy.java
index 4df9fe3..d985db3 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/inject/Destroy.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/inject/Destroy.java
@@ -25,5 +25,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
+@Deprecated
public @interface Destroy {
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/inject/Init.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/inject/Init.java b/shell/console/src/main/java/org/apache/karaf/shell/inject/Init.java
index 154b883..99744e2 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/inject/Init.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/inject/Init.java
@@ -25,5 +25,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD})
+@Deprecated
public @interface Init {
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/inject/Reference.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/inject/Reference.java b/shell/console/src/main/java/org/apache/karaf/shell/inject/Reference.java
index b74d609..61feabc 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/inject/Reference.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/inject/Reference.java
@@ -25,5 +25,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD})
+@Deprecated
public @interface Reference {
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/inject/Service.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/inject/Service.java b/shell/console/src/main/java/org/apache/karaf/shell/inject/Service.java
index ff3f3a3..ef0d813 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/inject/Service.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/inject/Service.java
@@ -25,5 +25,6 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
+@Deprecated
public @interface Service {
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
index d61911d..d69efd6 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
@@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.*;
+@Deprecated
public class SecuredCommandConfigTransformer implements ConfigurationListener {
static final String PROXY_COMMAND_ACL_PID_PREFIX = "org.apache.karaf.command.acl.";
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java
index bb47d74..f8a3ff0 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java
@@ -41,6 +41,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+@Deprecated
public class SecuredCommandProcessorImpl extends CommandProcessorImpl {
private final BundleContext bundleContext;
http://git-wip-us.apache.org/repos/asf/karaf/blob/66c52d19/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 e8a1d6a..5d678c7 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
@@ -42,6 +42,7 @@ import org.osgi.framework.startlevel.BundleStartLevel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Deprecated
public class ShellUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(ShellUtil.class);