fixing small issues thanks to jersey 2 #76

kermitt2 · May 2, 2018 · 0c7be49 · 0c7be49
1 parent 42e280d
commit 0c7be49
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -682,9 +682,15 @@
             <artifactId>jersey-media-multipart</artifactId>
             <version>2.27</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.jvnet.mimepull</groupId>
+            <artifactId>mimepull</artifactId>
+            <version>1.9.7</version>
+        </dependency>
 
 
-        <!--<dependency>
+        <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
             <artifactId>jersey-hk2</artifactId>
             <version>2.27</version>
@@ -694,28 +700,21 @@
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-grizzly2-servlet</artifactId>
             <version>2.27</version>
-        </dependency> -->
+        </dependency>
 
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
             <version>2.1</version>
-            <scope>provided</scope>
         </dependency>
 
+
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-servlet</artifactId>
             <version>2.27</version>
             <scope>provided</scope>
         </dependency>
-        <!-- if you are using Jersey client specific features without the server side -->
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>2.27</version>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>org.glassfish.jersey.containers</groupId>
@@ -930,6 +929,12 @@
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
             <version>2.4.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.jersey</groupId>
+                    <artifactId>jersey-server</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/com/scienceminer/nerd/service/NerdRestService.java b/src/main/java/com/scienceminer/nerd/service/NerdRestService.java
@@ -8,13 +8,13 @@
 import com.scienceminer.nerd.kb.Lexicon;
 import com.scienceminer.nerd.kb.UpperKnowledgeBase;
 import com.scienceminer.nerd.mention.ProcessText;
-import com.sun.jersey.spi.resource.Singleton;
 import org.glassfish.jersey.media.multipart.FormDataParam;
 import org.grobid.core.exceptions.GrobidException;
 import org.grobid.core.lang.Language;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Singleton;
 import javax.ws.rs.*;
 import javax.ws.rs.core.*;
 import java.io.InputStream;

diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
@@ -7,16 +7,20 @@
 
     <servlet>
         <servlet-name>nerd-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>
+<!--        <init-param>
             <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
             <param-value>com.sun.jersey.api.core.PackagesResourceConfig</param-value>
-        </init-param>
+        </init-param>-->
         <init-param>
-            <param-name>com.sun.jersey.config.property.packages</param-name>
+            <param-name>jersey.config.server.provider.packages</param-name>
             <param-value>com.scienceminer.nerd.service</param-value>
         </init-param>
+        <init-param>
+            <param-name>jersey.config.server.provider.classnames</param-name>
+            <param-value>org.glassfish.jersey.media.multipart.MultiPartFeature</param-value>
+        </init-param>
 
 <!--        <init-param>
           <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>