Changing org.onlab.onos package to org.onosproject
Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java b/core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java
index 5c244b1..e567540 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterAdminService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import org.onlab.packet.IpAddress;
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java b/core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java
index 0f95e30..7bdc1d7 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterEvent.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.event.AbstractEvent;
/**
* Describes cluster-related event.
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java b/core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java
index 14554ef..79ff06e 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterEventListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving device cluster-related events.
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterService.java b/core/api/src/main/java/org/onosproject/cluster/ClusterService.java
index 6d2a455..1d21de7 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterService.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterStore.java b/core/api/src/main/java/org/onosproject/cluster/ClusterStore.java
index 0a4ac58..bb0c91c 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterStore.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterStore.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.store.Store;
+import org.onosproject.store.Store;
import org.onlab.packet.IpAddress;
import java.util.Set;
diff --git a/core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java b/core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java
index 6fed1ee..50d4430 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ClusterStoreDelegate.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.store.StoreDelegate;
+import org.onosproject.store.StoreDelegate;
/**
* Cluster store delegate abstraction.
diff --git a/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java b/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
index 29f5cf4..3cfc936 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ControllerNode.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import org.onlab.packet.IpAddress;
diff --git a/core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java b/core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java
index 78f211c..4cde8b2 100644
--- a/core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java
+++ b/core/api/src/main/java/org/onosproject/cluster/ControllerNodeToNodeId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import com.google.common.base.Function;
diff --git a/core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java b/core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java
index 4ed972f..31185dd 100644
--- a/core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java
+++ b/core/api/src/main/java/org/onosproject/cluster/DefaultControllerNode.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import org.onlab.packet.IpAddress;
diff --git a/core/api/src/main/java/org/onosproject/cluster/Leadership.java b/core/api/src/main/java/org/onosproject/cluster/Leadership.java
index 6be7c9b..4a1e897 100644
--- a/core/api/src/main/java/org/onosproject/cluster/Leadership.java
+++ b/core/api/src/main/java/org/onosproject/cluster/Leadership.java
@@ -1,4 +1,4 @@
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java b/core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java
index bf20270..4eaf686 100644
--- a/core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java
+++ b/core/api/src/main/java/org/onosproject/cluster/LeadershipEvent.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Objects;
-import org.onlab.onos.event.AbstractEvent;
+import org.onosproject.event.AbstractEvent;
import com.google.common.base.MoreObjects;
diff --git a/core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java b/core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java
index 8dbd162..20f2c24 100644
--- a/core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java
+++ b/core/api/src/main/java/org/onosproject/cluster/LeadershipEventListener.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
-import org.onlab.onos.event.EventListener;
+import org.onosproject.event.EventListener;
/**
* Entity capable of receiving device leadership-related events.
*/
public interface LeadershipEventListener extends EventListener<LeadershipEvent> {
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/cluster/LeadershipService.java b/core/api/src/main/java/org/onosproject/cluster/LeadershipService.java
index 2709b7f..75cf90f 100644
--- a/core/api/src/main/java/org/onosproject/cluster/LeadershipService.java
+++ b/core/api/src/main/java/org/onosproject/cluster/LeadershipService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Map;
@@ -58,4 +58,4 @@
* @param listener listener to be removed.
*/
void removeListener(LeadershipEventListener listener);
-}
\ No newline at end of file
+}
diff --git a/core/api/src/main/java/org/onosproject/cluster/NodeId.java b/core/api/src/main/java/org/onosproject/cluster/NodeId.java
index 50cdda4..68b490f 100644
--- a/core/api/src/main/java/org/onosproject/cluster/NodeId.java
+++ b/core/api/src/main/java/org/onosproject/cluster/NodeId.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/cluster/RoleInfo.java b/core/api/src/main/java/org/onosproject/cluster/RoleInfo.java
index 3e2905e..a02cda9 100644
--- a/core/api/src/main/java/org/onosproject/cluster/RoleInfo.java
+++ b/core/api/src/main/java/org/onosproject/cluster/RoleInfo.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;
import java.util.List;
import java.util.Objects;
diff --git a/core/api/src/main/java/org/onosproject/cluster/package-info.java b/core/api/src/main/java/org/onosproject/cluster/package-info.java
index 509fbdc..d5ae40c 100644
--- a/core/api/src/main/java/org/onosproject/cluster/package-info.java
+++ b/core/api/src/main/java/org/onosproject/cluster/package-info.java
@@ -17,4 +17,4 @@
/**
* Set of abstractions for dealing with controller cluster related topics.
*/
-package org.onlab.onos.cluster;
+package org.onosproject.cluster;