[ONOS-4042] Bump up Jersey from 1.19 to 2.22.2
- Fix unit test errors of web/api
- Fix default page redirection problem
- Fix compilation errors of web/gui
- Fix configuration of aaa, acl, cordfabric, cord-gui, dhcp, mfwd,
olt, openstack, segmentrouting, vtn, virtualbng, xos-integration
- Fix unit test errors of cpman, vtn, acl, faultmanagement
- Fix compilation errors of openstack, virtualbng, xos-integration,
REST SB controller
- Rearrange features.xml to resolve bundle dependencies
- Remove all of stale Jersey 1.x libraries
- Rearrange web.xml to point new Jersey 2.x servlet
Change-Id: Ic17f461ede0aa36fa8d470546d8069152dc1d134
diff --git a/web/gui/pom.xml b/web/gui/pom.xml
index 17a7742..08d1872 100644
--- a/web/gui/pom.xml
+++ b/web/gui/pom.xml
@@ -62,8 +62,8 @@
<artifactId>onos-incubator-api</artifactId>
</dependency>
<dependency>
- <groupId>com.sun.jersey.contribs</groupId>
- <artifactId>jersey-multipart</artifactId>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-multipart</artifactId>
</dependency>
</dependencies>
@@ -96,11 +96,9 @@
javax.imageio.*,
javax.ws.rs,javax.ws.rs.core,javax.ws.rs.ext,
javax.servlet.*,
- com.sun.jersey.api,
- com.sun.jersey.spi.container.servlet,
- com.sun.jersey.server.impl.container.servlet,
- com.sun.jersey.multipart,
- com.sun.jersey.core.header,
+ org.glassfish.jersey,
+ org.glassfish.jersey.servlet,
+ org.glassfish.jersey.media.multipart,
org.jvnet.mimepull,
com.fasterxml.jackson.databind,
com.fasterxml.jackson.databind.node,
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/ApplicationResource.java b/web/gui/src/main/java/org/onosproject/ui/impl/ApplicationResource.java
index 93d9146..26b7077 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/ApplicationResource.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/ApplicationResource.java
@@ -15,7 +15,7 @@
*/
package org.onosproject.ui.impl;
-import com.sun.jersey.multipart.FormDataParam;
+import org.glassfish.jersey.media.multipart.FormDataParam;
import org.onlab.rest.BaseResource;
import org.onosproject.app.ApplicationAdminService;
import org.onosproject.core.Application;
diff --git a/web/gui/src/main/webapp/WEB-INF/web.xml b/web/gui/src/main/webapp/WEB-INF/web.xml
index 406124b..f7bd841 100644
--- a/web/gui/src/main/webapp/WEB-INF/web.xml
+++ b/web/gui/src/main/webapp/WEB-INF/web.xml
@@ -57,16 +57,9 @@
<servlet>
<servlet-name>Index Page</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer
- </servlet-class>
+ <servlet-class>org.glassfish.jersey.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>
- <init-param>
- <param-name>com.sun.jersey.config.property.classnames</param-name>
+ <param-name>jersey.config.server.provider.classnames</param-name>
<param-value>org.onosproject.ui.impl.MainIndexResource</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
@@ -79,16 +72,9 @@
<servlet>
<servlet-name>Main Module</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer
- </servlet-class>
+ <servlet-class>org.glassfish.jersey.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>
- <init-param>
- <param-name>com.sun.jersey.config.property.classnames</param-name>
+ <param-name>jersey.config.server.provider.classnames</param-name>
<param-value>org.onosproject.ui.impl.MainModuleResource
</param-value>
</init-param>
@@ -102,16 +88,9 @@
<servlet>
<servlet-name>Nav Module</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer
- </servlet-class>
+ <servlet-class>org.glassfish.jersey.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>
- <init-param>
- <param-name>com.sun.jersey.config.property.classnames</param-name>
+ <param-name>jersey.config.server.provider.classnames</param-name>
<param-value>org.onosproject.ui.impl.MainNavResource</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
@@ -124,16 +103,9 @@
<servlet>
<servlet-name>View Module</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer
- </servlet-class>
+ <servlet-class>org.glassfish.jersey.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>
- <init-param>
- <param-name>com.sun.jersey.config.property.classnames</param-name>
+ <param-name>jersey.config.server.provider.classnames</param-name>
<param-value>org.onosproject.ui.impl.MainViewResource</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
@@ -146,16 +118,9 @@
<servlet>
<servlet-name>Foo Module</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer
- </servlet-class>
+ <servlet-class>org.glassfish.jersey.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>
- <init-param>
- <param-name>com.sun.jersey.config.property.classnames</param-name>
+ <param-name>jersey.config.server.provider.classnames</param-name>
<param-value>org.onosproject.ui.impl.FooResource</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
@@ -168,17 +133,11 @@
<servlet>
<servlet-name>JAX-RS Service</servlet-name>
- <servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer
- </servlet-class>
+ <servlet-class>org.glassfish.jersey.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>
- <init-param>
- <param-name>com.sun.jersey.config.property.classnames</param-name>
+ <param-name>jersey.config.server.provider.classnames</param-name>
<param-value>
+ org.glassfish.jersey.media.multipart.MultiPartFeature,
org.onosproject.ui.impl.LogoutResource,
org.onosproject.ui.impl.TopologyResource,
org.onosproject.ui.impl.ApplicationResource