[WIP] apps CLI changes for karaf upgrade
Change-Id: I283efc39c7d4f4b31344f1d2d0cdd2b98a60932d
diff --git a/apps/simplefabric/src/main/java/org/onosproject/simplefabric/SimpleFabricCommand.java b/apps/simplefabric/src/main/java/org/onosproject/simplefabric/SimpleFabricCommand.java
index b515259..780d904 100644
--- a/apps/simplefabric/src/main/java/org/onosproject/simplefabric/SimpleFabricCommand.java
+++ b/apps/simplefabric/src/main/java/org/onosproject/simplefabric/SimpleFabricCommand.java
@@ -15,13 +15,15 @@
*/
package org.onosproject.simplefabric;
-import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand;
/**
* CLI to interact with the SIMPLE_FABRIC application.
*/
+@Service
@Command(scope = "onos", name = "simpleFabric",
description = "Manages the SimpleFabric application")
public class SimpleFabricCommand extends AbstractShellCommand {
@@ -32,7 +34,7 @@
String command = null;
@Override
- protected void execute() {
+ protected void doExecute() {
SimpleFabricService simpleFabric = get(SimpleFabricService.class);
diff --git a/apps/simplefabric/src/main/java/org/onosproject/simplefabric/SimpleFabricCommandCompleter.java b/apps/simplefabric/src/main/java/org/onosproject/simplefabric/SimpleFabricCommandCompleter.java
index f497721..43d79d8 100644
--- a/apps/simplefabric/src/main/java/org/onosproject/simplefabric/SimpleFabricCommandCompleter.java
+++ b/apps/simplefabric/src/main/java/org/onosproject/simplefabric/SimpleFabricCommandCompleter.java
@@ -16,7 +16,7 @@
package org.onosproject.simplefabric;
import com.google.common.collect.Lists;
-import org.apache.karaf.shell.console.completer.ArgumentCompleter;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractChoicesCompleter;
import java.util.List;
@@ -26,6 +26,7 @@
/**
* SimpleFabric command completer.
*/
+@Service
public class SimpleFabricCommandCompleter extends AbstractChoicesCompleter {
private static final List<String> COMMAND_LIST =
@@ -33,11 +34,10 @@
@Override
public List<String> choices() {
- ArgumentCompleter.ArgumentList argumentList = getArgumentList();
- if (argumentList == null) {
+ if (commandLine.getArguments() == null) {
return Collections.emptyList();
}
- List<String> argList = Lists.newArrayList(argumentList.getArguments());
+ List<String> argList = Lists.newArrayList(commandLine.getArguments());
String argOne = null;
if (argList.size() > 1) {
argOne = argList.get(1);