Fix build error due to Jersey bump up
Change-Id: Ic5e7bf3fe4e911bf4aaa7aefe9907b15aafb6370
diff --git a/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java b/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
index 9ace27d..b8a68c9 100644
--- a/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
+++ b/tvue/src/main/java/org/onosproject/tvue/TopologyResource.java
@@ -18,6 +18,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onlab.packet.IpAddress;
+import org.onlab.rest.BaseResource;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.ElementId;
import org.onosproject.net.Host;
@@ -31,8 +33,6 @@
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;
import javax.ws.rs.GET;
import javax.ws.rs.PathParam;
@@ -219,5 +219,4 @@
private static String id(ConnectPoint cp) {
return cp.elementId().toString();
}
-
}
diff --git a/tvue/src/main/webapp/WEB-INF/web.xml b/tvue/src/main/webapp/WEB-INF/web.xml
index 0c02e09..4ffeb26 100644
--- a/tvue/src/main/webapp/WEB-INF/web.xml
+++ b/tvue/src/main/webapp/WEB-INF/web.xml
@@ -26,15 +26,11 @@
<servlet>
<servlet-name>JAX-RS Service</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
- <init-param>
- <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
- <param-value>com.sun.jersey.api.core.ClassNamesResourceConfig</param-value>
- </init-param>
+ <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<!--param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>org.onosproject.tvue</param-value-->
- <param-name>com.sun.jersey.config.property.classnames</param-name>
+ <param-name>jersey.config.server.provider.classnames</param-name>
<param-value>org.onosproject.tvue.TopologyResource</param-value>
</init-param>
<load-on-startup>10</load-on-startup>