EPL License: Exchange Resteasy in POM with wildfly/jersey
diff --git a/pom.xml b/pom.xml
index f60ab5e..636c0b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,10 @@
<groupId>org.eclipse.openk</groupId>
<artifactId>mics-home-service</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
<packaging>war</packaging>
<properties>
- <jersey-bundle.version>1.19.3</jersey-bundle.version>
- <org.json.version>20160810</org.json.version>
- <jersey.server.version>1.19.3</jersey.server.version>
<gson.version>2.8.0</gson.version>
<log4j.version>1.2.17</log4j.version>
<commons-io.version>2.5</commons-io.version>
@@ -33,20 +30,16 @@
</properties>
<dependencies>
+
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>${org.json.version}</version>
+ <groupId>org.glassfish.jersey.bundles</groupId>
+ <artifactId>jaxrs-ri</artifactId>
+ <version>2.22.1</version>
</dependency>
<dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>3.0.21.Final</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>jaxrs-api</artifactId>
- <version>3.0.12.Final</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.5</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/src/main/java/org/eclipse/openk/mics/home/communication/RestServiceWrapper.java b/src/main/java/org/eclipse/openk/mics/home/communication/RestServiceWrapper.java
index dbc2d2b..249196b 100644
--- a/src/main/java/org/eclipse/openk/mics/home/communication/RestServiceWrapper.java
+++ b/src/main/java/org/eclipse/openk/mics/home/communication/RestServiceWrapper.java
@@ -12,9 +12,8 @@
package org.eclipse.openk.mics.home.communication;
-import org.eclipse.openk.mics.home.common.HttpStatusException;
+import org.apache.commons.httpclient.HttpStatus;
import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
@@ -25,6 +24,7 @@
import org.apache.http.impl.client.HttpClients;
import org.apache.http.ssl.SSLContextBuilder;
import org.apache.http.util.EntityUtils;
+import org.eclipse.openk.mics.home.common.HttpStatusException;
import org.apache.log4j.Logger;
import org.eclipse.openk.mics.home.common.Globals;
diff --git a/src/main/java/org/eclipse/openk/mics/home/controller/ResponseBuilderWrapper.java b/src/main/java/org/eclipse/openk/mics/home/controller/ResponseBuilderWrapper.java
index f921e4d..b13d6aa 100644
--- a/src/main/java/org/eclipse/openk/mics/home/controller/ResponseBuilderWrapper.java
+++ b/src/main/java/org/eclipse/openk/mics/home/controller/ResponseBuilderWrapper.java
@@ -12,7 +12,7 @@
package org.eclipse.openk.mics.home.controller;
-import org.apache.http.HttpStatus;
+import org.apache.commons.httpclient.HttpStatus;
import org.eclipse.openk.mics.home.common.HttpStatusException;
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index c12695b..0f44f71 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -5,33 +5,21 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<display-name>Restful Web Application</display-name>
- <context-param>
- <param-name>resteasy.servlet.mapping.prefix</param-name>
- <param-value>/rest</param-value>
- </context-param>
-
- <context-param>
- <param-name>resteasy.scan</param-name>
- <param-value>false</param-value>
- </context-param>
-
- <listener>
- <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
- </listener>
-
<servlet>
- <servlet-name>Resteasy</servlet-name>
+ <servlet-name>jersey-serlvet</servlet-name>
<servlet-class>
- org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher
+ org.glassfish.jersey.servlet.ServletContainer
</servlet-class>
<init-param>
- <param-name>javax.ws.rs.Application</param-name>
- <param-value>org.eclipse.openk.mics.home.rest.RestServiceConfiguration</param-value>
+ <param-name>jersey.config.server.provider.packages</param-name>
+ <param-value>org.eclipse.openk.mics.home.rest</param-value>
</init-param>
+ <load-on-startup>1</load-on-startup>
+
</servlet>
<servlet-mapping>
- <servlet-name>Resteasy</servlet-name>
+ <servlet-name>jersey-serlvet</servlet-name>
<url-pattern>/rest/*</url-pattern>
</servlet-mapping>
