From 7ae6aa4c813858e28eabbccb49dd0fe19914bed5 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 18 Dec 2014 14:12:17 -0800 Subject: [PATCH] Fix compilation warnings: replace deprecated org.apache.felix classes Replace deprecated org.apache.felix.gogo.commands.Command with org.apache.karaf.shell.commands.Command. Replace deprecated org.apache.felix.gogo.commands.Argument with org.apache.karaf.shell.commands.Argument. Change-Id: If858e2a6937b50c517650672b8a138cc218b907c Signed-off-by: Gary Wu --- .../controller/containermanager/shell/AddContainer.java | 4 ++-- .../controller/containermanager/shell/AddContainerEntry.java | 4 ++-- .../controller/containermanager/shell/AddContainerFlow.java | 4 ++-- .../shell/ContainermgrGetAuthorizedGroups.java | 4 ++-- .../shell/ContainermgrGetAuthorizedResources.java | 4 ++-- .../shell/ContainermgrGetResourcesForGroup.java | 4 ++-- .../containermanager/shell/ContainermgrGetRoles.java | 2 +- .../containermanager/shell/ContainermgrGetUserLevel.java | 4 ++-- .../containermanager/shell/ContainermgrGetUserResources.java | 4 ++-- .../controller/containermanager/shell/CreateContainer.java | 4 ++-- .../opendaylight/controller/containermanager/shell/Pfc.java | 2 +- .../opendaylight/controller/containermanager/shell/Psc.java | 2 +- .../opendaylight/controller/containermanager/shell/Psd.java | 2 +- .../opendaylight/controller/containermanager/shell/Psm.java | 2 +- .../opendaylight/controller/containermanager/shell/Psp.java | 2 +- .../controller/containermanager/shell/RemoveContainer.java | 4 ++-- .../containermanager/shell/RemoveContainerEntry.java | 4 ++-- .../containermanager/shell/RemoveContainerFlow.java | 4 ++-- .../controller/containermanager/shell/SaveConfig.java | 2 +- .../controller/hosttracker/shell/DumpFailedARPReqList.java | 2 +- .../controller/hosttracker/shell/DumpPendingARPReqList.java | 2 +- .../controller/topologymanager/shell/AddUserLink.java | 4 ++-- .../controller/topologymanager/shell/DeleteUserLink.java | 4 ++-- .../controller/topologymanager/shell/PrintNodeEdges.java | 2 +- .../controller/topologymanager/shell/PrintUserLink.java | 2 +- 25 files changed, 39 insertions(+), 39 deletions(-) diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainer.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainer.java index e87682eed5..2b75d54e30 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainer.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainer.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerEntry.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerEntry.java index b7ee4bd69f..936e1d5e3b 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerEntry.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerEntry.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerFlow.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerFlow.java index 03ed94d685..bbfbc2fe7c 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerFlow.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/AddContainerFlow.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedGroups.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedGroups.java index f78b8569f0..72f82fdc47 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedGroups.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedGroups.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedResources.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedResources.java index 1ac50fae88..d625d09cc8 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedResources.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetAuthorizedResources.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetResourcesForGroup.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetResourcesForGroup.java index bbccb65893..e21eed6563 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetResourcesForGroup.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetResourcesForGroup.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetRoles.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetRoles.java index 38fdb276cd..4f8fa140a7 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetRoles.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetRoles.java @@ -1,6 +1,6 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserLevel.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserLevel.java index 9ee607ad71..e47cc12ecd 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserLevel.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserLevel.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserResources.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserResources.java index 6a281bda3f..da1949976c 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserResources.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/ContainermgrGetUserResources.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/CreateContainer.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/CreateContainer.java index ef51563a58..0f74d40c95 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/CreateContainer.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/CreateContainer.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Pfc.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Pfc.java index 62b4c9a225..72ee7f22a0 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Pfc.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Pfc.java @@ -1,6 +1,6 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psc.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psc.java index 83e649673e..6604748d1a 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psc.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psc.java @@ -1,6 +1,6 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psd.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psd.java index ff8a02424b..c6370487d7 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psd.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psd.java @@ -1,6 +1,6 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psm.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psm.java index a7c3549fa2..ca5d96b75d 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psm.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psm.java @@ -1,6 +1,6 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psp.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psp.java index d221c83293..a38c5ab1c7 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psp.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/Psp.java @@ -1,6 +1,6 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainer.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainer.java index 997ef67ff8..0c6322ae0d 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainer.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainer.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerEntry.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerEntry.java index 9413842109..c126a03bfc 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerEntry.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerEntry.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerFlow.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerFlow.java index 94cbb19916..8ba532a68d 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerFlow.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/RemoveContainerFlow.java @@ -1,7 +1,7 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/SaveConfig.java b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/SaveConfig.java index b96f7697d4..c4b7a9cbf7 100644 --- a/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/SaveConfig.java +++ b/opendaylight/adsal/containermanager/shell/src/main/java/org/opendaylight/controller/containermanager/shell/SaveConfig.java @@ -1,6 +1,6 @@ package org.opendaylight.controller.containermanager.shell; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.containermanager.IContainerManagerShell; diff --git a/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpFailedARPReqList.java b/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpFailedARPReqList.java index ec9971f3c8..cb57b44aba 100644 --- a/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpFailedARPReqList.java +++ b/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpFailedARPReqList.java @@ -7,7 +7,7 @@ package org.opendaylight.controller.hosttracker.shell; * and is available at http://www.eclipse.org/legal/epl-v10.html */ -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.hosttracker.IHostTrackerShell; diff --git a/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpPendingARPReqList.java b/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpPendingARPReqList.java index 7f52a55bd1..fafc48fde7 100644 --- a/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpPendingARPReqList.java +++ b/opendaylight/adsal/hosttracker/shell/src/main/java/org/opendaylight/controller/hosttracker/shell/DumpPendingARPReqList.java @@ -7,7 +7,7 @@ package org.opendaylight.controller.hosttracker.shell; * and is available at http://www.eclipse.org/legal/epl-v10.html */ -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.hosttracker.IHostTrackerShell; diff --git a/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/AddUserLink.java b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/AddUserLink.java index 1565a8733b..92467c9344 100644 --- a/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/AddUserLink.java +++ b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/AddUserLink.java @@ -7,8 +7,8 @@ */ package org.opendaylight.controller.topologymanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.topologymanager.ITopologyManagerShell; diff --git a/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/DeleteUserLink.java b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/DeleteUserLink.java index b226c3c2e2..2c3e93c26a 100644 --- a/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/DeleteUserLink.java +++ b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/DeleteUserLink.java @@ -7,8 +7,8 @@ */ package org.opendaylight.controller.topologymanager.shell; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.topologymanager.ITopologyManagerShell; diff --git a/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintNodeEdges.java b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintNodeEdges.java index 9c5e806b6d..4a65a45351 100644 --- a/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintNodeEdges.java +++ b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintNodeEdges.java @@ -7,7 +7,7 @@ */ package org.opendaylight.controller.topologymanager.shell; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.topologymanager.ITopologyManagerShell; diff --git a/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintUserLink.java b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintUserLink.java index df7ab35073..e0976b0cf2 100644 --- a/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintUserLink.java +++ b/opendaylight/adsal/topologymanager/shell/src/main/java/org/opendaylight/controller/topologymanager/shell/PrintUserLink.java @@ -7,7 +7,7 @@ */ package org.opendaylight.controller.topologymanager.shell; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.opendaylight.controller.topologymanager.ITopologyManagerShell; -- 2.36.6