Make compatible with servlet 2.5 spec

vivo-project · Sep 7, 2017 · c597a3e · c597a3e
1 parent 7abd59d
commit c597a3e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/...src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/FedSearchController.java b/...src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/FedSearchController.java
@@ -9,7 +9,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
@@ -20,7 +19,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-@WebServlet(name = "FedSearchController", urlPatterns = {"/FS.xml","/ctsasearch"} ) // fedsearch
 public class FedSearchController extends PagedSearchController {
     private static final Log log = LogFactory.getLog(FedSearchController.class);
 

diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml
@@ -904,7 +904,20 @@
     <servlet-name>SearchController</servlet-name>
     <url-pattern>/search</url-pattern>
   </servlet-mapping>
-
+
+  <servlet>
+    <servlet-name>FedSearchController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.FedSearchController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>FedSearchController</servlet-name>
+    <url-pattern>/ctsasearch</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>FedSearchController</servlet-name>
+    <url-pattern>/FS.xml</url-pattern>
+  </servlet-mapping>
+
   <servlet>
     <servlet-name>SearchHelpController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SearchHelpController</servlet-class>