diff --git a/cli/src/main/java/org/onosproject/cli/Comparators.java b/cli/src/main/java/org/onosproject/cli/Comparators.java index c1c019ec0f..530c296270 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.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; 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 2c636ca749..142e354e7c 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.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. 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 5d84f5996b..eb2ad6ea42 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 @@ 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; 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 329c9af938..f88d71c9c1 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 @@ 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. diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/CommunityName.java b/core/api/src/main/java/org/onosproject/net/key/CommunityName.java similarity index 96% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/CommunityName.java rename to core/api/src/main/java/org/onosproject/net/key/CommunityName.java index 02a9ad38d0..3c3e29eac2 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/CommunityName.java +++ b/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. diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKey.java b/core/api/src/main/java/org/onosproject/net/key/DeviceKey.java similarity index 99% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKey.java rename to core/api/src/main/java/org/onosproject/net/key/DeviceKey.java index 012636def8..3f4a9fd892 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKey.java +++ b/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; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyAdminService.java b/core/api/src/main/java/org/onosproject/net/key/DeviceKeyAdminService.java similarity index 96% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyAdminService.java rename to core/api/src/main/java/org/onosproject/net/key/DeviceKeyAdminService.java index be7f02fd55..9e4f168439 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyAdminService.java +++ b/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; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyEvent.java b/core/api/src/main/java/org/onosproject/net/key/DeviceKeyEvent.java similarity index 97% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyEvent.java rename to core/api/src/main/java/org/onosproject/net/key/DeviceKeyEvent.java index 8c2acb4bca..2cd1d57d70 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyEvent.java +++ b/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; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyId.java b/core/api/src/main/java/org/onosproject/net/key/DeviceKeyId.java similarity index 98% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyId.java rename to core/api/src/main/java/org/onosproject/net/key/DeviceKeyId.java index a4bdac7b09..12c1d95ffe 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyId.java +++ b/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; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyListener.java b/core/api/src/main/java/org/onosproject/net/key/DeviceKeyListener.java similarity index 95% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyListener.java rename to core/api/src/main/java/org/onosproject/net/key/DeviceKeyListener.java index c9268a481b..f7f8080b0a 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyListener.java +++ b/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; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyService.java b/core/api/src/main/java/org/onosproject/net/key/DeviceKeyService.java similarity index 96% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyService.java rename to core/api/src/main/java/org/onosproject/net/key/DeviceKeyService.java index b869aebad7..b87530fce5 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyService.java +++ b/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; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStore.java b/core/api/src/main/java/org/onosproject/net/key/DeviceKeyStore.java similarity index 97% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStore.java rename to core/api/src/main/java/org/onosproject/net/key/DeviceKeyStore.java index d25c28f343..c9b1194d97 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStore.java +++ b/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; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStoreDelegate.java b/core/api/src/main/java/org/onosproject/net/key/DeviceKeyStoreDelegate.java similarity index 95% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStoreDelegate.java rename to core/api/src/main/java/org/onosproject/net/key/DeviceKeyStoreDelegate.java index 0ae7b853f8..e78912bc14 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/DeviceKeyStoreDelegate.java +++ b/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; diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/UsernamePassword.java b/core/api/src/main/java/org/onosproject/net/key/UsernamePassword.java similarity index 97% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/UsernamePassword.java rename to core/api/src/main/java/org/onosproject/net/key/UsernamePassword.java index e3ca1fb9a0..d496fc35e2 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/UsernamePassword.java +++ b/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. diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/key/package-info.java b/core/api/src/main/java/org/onosproject/net/key/package-info.java similarity index 94% rename from incubator/api/src/main/java/org/onosproject/incubator/net/key/package-info.java rename to core/api/src/main/java/org/onosproject/net/key/package-info.java index 35e53dbeca..0e88963c5c 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/key/package-info.java +++ b/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; \ No newline at end of file +package org.onosproject.net.key; \ No newline at end of file diff --git a/incubator/api/src/test/java/org/onosproject/incubator/net/key/CommunityNameTest.java b/core/api/src/test/java/org/onosproject/net/key/CommunityNameTest.java similarity index 97% rename from incubator/api/src/test/java/org/onosproject/incubator/net/key/CommunityNameTest.java rename to core/api/src/test/java/org/onosproject/net/key/CommunityNameTest.java index 5da0f1d571..5e2d4a9eac 100644 --- a/incubator/api/src/test/java/org/onosproject/incubator/net/key/CommunityNameTest.java +++ b/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; diff --git a/incubator/api/src/test/java/org/onosproject/incubator/net/key/DeviceKeyIdTest.java b/core/api/src/test/java/org/onosproject/net/key/DeviceKeyIdTest.java similarity index 98% rename from incubator/api/src/test/java/org/onosproject/incubator/net/key/DeviceKeyIdTest.java rename to core/api/src/test/java/org/onosproject/net/key/DeviceKeyIdTest.java index 5f6c477c42..67444607d7 100644 --- a/incubator/api/src/test/java/org/onosproject/incubator/net/key/DeviceKeyIdTest.java +++ b/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; diff --git a/incubator/api/src/test/java/org/onosproject/incubator/net/key/DeviceKeyTest.java b/core/api/src/test/java/org/onosproject/net/key/DeviceKeyTest.java similarity index 99% rename from incubator/api/src/test/java/org/onosproject/incubator/net/key/DeviceKeyTest.java rename to core/api/src/test/java/org/onosproject/net/key/DeviceKeyTest.java index 52e5e8857f..344a425892 100644 --- a/incubator/api/src/test/java/org/onosproject/incubator/net/key/DeviceKeyTest.java +++ b/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; diff --git a/incubator/api/src/test/java/org/onosproject/incubator/net/key/UsernamePasswordTest.java b/core/api/src/test/java/org/onosproject/net/key/UsernamePasswordTest.java similarity index 98% rename from incubator/api/src/test/java/org/onosproject/incubator/net/key/UsernamePasswordTest.java rename to core/api/src/test/java/org/onosproject/net/key/UsernamePasswordTest.java index 242a26338d..d8acafb2a0 100644 --- a/incubator/api/src/test/java/org/onosproject/incubator/net/key/UsernamePasswordTest.java +++ b/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; diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/DeviceKeyManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/DeviceKeyManager.java index d650732ddd..65c3eb97ba 100644 --- a/incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/DeviceKeyManager.java +++ b/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; diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/key/impl/DeviceKeyManagerTest.java b/incubator/net/src/test/java/org/onosproject/incubator/net/key/impl/DeviceKeyManagerTest.java index 4a1519173f..215030d40c 100644 --- a/incubator/net/src/test/java/org/onosproject/incubator/net/key/impl/DeviceKeyManagerTest.java +++ b/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; diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStore.java b/incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStore.java index 5c865f5bd6..83dc5341cf 100644 --- a/incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStore.java +++ b/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; diff --git a/incubator/store/src/test/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStoreTest.java b/incubator/store/src/test/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStoreTest.java index 6b271217c6..2ab2d8746e 100644 --- a/incubator/store/src/test/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStoreTest.java +++ b/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;