commit 31ad527ec2b85e098b0963b79322855a60be4c84
author Claudine Chiu <cchiu@ciena.com> Wed Feb 17 20:56:24 2016 +0000
committer Gerrit Code Review <gerrit@onlab.us> Thu Feb 18 08:46:33 2016 +0000
tree cdfa3a711c1abd68cfe808d447ff367ab8eee62e
parent c86b00ed8094000d4a050ecef7e05991d2a330bf

ONOS-3931: move "org.onosproject.incubator.net.key" to "org.onosproject.net.key"

Change-Id: I90da894317583ce8d6cfb238e933ff28ad2c83ca

cli/src/main/java/org/onosproject/cli/Comparators.java

diff --git a/cli/src/main/java/org/onosproject/cli/Comparators.java b/cli/src/main/java/org/onosproject/cli/Comparators.java
index c1c019e..530c296 100644
--- a/cli/src/main/java/org/onosproject/cli/Comparators.java
+++ b/cli/src/main/java/org/onosproject/cli/Comparators.java
@@ -19,7 +19,7 @@
 import org.onosproject.core.Application;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.incubator.net.intf.Interface;
-import org.onosproject.incubator.net.key.DeviceKey;
+import org.onosproject.net.key.DeviceKey;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Element;
 import org.onosproject.net.ElementId;

cli/src/main/java/org/onosproject/cli/net/DeviceKeyAddCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceKeyAddCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceKeyAddCommand.java
index 2c636ca..142e354 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceKeyAddCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceKeyAddCommand.java
@@ -20,9 +20,9 @@
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Option;
 import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.incubator.net.key.DeviceKey;
-import org.onosproject.incubator.net.key.DeviceKeyAdminService;
-import org.onosproject.incubator.net.key.DeviceKeyId;
+import org.onosproject.net.key.DeviceKey;
+import org.onosproject.net.key.DeviceKeyAdminService;
+import org.onosproject.net.key.DeviceKeyId;
 
 /**
  * Adds a device key.

cli/src/main/java/org/onosproject/cli/net/DeviceKeyListCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceKeyListCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceKeyListCommand.java
index 5d84f59..eb2ad6e 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceKeyListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceKeyListCommand.java
@@ -19,8 +19,8 @@
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.cli.Comparators;
-import org.onosproject.incubator.net.key.DeviceKey;
-import org.onosproject.incubator.net.key.DeviceKeyService;
+import org.onosproject.net.key.DeviceKey;
+import org.onosproject.net.key.DeviceKeyService;
 
 import java.util.Collections;
 import java.util.List;

cli/src/main/java/org/onosproject/cli/net/DeviceKeyRemoveCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceKeyRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceKeyRemoveCommand.java
index 329c9af..f88d71c 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceKeyRemoveCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceKeyRemoveCommand.java
@@ -19,8 +19,8 @@
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.incubator.net.key.DeviceKeyAdminService;
-import org.onosproject.incubator.net.key.DeviceKeyId;
+import org.onosproject.net.key.DeviceKeyAdminService;
+import org.onosproject.net.key.DeviceKeyId;
 
 /**
  * Removes a device key.