commit | a4122367b065685b0801e530784153de521fbfff | [log] [tgz] |
---|---|---|
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 [diff] |
ONOS-2190 - Move org.onosproject.net.config.* out of the incubator Change-Id: I57cac27ae370ce1155b4f637646d6c25732844e9
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/AllowedEntityConfig.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/AllowedEntityConfig.java index 6651ad4..b712fb6 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/AllowedEntityConfig.java +++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/AllowedEntityConfig.java
@@ -15,7 +15,7 @@ */ package org.onosproject.incubator.net.config.basics; -import org.onosproject.incubator.net.config.Config; +import org.onosproject.net.config.Config; /** * Base abstraction for network entities for which admission into control
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/InterfaceConfig.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/InterfaceConfig.java index 4211fd2..6244676 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/InterfaceConfig.java +++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/InterfaceConfig.java
@@ -20,7 +20,7 @@ import com.google.common.collect.Sets; import org.onlab.packet.MacAddress; import org.onlab.packet.VlanId; -import org.onosproject.incubator.net.config.Config; +import org.onosproject.net.config.Config; import org.onosproject.incubator.net.intf.Interface; import org.onosproject.net.ConnectPoint; import org.onosproject.net.host.InterfaceIpAddress;
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/OpticalPortConfig.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/OpticalPortConfig.java index e9aad7a..c873d84 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/OpticalPortConfig.java +++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/OpticalPortConfig.java
@@ -2,7 +2,7 @@ import java.util.Optional; -import org.onosproject.incubator.net.config.Config; +import org.onosproject.net.config.Config; import org.onosproject.net.ConnectPoint; import org.onosproject.net.Port;
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/SubjectFactories.java b/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/SubjectFactories.java index 0ba9459..5110a8f 100644 --- a/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/SubjectFactories.java +++ b/incubator/api/src/main/java/org/onosproject/incubator/net/config/basics/SubjectFactories.java
@@ -17,7 +17,7 @@ import org.onosproject.core.ApplicationId; import org.onosproject.core.CoreService; -import org.onosproject.incubator.net.config.SubjectFactory; +import org.onosproject.net.config.SubjectFactory; import org.onosproject.incubator.net.domain.IntentDomainId; import org.onosproject.net.ConnectPoint; import org.onosproject.net.DeviceId;