ONOS-6889 Move mcast from incubator to core
Change-Id: Icfc7294e7017b640321dd9343778cd11c2cd0cb8
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/mcast/impl/MulticastRouteManager.java b/core/net/src/main/java/org/onosproject/net/mcast/impl/MulticastRouteManager.java
similarity index 98%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/mcast/impl/MulticastRouteManager.java
rename to core/net/src/main/java/org/onosproject/net/mcast/impl/MulticastRouteManager.java
index dc7c99c..913dcdb 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/mcast/impl/MulticastRouteManager.java
+++ b/core/net/src/main/java/org/onosproject/net/mcast/impl/MulticastRouteManager.java
@@ -13,7 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.incubator.net.mcast.impl;
+package org.onosproject.net.mcast.impl;
+
+import java.util.Set;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -31,8 +33,6 @@
import org.onosproject.net.mcast.MulticastRouteService;
import org.slf4j.Logger;
-import java.util.Set;
-
import static com.google.common.base.Preconditions.checkNotNull;
import static org.slf4j.LoggerFactory.getLogger;
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/mcast/impl/package-info.java b/core/net/src/main/java/org/onosproject/net/mcast/impl/package-info.java
similarity index 92%
rename from incubator/net/src/main/java/org/onosproject/incubator/net/mcast/impl/package-info.java
rename to core/net/src/main/java/org/onosproject/net/mcast/impl/package-info.java
index ea24cd4..19b8d61 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/mcast/impl/package-info.java
+++ b/core/net/src/main/java/org/onosproject/net/mcast/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* An implementation of a multicast RIB.
*/
-package org.onosproject.incubator.net.mcast.impl;
\ No newline at end of file
+package org.onosproject.net.mcast.impl;
diff --git a/incubator/net/src/test/java/org/onosproject/incubator/net/mcast/impl/MulticastRouteManagerTest.java b/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java
similarity index 97%
rename from incubator/net/src/test/java/org/onosproject/incubator/net/mcast/impl/MulticastRouteManagerTest.java
rename to core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java
index d568cbd..f5b26c2 100644
--- a/incubator/net/src/test/java/org/onosproject/incubator/net/mcast/impl/MulticastRouteManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/mcast/impl/MulticastRouteManagerTest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.incubator.net.mcast.impl;
+package org.onosproject.net.mcast.impl;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -26,7 +26,7 @@
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreServiceAdapter;
import org.onosproject.core.DefaultApplicationId;
-import org.onosproject.incubator.store.mcast.impl.DistributedMcastStore;
+import org.onosproject.store.mcast.impl.DistributedMcastStore;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.PortNumber;
import org.onosproject.net.mcast.McastEvent;
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java b/core/store/dist/src/main/java/org/onosproject/store/mcast/impl/DistributedMcastStore.java
similarity index 98%
rename from incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java
rename to core/store/dist/src/main/java/org/onosproject/store/mcast/impl/DistributedMcastStore.java
index 53862c3..8a3db91 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/DistributedMcastStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/mcast/impl/DistributedMcastStore.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.incubator.store.mcast.impl;
+package org.onosproject.store.mcast.impl;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java b/core/store/dist/src/main/java/org/onosproject/store/mcast/impl/MulticastData.java
similarity index 97%
rename from incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java
rename to core/store/dist/src/main/java/org/onosproject/store/mcast/impl/MulticastData.java
index 47efe19..3dd8297 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/MulticastData.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/mcast/impl/MulticastData.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.incubator.store.mcast.impl;
+package org.onosproject.store.mcast.impl;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
diff --git a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/mcast/impl/package-info.java
similarity index 93%
rename from incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/package-info.java
rename to core/store/dist/src/main/java/org/onosproject/store/mcast/impl/package-info.java
index fb10283..99f28b5 100644
--- a/incubator/store/src/main/java/org/onosproject/incubator/store/mcast/impl/package-info.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/mcast/impl/package-info.java
@@ -18,4 +18,4 @@
* A distributed multicast store implementation that stores multicast rib
* data consistently across the cluster.
*/
-package org.onosproject.incubator.store.mcast.impl;
+package org.onosproject.store.mcast.impl;