홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Claudine Chiu
Committed by Gerrit Code Review
31ad527e 1 parent c86b00ed

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

Change-Id: I90da894317583ce8d6cfb238e933ff28ad2c83ca
Inline Side-by-side
Showing 23 changed files with 43 additions and 43 deletions
...@@ -19,7 +19,7 @@ import org.onosproject.cluster.ControllerNode; ...@@ -19,7 +19,7 @@ import org.onosproject.cluster.ControllerNode;
19 import org.onosproject.core.Application; 19 import org.onosproject.core.Application;
20 import org.onosproject.core.ApplicationId; 20 import org.onosproject.core.ApplicationId;
21 import org.onosproject.incubator.net.intf.Interface; 21 import org.onosproject.incubator.net.intf.Interface;
22 -import org.onosproject.incubator.net.key.DeviceKey; 22 +import org.onosproject.net.key.DeviceKey;
23 import org.onosproject.net.ConnectPoint; 23 import org.onosproject.net.ConnectPoint;
24 import org.onosproject.net.Element; 24 import org.onosproject.net.Element;
25 import org.onosproject.net.ElementId; 25 import org.onosproject.net.ElementId;
......
...@@ -20,9 +20,9 @@ import org.apache.karaf.shell.commands.Argument; ...@@ -20,9 +20,9 @@ import org.apache.karaf.shell.commands.Argument;
20 import org.apache.karaf.shell.commands.Command; 20 import org.apache.karaf.shell.commands.Command;
21 import org.apache.karaf.shell.commands.Option; 21 import org.apache.karaf.shell.commands.Option;
22 import org.onosproject.cli.AbstractShellCommand; 22 import org.onosproject.cli.AbstractShellCommand;
23 -import org.onosproject.incubator.net.key.DeviceKey; 23 +import org.onosproject.net.key.DeviceKey;
24 -import org.onosproject.incubator.net.key.DeviceKeyAdminService; 24 +import org.onosproject.net.key.DeviceKeyAdminService;
25 -import org.onosproject.incubator.net.key.DeviceKeyId; 25 +import org.onosproject.net.key.DeviceKeyId;
26 26
27 /** 27 /**
28 * Adds a device key. 28 * Adds a device key.
......
...@@ -19,8 +19,8 @@ package org.onosproject.cli.net; ...@@ -19,8 +19,8 @@ package org.onosproject.cli.net;
19 import org.apache.karaf.shell.commands.Command; 19 import org.apache.karaf.shell.commands.Command;
20 import org.onosproject.cli.AbstractShellCommand; 20 import org.onosproject.cli.AbstractShellCommand;
21 import org.onosproject.cli.Comparators; 21 import org.onosproject.cli.Comparators;
22 -import org.onosproject.incubator.net.key.DeviceKey; 22 +import org.onosproject.net.key.DeviceKey;
23 -import org.onosproject.incubator.net.key.DeviceKeyService; 23 +import org.onosproject.net.key.DeviceKeyService;
24 24
25 import java.util.Collections; 25 import java.util.Collections;
26 import java.util.List; 26 import java.util.List;
......
...@@ -19,8 +19,8 @@ package org.onosproject.cli.net; ...@@ -19,8 +19,8 @@ package org.onosproject.cli.net;
19 import org.apache.karaf.shell.commands.Argument; 19 import org.apache.karaf.shell.commands.Argument;
20 import org.apache.karaf.shell.commands.Command; 20 import org.apache.karaf.shell.commands.Command;
21 import org.onosproject.cli.AbstractShellCommand; 21 import org.onosproject.cli.AbstractShellCommand;
22 -import org.onosproject.incubator.net.key.DeviceKeyAdminService; 22 +import org.onosproject.net.key.DeviceKeyAdminService;
23 -import org.onosproject.incubator.net.key.DeviceKeyId; 23 +import org.onosproject.net.key.DeviceKeyId;
24 24
25 /** 25 /**
26 * Removes a device key. 26 * Removes a device key.
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 /** 19 /**
20 * Representation of an SNMP community name authentication token. 20 * Representation of an SNMP community name authentication token.
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
20 import org.onosproject.net.AbstractAnnotated; 20 import org.onosproject.net.AbstractAnnotated;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
20 20
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
20 import org.onosproject.event.AbstractEvent; 20 import org.onosproject.event.AbstractEvent;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import java.util.Objects; 19 import java.util.Objects;
20 20
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
20 import org.onosproject.event.EventListener; 20 import org.onosproject.event.EventListener;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
20 import org.onosproject.event.ListenerService; 20 import org.onosproject.event.ListenerService;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
20 import org.onosproject.store.Store; 20 import org.onosproject.store.Store;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import com.google.common.annotations.Beta; 19 import com.google.common.annotations.Beta;
20 import org.onosproject.store.StoreDelegate; 20 import org.onosproject.store.StoreDelegate;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 /** 19 /**
20 * Representation of a username and password. 20 * Representation of a username and password.
......
...@@ -18,4 +18,4 @@ ...@@ -18,4 +18,4 @@
18 * Device key data model and services. 18 * Device key data model and services.
19 * This subsystem and its interfaces will change in the upcoming release. 19 * This subsystem and its interfaces will change in the upcoming release.
20 */ 20 */
21 -package org.onosproject.incubator.net.key;
...\ No newline at end of file ...\ No newline at end of file
21 +package org.onosproject.net.key;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import org.junit.Test; 19 import org.junit.Test;
20 20
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import com.google.common.testing.EqualsTester; 19 import com.google.common.testing.EqualsTester;
20 import org.junit.Test; 20 import org.junit.Test;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import org.junit.Test; 19 import org.junit.Test;
20 20
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.incubator.net.key; 17 +package org.onosproject.net.key;
18 18
19 import org.junit.Test; 19 import org.junit.Test;
20 20
......
...@@ -23,14 +23,14 @@ import org.apache.felix.scr.annotations.Reference; ...@@ -23,14 +23,14 @@ import org.apache.felix.scr.annotations.Reference;
23 import org.apache.felix.scr.annotations.ReferenceCardinality; 23 import org.apache.felix.scr.annotations.ReferenceCardinality;
24 import org.apache.felix.scr.annotations.Service; 24 import org.apache.felix.scr.annotations.Service;
25 import org.onosproject.event.AbstractListenerManager; 25 import org.onosproject.event.AbstractListenerManager;
26 -import org.onosproject.incubator.net.key.DeviceKey; 26 +import org.onosproject.net.key.DeviceKey;
27 -import org.onosproject.incubator.net.key.DeviceKeyAdminService; 27 +import org.onosproject.net.key.DeviceKeyAdminService;
28 -import org.onosproject.incubator.net.key.DeviceKeyEvent; 28 +import org.onosproject.net.key.DeviceKeyEvent;
29 -import org.onosproject.incubator.net.key.DeviceKeyId; 29 +import org.onosproject.net.key.DeviceKeyId;
30 -import org.onosproject.incubator.net.key.DeviceKeyListener; 30 +import org.onosproject.net.key.DeviceKeyListener;
31 -import org.onosproject.incubator.net.key.DeviceKeyService; 31 +import org.onosproject.net.key.DeviceKeyService;
32 -import org.onosproject.incubator.net.key.DeviceKeyStore; 32 +import org.onosproject.net.key.DeviceKeyStore;
33 -import org.onosproject.incubator.net.key.DeviceKeyStoreDelegate; 33 +import org.onosproject.net.key.DeviceKeyStoreDelegate;
34 import org.slf4j.Logger; 34 import org.slf4j.Logger;
35 35
36 import java.util.Collection; 36 import java.util.Collection;
......
...@@ -24,11 +24,11 @@ import org.onlab.junit.TestTools; ...@@ -24,11 +24,11 @@ import org.onlab.junit.TestTools;
24 import org.onlab.junit.TestUtils; 24 import org.onlab.junit.TestUtils;
25 import org.onosproject.common.event.impl.TestEventDispatcher; 25 import org.onosproject.common.event.impl.TestEventDispatcher;
26 import org.onosproject.event.Event; 26 import org.onosproject.event.Event;
27 -import org.onosproject.incubator.net.key.DeviceKey; 27 +import org.onosproject.net.key.DeviceKey;
28 -import org.onosproject.incubator.net.key.DeviceKeyEvent; 28 +import org.onosproject.net.key.DeviceKeyEvent;
29 -import org.onosproject.incubator.net.key.DeviceKeyId; 29 +import org.onosproject.net.key.DeviceKeyId;
30 -import org.onosproject.incubator.net.key.DeviceKeyListener; 30 +import org.onosproject.net.key.DeviceKeyListener;
31 -import org.onosproject.incubator.net.key.DeviceKeyService; 31 +import org.onosproject.net.key.DeviceKeyService;
32 import org.onosproject.incubator.store.key.impl.DistributedDeviceKeyStore; 32 import org.onosproject.incubator.store.key.impl.DistributedDeviceKeyStore;
33 import org.onosproject.net.NetTestTools; 33 import org.onosproject.net.NetTestTools;
34 import org.onosproject.store.service.TestStorageService; 34 import org.onosproject.store.service.TestStorageService;
......
...@@ -22,11 +22,11 @@ import org.apache.felix.scr.annotations.Deactivate; ...@@ -22,11 +22,11 @@ import org.apache.felix.scr.annotations.Deactivate;
22 import org.apache.felix.scr.annotations.Reference; 22 import org.apache.felix.scr.annotations.Reference;
23 import org.apache.felix.scr.annotations.ReferenceCardinality; 23 import org.apache.felix.scr.annotations.ReferenceCardinality;
24 import org.apache.felix.scr.annotations.Service; 24 import org.apache.felix.scr.annotations.Service;
25 -import org.onosproject.incubator.net.key.DeviceKey; 25 +import org.onosproject.net.key.DeviceKey;
26 -import org.onosproject.incubator.net.key.DeviceKeyEvent; 26 +import org.onosproject.net.key.DeviceKeyEvent;
27 -import org.onosproject.incubator.net.key.DeviceKeyId; 27 +import org.onosproject.net.key.DeviceKeyId;
28 -import org.onosproject.incubator.net.key.DeviceKeyStore; 28 +import org.onosproject.net.key.DeviceKeyStore;
29 -import org.onosproject.incubator.net.key.DeviceKeyStoreDelegate; 29 +import org.onosproject.net.key.DeviceKeyStoreDelegate;
30 import org.onosproject.store.AbstractStore; 30 import org.onosproject.store.AbstractStore;
31 import org.onosproject.store.serializers.KryoNamespaces; 31 import org.onosproject.store.serializers.KryoNamespaces;
32 import org.onosproject.store.service.ConsistentMap; 32 import org.onosproject.store.service.ConsistentMap;
......
...@@ -19,8 +19,8 @@ package org.onosproject.incubator.store.key.impl; ...@@ -19,8 +19,8 @@ package org.onosproject.incubator.store.key.impl;
19 import org.junit.After; 19 import org.junit.After;
20 import org.junit.Before; 20 import org.junit.Before;
21 import org.junit.Test; 21 import org.junit.Test;
22 -import org.onosproject.incubator.net.key.DeviceKey; 22 +import org.onosproject.net.key.DeviceKey;
23 -import org.onosproject.incubator.net.key.DeviceKeyId; 23 +import org.onosproject.net.key.DeviceKeyId;
24 import org.onosproject.store.service.TestStorageService; 24 import org.onosproject.store.service.TestStorageService;
25 25
26 import java.util.Collection; 26 import java.util.Collection;
......