[WIP] Upgrade ONOS to karaf version 4.2.1
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/cli/src/main/java/org/onosproject/cli/net/FlowObjectiveQueueListCommand.java b/cli/src/main/java/org/onosproject/cli/net/FlowObjectiveQueueListCommand.java
index 46f6122..9aded1e 100644
--- a/cli/src/main/java/org/onosproject/cli/net/FlowObjectiveQueueListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/FlowObjectiveQueueListCommand.java
@@ -16,8 +16,9 @@
package org.onosproject.cli.net;
import com.google.common.collect.ListMultimap;
-import org.apache.karaf.shell.commands.Command;
-import org.apache.karaf.shell.commands.Option;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.apache.karaf.shell.api.action.Option;
import org.onlab.osgi.ServiceNotFoundException;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.flowobjective.FilteringObjQueueKey;
@@ -31,6 +32,7 @@
/**
* Displays flow objective that are waiting for the completion of previous objective with the same key.
*/
+@Service
@Command(scope = "onos", name = "obj-queues",
description = "Display flow objective queues")
public class FlowObjectiveQueueListCommand extends AbstractShellCommand {
@@ -46,7 +48,7 @@
private boolean cache = false;
@Override
- protected void execute() {
+ protected void doExecute() {
try {
FlowObjectiveService service = get(FlowObjectiveService.class);
ListMultimap<FilteringObjQueueKey, Objective> filtObjQueue = service.getFilteringObjQueue();