Changing org.onlab.onos package to org.onosproject
Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575
diff --git a/apps/tvue/pom.xml b/apps/tvue/pom.xml
index 1fab26e..6817eee 100644
--- a/apps/tvue/pom.xml
+++ b/apps/tvue/pom.xml
@@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onos-apps</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
- <groupId>org.onlab.onos</groupId>
+ <groupId>org.onosproject</groupId>
<artifactId>onlab-rest</artifactId>
<version>${project.version}</version>
</dependency>
@@ -97,7 +97,7 @@
com.fasterxml.jackson.databind.node,
org.onlab.packet.*,
org.onlab.rest.*,
- org.onlab.onos.*
+ org.onosproject.*
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java b/apps/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
index 086afa6..9ace27d 100644
--- a/apps/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
+++ b/apps/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
@@ -13,24 +13,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onlab.onos.tvue;
+package org.onosproject.tvue;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.onlab.onos.net.ConnectPoint;
-import org.onlab.onos.net.ElementId;
-import org.onlab.onos.net.Host;
-import org.onlab.onos.net.Link;
-import org.onlab.onos.net.Path;
-import org.onlab.onos.net.device.DeviceService;
-import org.onlab.onos.net.host.HostService;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.topology.PathService;
-import org.onlab.onos.net.topology.Topology;
-import org.onlab.onos.net.topology.TopologyGraph;
-import org.onlab.onos.net.topology.TopologyService;
-import org.onlab.onos.net.topology.TopologyVertex;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.ElementId;
+import org.onosproject.net.Host;
+import org.onosproject.net.Link;
+import org.onosproject.net.Path;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.host.HostService;
+import org.onosproject.net.link.LinkService;
+import org.onosproject.net.topology.PathService;
+import org.onosproject.net.topology.Topology;
+import org.onosproject.net.topology.TopologyGraph;
+import org.onosproject.net.topology.TopologyService;
+import org.onosproject.net.topology.TopologyVertex;
import org.onlab.packet.IpAddress;
import org.onlab.rest.BaseResource;
@@ -43,9 +43,9 @@
import java.util.Map;
import java.util.Set;
-import static org.onlab.onos.net.DeviceId.deviceId;
-import static org.onlab.onos.net.HostId.hostId;
-import static org.onlab.onos.net.PortNumber.portNumber;
+import static org.onosproject.net.DeviceId.deviceId;
+import static org.onosproject.net.HostId.hostId;
+import static org.onosproject.net.PortNumber.portNumber;
/**
* Topology viewer resource.
diff --git a/apps/tvue/src/main/java/org/onosproject/tvue/package-info.java b/apps/tvue/src/main/java/org/onosproject/tvue/package-info.java
index 675726b..f04e0f6 100644
--- a/apps/tvue/src/main/java/org/onosproject/tvue/package-info.java
+++ b/apps/tvue/src/main/java/org/onosproject/tvue/package-info.java
@@ -17,4 +17,4 @@
/**
* Sample topology viewer application.
*/
-package org.onlab.onos.tvue;
+package org.onosproject.tvue;
diff --git a/apps/tvue/src/main/webapp/WEB-INF/web.xml b/apps/tvue/src/main/webapp/WEB-INF/web.xml
index b42951a..0c02e09 100644
--- a/apps/tvue/src/main/webapp/WEB-INF/web.xml
+++ b/apps/tvue/src/main/webapp/WEB-INF/web.xml
@@ -33,9 +33,9 @@
</init-param>
<init-param>
<!--param-name>com.sun.jersey.config.property.packages</param-name>
- <param-value>org.onlab.onos.tvue</param-value-->
+ <param-value>org.onosproject.tvue</param-value-->
<param-name>com.sun.jersey.config.property.classnames</param-name>
- <param-value>org.onlab.onos.tvue.TopologyResource</param-value>
+ <param-value>org.onosproject.tvue.TopologyResource</param-value>
</init-param>
<load-on-startup>10</load-on-startup>
</servlet>
@@ -45,4 +45,4 @@
<url-pattern>/rs/*</url-pattern>
</servlet-mapping>
-</web-app>
\ No newline at end of file
+</web-app>