commit 86ad7bb5e77bc2ee14420f433e5a74dd2a2a7f8e
author Ray Milkey <ray@opennetworking.org> Thu Sep 27 12:32:28 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Fri Sep 28 11:21:43 2018 -0700
tree 5a2bf1c01b849467d485a0811a8f288e64259fdb
parent d84f89ba3d18fb8e9c44fa0bab004d24c56b0a81

[WIP] apps CLI changes for karaf upgrade

Change-Id: I283efc39c7d4f4b31344f1d2d0cdd2b98a60932d

apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfListCommand.java

diff --git a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfListCommand.java b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfListCommand.java
index 7c35918..2f1358e 100644
--- a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfListCommand.java
+++ b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfListCommand.java
@@ -15,8 +15,8 @@
  */
 package org.onosproject.intentperf;
 
-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.Option;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.intentperf.IntentPerfCollector.Sample;
 
@@ -36,7 +36,7 @@
     private boolean summary = false;
 
     @Override
-    protected void execute() {
+    protected void doExecute() {
         if (summary) {
             printSummary();
         } else {

apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStartCommand.java

diff --git a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStartCommand.java b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStartCommand.java
index c52b0eb..17d60c4 100644
--- a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStartCommand.java
+++ b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStartCommand.java
@@ -15,7 +15,7 @@
  */
 package org.onosproject.intentperf;
 
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
 import org.onosproject.cli.AbstractShellCommand;
 
 /**
@@ -26,7 +26,7 @@
 public class IntentPerfStartCommand extends AbstractShellCommand {
 
     @Override
-    protected void execute() {
+    protected void doExecute() {
         get(IntentPerfInstaller.class).start();
     }
 

apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStopCommand.java

diff --git a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStopCommand.java b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStopCommand.java
index b31ad1b..1ce91ff 100644
--- a/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStopCommand.java
+++ b/apps/test/intent-perf/src/main/java/org/onosproject/intentperf/IntentPerfStopCommand.java
@@ -15,7 +15,7 @@
  */
 package org.onosproject.intentperf;
 
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
 import org.onosproject.cli.AbstractShellCommand;
 
 /**
@@ -26,7 +26,7 @@
 public class IntentPerfStopCommand extends AbstractShellCommand {
 
     @Override
-    protected void execute() {
+    protected void doExecute() {
         get(IntentPerfInstaller.class).stop();
     }