commit a4122367b065685b0801e530784153de521fbfff
author Ray Milkey <ray@onlab.us> Tue Aug 18 15:19:08 2015 -0700
committer Ray Milkey <ray@onlab.us> Wed Aug 19 08:59:12 2015 -0700
tree 1ecc65d1db6d8715b6b8148816f275c6460330ae
parent eadfc8e3460249dfbfc40139ce2211c265cb9e0e

ONOS-2190 - Move org.onosproject.net.config.* out of the incubator

Change-Id: I57cac27ae370ce1155b4f637646d6c25732844e9

core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java

diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java b/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
index c10b7e8..ae6a3b2 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/BasicDeviceOperator.java
@@ -17,7 +17,7 @@
 
 import static org.slf4j.LoggerFactory.getLogger;
 
-import org.onosproject.incubator.net.config.ConfigOperator;
+import org.onosproject.net.config.ConfigOperator;
 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig;
 import org.onosproject.net.AnnotationKeys;
 import org.onosproject.net.DefaultAnnotations;

core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index 01f85d8..6a1724d 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -28,9 +28,9 @@
 import org.onosproject.cluster.NodeId;
 import org.onosproject.net.provider.AbstractListenerProviderRegistry;
 import org.onosproject.core.Permission;
-import org.onosproject.incubator.net.config.NetworkConfigEvent;
-import org.onosproject.incubator.net.config.NetworkConfigListener;
-import org.onosproject.incubator.net.config.NetworkConfigService;
+import org.onosproject.net.config.NetworkConfigEvent;
+import org.onosproject.net.config.NetworkConfigListener;
+import org.onosproject.net.config.NetworkConfigService;
 import org.onosproject.incubator.net.config.basics.BasicDeviceConfig;
 import org.onosproject.mastership.MastershipEvent;
 import org.onosproject.mastership.MastershipListener;

core/net/src/main/java/org/onosproject/net/device/impl/OpticalPortOperator.java

diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/OpticalPortOperator.java b/core/net/src/main/java/org/onosproject/net/device/impl/OpticalPortOperator.java
index 9fa452a..7c551eb 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/OpticalPortOperator.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/OpticalPortOperator.java
@@ -17,7 +17,7 @@
 
 import static org.slf4j.LoggerFactory.getLogger;
 
-import org.onosproject.incubator.net.config.ConfigOperator;
+import org.onosproject.net.config.ConfigOperator;
 import org.onosproject.incubator.net.config.basics.OpticalPortConfig;
 import org.onosproject.net.AnnotationKeys;
 import org.onosproject.net.DefaultAnnotations;