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

@@ -19,7 +19,7 @@ import org.onosproject.cluster.ControllerNode;
 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

@@ -20,9 +20,9 @@ import org.apache.karaf.shell.commands.Argument;
 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

@@ -19,8 +19,8 @@ package org.onosproject.cli.net;
 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

@@ -19,8 +19,8 @@ package org.onosproject.cli.net;
 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.

core/api/src/main/java/org/onosproject/net/key/CommunityName.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 /**
  * Representation of an SNMP community name authentication token.

core/api/src/main/java/org/onosproject/net/key/DeviceKey.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import com.google.common.annotations.Beta;
 import org.onosproject.net.AbstractAnnotated;

core/api/src/main/java/org/onosproject/net/key/DeviceKeyAdminService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import com.google.common.annotations.Beta;
 

core/api/src/main/java/org/onosproject/net/key/DeviceKeyEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import com.google.common.annotations.Beta;
 import org.onosproject.event.AbstractEvent;

core/api/src/main/java/org/onosproject/net/key/DeviceKeyId.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import java.util.Objects;
 

core/api/src/main/java/org/onosproject/net/key/DeviceKeyListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import com.google.common.annotations.Beta;
 import org.onosproject.event.EventListener;

core/api/src/main/java/org/onosproject/net/key/DeviceKeyService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import com.google.common.annotations.Beta;
 import org.onosproject.event.ListenerService;

core/api/src/main/java/org/onosproject/net/key/DeviceKeyStore.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import com.google.common.annotations.Beta;
 import org.onosproject.store.Store;

core/api/src/main/java/org/onosproject/net/key/DeviceKeyStoreDelegate.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import com.google.common.annotations.Beta;
 import org.onosproject.store.StoreDelegate;

core/api/src/main/java/org/onosproject/net/key/UsernamePassword.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 /**
  * Representation of a username and password.

core/api/src/main/java/org/onosproject/net/key/package-info.java

@@ -18,4 +18,4 @@
  * Device key data model and services.
  * This subsystem and its interfaces will change in the upcoming release.
  */
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;

core/api/src/test/java/org/onosproject/net/key/CommunityNameTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import org.junit.Test;
 

core/api/src/test/java/org/onosproject/net/key/DeviceKeyIdTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import com.google.common.testing.EqualsTester;
 import org.junit.Test;

core/api/src/test/java/org/onosproject/net/key/DeviceKeyTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import org.junit.Test;
 

core/api/src/test/java/org/onosproject/net/key/UsernamePasswordTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.incubator.net.key;
+package org.onosproject.net.key;
 
 import org.junit.Test;
 

incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/DeviceKeyManager.java

@@ -23,14 +23,14 @@ import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
 import org.onosproject.event.AbstractListenerManager;
-import org.onosproject.incubator.net.key.DeviceKey;
-import org.onosproject.incubator.net.key.DeviceKeyAdminService;
-import org.onosproject.incubator.net.key.DeviceKeyEvent;
-import org.onosproject.incubator.net.key.DeviceKeyId;
-import org.onosproject.incubator.net.key.DeviceKeyListener;
-import org.onosproject.incubator.net.key.DeviceKeyService;
-import org.onosproject.incubator.net.key.DeviceKeyStore;
-import org.onosproject.incubator.net.key.DeviceKeyStoreDelegate;
+import org.onosproject.net.key.DeviceKey;
+import org.onosproject.net.key.DeviceKeyAdminService;
+import org.onosproject.net.key.DeviceKeyEvent;
+import org.onosproject.net.key.DeviceKeyId;
+import org.onosproject.net.key.DeviceKeyListener;
+import org.onosproject.net.key.DeviceKeyService;
+import org.onosproject.net.key.DeviceKeyStore;
+import org.onosproject.net.key.DeviceKeyStoreDelegate;
 import org.slf4j.Logger;
 
 import java.util.Collection;

incubator/net/src/test/java/org/onosproject/incubator/net/key/impl/DeviceKeyManagerTest.java

@@ -24,11 +24,11 @@ import org.onlab.junit.TestTools;
 import org.onlab.junit.TestUtils;
 import org.onosproject.common.event.impl.TestEventDispatcher;
 import org.onosproject.event.Event;
-import org.onosproject.incubator.net.key.DeviceKey;
-import org.onosproject.incubator.net.key.DeviceKeyEvent;
-import org.onosproject.incubator.net.key.DeviceKeyId;
-import org.onosproject.incubator.net.key.DeviceKeyListener;
-import org.onosproject.incubator.net.key.DeviceKeyService;
+import org.onosproject.net.key.DeviceKey;
+import org.onosproject.net.key.DeviceKeyEvent;
+import org.onosproject.net.key.DeviceKeyId;
+import org.onosproject.net.key.DeviceKeyListener;
+import org.onosproject.net.key.DeviceKeyService;
 import org.onosproject.incubator.store.key.impl.DistributedDeviceKeyStore;
 import org.onosproject.net.NetTestTools;
 import org.onosproject.store.service.TestStorageService;

incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStore.java

@@ -22,11 +22,11 @@ import org.apache.felix.scr.annotations.Deactivate;
 import org.apache.felix.scr.annotations.Reference;
 import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.apache.felix.scr.annotations.Service;
-import org.onosproject.incubator.net.key.DeviceKey;
-import org.onosproject.incubator.net.key.DeviceKeyEvent;
-import org.onosproject.incubator.net.key.DeviceKeyId;
-import org.onosproject.incubator.net.key.DeviceKeyStore;
-import org.onosproject.incubator.net.key.DeviceKeyStoreDelegate;
+import org.onosproject.net.key.DeviceKey;
+import org.onosproject.net.key.DeviceKeyEvent;
+import org.onosproject.net.key.DeviceKeyId;
+import org.onosproject.net.key.DeviceKeyStore;
+import org.onosproject.net.key.DeviceKeyStoreDelegate;
 import org.onosproject.store.AbstractStore;
 import org.onosproject.store.serializers.KryoNamespaces;
 import org.onosproject.store.service.ConsistentMap;

incubator/store/src/test/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStoreTest.java

@@ -19,8 +19,8 @@ package org.onosproject.incubator.store.key.impl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.onosproject.incubator.net.key.DeviceKey;
-import org.onosproject.incubator.net.key.DeviceKeyId;
+import org.onosproject.net.key.DeviceKey;
+import org.onosproject.net.key.DeviceKeyId;
 import org.onosproject.store.service.TestStorageService;
 
 import java.util.Collection;