[WIP] Upgrade ONOS to karaf version 4.2.1
Change-Id: I7cd40c995bdf1c80f94b1895fb3344e32404c7fa
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheDevicesCommand.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheDevicesCommand.java
index 612dfac..138a979 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheDevicesCommand.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheDevicesCommand.java
@@ -16,7 +16,7 @@
package org.onosproject.ui.impl.topo.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.ui.impl.topo.model.UiSharedTopologyModel;
/**
@@ -27,7 +27,7 @@
public class UiCacheDevicesCommand extends AbstractUiCacheElementCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
UiSharedTopologyModel model = get(UiSharedTopologyModel.class);
sorted(model.getDevices()).forEach(d -> print("%s", d));
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheHostsCommand.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheHostsCommand.java
index f2ec711..99a0360 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheHostsCommand.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheHostsCommand.java
@@ -16,7 +16,7 @@
package org.onosproject.ui.impl.topo.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.ui.impl.topo.model.UiSharedTopologyModel;
/**
@@ -27,7 +27,7 @@
public class UiCacheHostsCommand extends AbstractUiCacheElementCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
UiSharedTopologyModel model = get(UiSharedTopologyModel.class);
sorted(model.getHosts()).forEach(h -> print("%s", h));
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheLinksCommand.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheLinksCommand.java
index 30fbe4b..929da23 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheLinksCommand.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheLinksCommand.java
@@ -16,7 +16,7 @@
package org.onosproject.ui.impl.topo.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.ui.impl.topo.model.UiSharedTopologyModel;
/**
@@ -27,7 +27,7 @@
public class UiCacheLinksCommand extends AbstractUiCacheElementCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
UiSharedTopologyModel model = get(UiSharedTopologyModel.class);
sorted(model.getDeviceLinks()).forEach(l -> print("%s", l));
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheMembersCommand.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheMembersCommand.java
index d54a750..6db4e25 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheMembersCommand.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheMembersCommand.java
@@ -16,7 +16,7 @@
package org.onosproject.ui.impl.topo.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.ui.impl.topo.model.UiSharedTopologyModel;
/**
@@ -27,7 +27,7 @@
public class UiCacheMembersCommand extends AbstractUiCacheElementCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
UiSharedTopologyModel model = get(UiSharedTopologyModel.class);
// note: getClusterMembers() returns an already sorted list...
model.getClusterMembers().forEach(m -> print("%s", m));
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheRegionsCommand.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheRegionsCommand.java
index 5fef5ff..c35af78 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheRegionsCommand.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiCacheRegionsCommand.java
@@ -16,7 +16,7 @@
package org.onosproject.ui.impl.topo.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.ui.impl.topo.model.UiSharedTopologyModel;
/**
@@ -27,7 +27,7 @@
public class UiCacheRegionsCommand extends AbstractUiCacheElementCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
UiSharedTopologyModel model = get(UiSharedTopologyModel.class);
print("%s", model.getNullRegion());
sorted(model.getRegions()).forEach(r -> print("%s", r));
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiClearMetaCommand.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiClearMetaCommand.java
index ecbd82a..22b096a 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiClearMetaCommand.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiClearMetaCommand.java
@@ -17,7 +17,7 @@
package org.onosproject.ui.impl.topo.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.ui.impl.TopologyViewMessageHandlerBase;
@@ -29,7 +29,7 @@
public class UiClearMetaCommand extends AbstractShellCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
TopologyViewMessageHandlerBase.clearMetaUi();
}
}
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiGeoMapListCommand.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiGeoMapListCommand.java
index 8134a62..107a7da 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiGeoMapListCommand.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/cli/UiGeoMapListCommand.java
@@ -17,7 +17,7 @@
package org.onosproject.ui.impl.topo.cli;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.ui.UiExtensionService;
import org.onosproject.ui.UiTopoMapFactory;
@@ -31,7 +31,7 @@
public class UiGeoMapListCommand extends AbstractShellCommand {
@Override
- protected void execute() {
+ protected void doExecute() {
UiExtensionService uxs = get(UiExtensionService.class);
uxs.getExtensions().forEach(ext -> {
UiTopoMapFactory mapFactory = ext.topoMapFactory();