Changing org.onlab.onos package to org.onosproject
Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575
diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java
index 5e7048a..2354340 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStore.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.host.impl;
+package org.onosproject.store.host.impl;
import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor;
-import static org.onlab.onos.cluster.ControllerNodeToNodeId.toNodeId;
-import static org.onlab.onos.net.DefaultAnnotations.merge;
-import static org.onlab.onos.net.host.HostEvent.Type.HOST_ADDED;
-import static org.onlab.onos.net.host.HostEvent.Type.HOST_MOVED;
-import static org.onlab.onos.net.host.HostEvent.Type.HOST_REMOVED;
-import static org.onlab.onos.net.host.HostEvent.Type.HOST_UPDATED;
+import static org.onosproject.cluster.ControllerNodeToNodeId.toNodeId;
+import static org.onosproject.net.DefaultAnnotations.merge;
+import static org.onosproject.net.host.HostEvent.Type.HOST_ADDED;
+import static org.onosproject.net.host.HostEvent.Type.HOST_MOVED;
+import static org.onosproject.net.host.HostEvent.Type.HOST_REMOVED;
+import static org.onosproject.net.host.HostEvent.Type.HOST_UPDATED;
import static org.onlab.util.Tools.namedThreads;
import static org.onlab.util.Tools.minPriority;
import static org.slf4j.LoggerFactory.getLogger;
@@ -46,34 +46,34 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.cluster.ClusterService;
-import org.onlab.onos.cluster.ControllerNode;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.net.Annotations;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.DefaultAnnotations;
-import org.onlab.onos.net.DefaultHost;
-import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.HostLocation;
-import org.onlab.onos.net.host.DefaultHostDescription;
-import org.onlab.onos.net.host.HostClockService;
-import org.onlab.onos.net.host.HostDescription;
-import org.onlab.onos.net.host.HostEvent;
-import org.onlab.onos.net.host.HostStore;
-import org.onlab.onos.net.host.HostStoreDelegate;
-import org.onlab.onos.net.host.PortAddresses;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.AbstractStore;
-import org.onlab.onos.store.Timestamp;
-import org.onlab.onos.store.cluster.messaging.ClusterCommunicationService;
-import org.onlab.onos.store.cluster.messaging.ClusterMessage;
-import org.onlab.onos.store.cluster.messaging.ClusterMessageHandler;
-import org.onlab.onos.store.cluster.messaging.MessageSubject;
-import org.onlab.onos.store.impl.Timestamped;
-import org.onlab.onos.store.serializers.KryoSerializer;
-import org.onlab.onos.store.serializers.impl.DistributedStoreSerializers;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.ControllerNode;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.net.Annotations;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultAnnotations;
+import org.onosproject.net.DefaultHost;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Host;
+import org.onosproject.net.HostId;
+import org.onosproject.net.HostLocation;
+import org.onosproject.net.host.DefaultHostDescription;
+import org.onosproject.net.host.HostClockService;
+import org.onosproject.net.host.HostDescription;
+import org.onosproject.net.host.HostEvent;
+import org.onosproject.net.host.HostStore;
+import org.onosproject.net.host.HostStoreDelegate;
+import org.onosproject.net.host.PortAddresses;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.AbstractStore;
+import org.onosproject.store.Timestamp;
+import org.onosproject.store.cluster.messaging.ClusterCommunicationService;
+import org.onosproject.store.cluster.messaging.ClusterMessage;
+import org.onosproject.store.cluster.messaging.ClusterMessageHandler;
+import org.onosproject.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.impl.Timestamped;
+import org.onosproject.store.serializers.KryoSerializer;
+import org.onosproject.store.serializers.impl.DistributedStoreSerializers;
import org.onlab.packet.IpAddress;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStoreMessageSubjects.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStoreMessageSubjects.java
index 36e018d..52dc31d 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStoreMessageSubjects.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/GossipHostStoreMessageSubjects.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.host.impl;
+package org.onosproject.store.host.impl;
-import org.onlab.onos.store.cluster.messaging.MessageSubject;
+import org.onosproject.store.cluster.messaging.MessageSubject;
public final class GossipHostStoreMessageSubjects {
private GossipHostStoreMessageSubjects() {}
diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostAntiEntropyAdvertisement.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostAntiEntropyAdvertisement.java
index 8e5877c..0df0990 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostAntiEntropyAdvertisement.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostAntiEntropyAdvertisement.java
@@ -13,15 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.host.impl;
+package org.onosproject.store.host.impl;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-import org.onlab.onos.cluster.NodeId;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.store.Timestamp;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.net.HostId;
+import org.onosproject.store.Timestamp;
/**
* Host AE Advertisement message.
diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostClockManager.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostClockManager.java
index ec954ba..097af85 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostClockManager.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostClockManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.host.impl;
+package org.onosproject.store.host.impl;
import static org.slf4j.LoggerFactory.getLogger;
@@ -21,10 +21,10 @@
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.host.HostClockService;
-import org.onlab.onos.store.Timestamp;
-import org.onlab.onos.store.impl.WallClockTimestamp;
+import org.onosproject.net.HostId;
+import org.onosproject.net.host.HostClockService;
+import org.onosproject.store.Timestamp;
+import org.onosproject.store.impl.WallClockTimestamp;
import org.slf4j.Logger;
/**
diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostFragmentId.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostFragmentId.java
index d935946..19810ed 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostFragmentId.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/HostFragmentId.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.host.impl;
+package org.onosproject.store.host.impl;
import java.util.Objects;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.provider.ProviderId;
+import org.onosproject.net.HostId;
+import org.onosproject.net.provider.ProviderId;
import com.google.common.base.MoreObjects;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostEvent.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostEvent.java
index 92afea4..e7ba997 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostEvent.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.host.impl;
+package org.onosproject.store.host.impl;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.net.host.HostDescription;
-import org.onlab.onos.net.provider.ProviderId;
-import org.onlab.onos.store.Timestamp;
+import org.onosproject.net.HostId;
+import org.onosproject.net.host.HostDescription;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.Timestamp;
/**
* Information published by GossipHostStore to notify peers of a host
diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostRemovedEvent.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostRemovedEvent.java
index 0269691..a4a72da 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostRemovedEvent.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/InternalHostRemovedEvent.java
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.store.host.impl;
+package org.onosproject.store.host.impl;
-import org.onlab.onos.net.HostId;
-import org.onlab.onos.store.Timestamp;
+import org.onosproject.net.HostId;
+import org.onosproject.store.Timestamp;
/**
* Information published by GossipHostStore to notify peers of a host
diff --git a/core/store/dist/src/main/java/org/onosproject/store/host/impl/package-info.java b/core/store/dist/src/main/java/org/onosproject/store/host/impl/package-info.java
index a2e8ed1..635b113 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/host/impl/package-info.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/host/impl/package-info.java
@@ -17,4 +17,4 @@
/**
* Implementation of the distributed host store using p2p synchronization protocol.
*/
-package org.onlab.onos.store.host.impl;
+package org.onosproject.store.host.impl;