mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-16 18:02:05 +02:00
Code Issues Projects Releases Wiki Activity

ONOS-3931: move DeviceKey manager and store implementations from incubator to core

Browse Source 
Change-Id: I2c26d7a4106be5b8f631b010cc7a167de957c9d2
This commit is contained in:
Claudine Chiu 2016-02-18 19:56:42 +00:00
parent 784ee0ff97
commit e014b3ad5a
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/DeviceKeyManager.java → core/net/src/main/java/org/onosproject/net/key/impl/DeviceKeyManager.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.onosproject.incubator.net.key.impl; package org.onosproject.net.key.impl;
import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Component;

2
incubator/net/src/main/java/org/onosproject/incubator/net/key/impl/package-info.java → core/net/src/main/java/org/onosproject/net/key/impl/package-info.java
View File

@ -17,4 +17,4 @@
/** /**
* Implementation of device key subsystem. * Implementation of device key subsystem.
*/ */
package org.onosproject.incubator.net.key.impl; package org.onosproject.net.key.impl;

4
incubator/net/src/test/java/org/onosproject/incubator/net/key/impl/DeviceKeyManagerTest.java → core/net/src/test/java/org/onosproject/net/key/impl/DeviceKeyManagerTest.java
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.onosproject.incubator.net.key.impl; package org.onosproject.net.key.impl;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import org.junit.After; import org.junit.After;
@ -29,7 +29,7 @@ import org.onosproject.net.key.DeviceKeyEvent;
import org.onosproject.net.key.DeviceKeyId; import org.onosproject.net.key.DeviceKeyId;
import org.onosproject.net.key.DeviceKeyListener; import org.onosproject.net.key.DeviceKeyListener;
import org.onosproject.net.key.DeviceKeyService; import org.onosproject.net.key.DeviceKeyService;
import org.onosproject.incubator.store.key.impl.DistributedDeviceKeyStore; import org.onosproject.store.key.impl.DistributedDeviceKeyStore;
import org.onosproject.net.NetTestTools; import org.onosproject.net.NetTestTools;
import org.onosproject.store.service.TestStorageService; import org.onosproject.store.service.TestStorageService;

2
incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStore.java → core/store/dist/src/main/java/org/onosproject/store/key/impl/DistributedDeviceKeyStore.java vendored
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.onosproject.incubator.store.key.impl; package org.onosproject.store.key.impl;
import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Component;

2
incubator/store/src/main/java/org/onosproject/incubator/store/key/impl/package-info.java → core/store/dist/src/main/java/org/onosproject/store/key/impl/package-info.java vendored
View File

@ -18,4 +18,4 @@
* A distributed device key store implementation that stores device key * A distributed device key store implementation that stores device key
* data consistently across the cluster. * data consistently across the cluster.
*/ */
package org.onosproject.incubator.store.key.impl; package org.onosproject.store.key.impl;

2
incubator/store/src/test/java/org/onosproject/incubator/store/key/impl/DistributedDeviceKeyStoreTest.java → core/store/dist/src/test/java/org/onosproject/store/key/impl/DistributedDeviceKeyStoreTest.java vendored
View File

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.onosproject.incubator.store.key.impl; package org.onosproject.store.key.impl;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;