Fix build error due to Jersey bump up
Change-Id: Ic5e7bf3fe4e911bf4aaa7aefe9907b15aafb6370
diff --git a/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java b/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
index c86b185..5b61ad0 100644
--- a/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
+++ b/calendar/src/main/java/org/onosproject/calendar/BandwidthCalendarResource.java
@@ -44,6 +44,7 @@
import javax.ws.rs.DELETE;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.core.Response;
import java.net.URI;
@@ -62,7 +63,7 @@
/**
* Web resource for triggering calendared intents.
*/
-@javax.ws.rs.Path("intent")
+@Path("intent")
public class BandwidthCalendarResource extends BaseResource {
private static final Logger log = getLogger(BandwidthCalendarResource.class);
@@ -86,7 +87,7 @@
* @return intent key if successful,
* server error message or "FAILED" if failed to create or submit intent
*/
- @javax.ws.rs.Path("/{src}/{dst}/{srcPort}/{dstPort}/{bandwidth}/{latency}")
+ @Path("/{src}/{dst}/{srcPort}/{dstPort}/{bandwidth}/{latency}")
@POST
// TODO could allow applications to provide optional key
// ... if you do, you will need to change from LongKeys to StringKeys
@@ -138,7 +139,7 @@
* @return Intent state, "INSTALLED", if successful,
* server error message or "FAILED" if failed to modify any direction intent
*/
- @javax.ws.rs.Path("/{intentKey}/{src}/{dst}/{srcPort}/{dstPort}/{bandwidth}")
+ @Path("/{intentKey}/{src}/{dst}/{srcPort}/{dstPort}/{bandwidth}")
@PUT
public Response modifyBandwidth(@PathParam("intentKey") String intentKey,
@PathParam("src") String src,
@@ -285,7 +286,7 @@
* @return Intent state, "WITHDRAWN", if successful,
* server error message or FAILED" if any direction intent remove failed
*/
- @javax.ws.rs.Path("/{intentKey}")
+ @Path("/{intentKey}")
@DELETE
public Response removePath(@PathParam("intentKey") String intentKey) {
diff --git a/calendar/src/main/webapp/WEB-INF/web.xml b/calendar/src/main/webapp/WEB-INF/web.xml
index 1a7de2b..55777d8 100644
--- a/calendar/src/main/webapp/WEB-INF/web.xml
+++ b/calendar/src/main/webapp/WEB-INF/web.xml
@@ -22,13 +22,9 @@
<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.onosproject.calendar.BandwidthCalendarResource</param-value>
</init-param>
<load-on-startup>10</load-on-startup>