From 7d963f83e980f75659db4d966077501841922a9c Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 18 Jul 2011 19:26:33 +0000
Subject: [PATCH] NIHVIVO-2968 Fix servlet mappings in vitro web.xml

---
 webapp/config/web.xml | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/webapp/config/web.xml b/webapp/config/web.xml
index b658940ee..839d35c90 100644
--- a/webapp/config/web.xml
+++ b/webapp/config/web.xml
@@ -873,27 +873,15 @@
     <url-pattern>/listObjectPropertyStatements</url-pattern>
   </servlet-mapping>
 
-  <!-- 
   <servlet>
     <servlet-name>IndividualListController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController</servlet-class>
   </servlet>
-  -->
-  <servlet>
-    <servlet-name>IndividualListController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.SolrIndividualListController</servlet-class>
-  </servlet>
   <servlet-mapping>
     <servlet-name>IndividualListController</servlet-name>
     <url-pattern>/individuallist</url-pattern>
   </servlet-mapping>
 
-  <!--
-  <servlet>
-    <servlet-name>IndividualListRdf</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityURLController</servlet-class>
-  </servlet>
-  -->
   <servlet>
     <servlet-name>IndividualListRdf</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.IndividualListRdfController</servlet-class>
@@ -903,15 +891,9 @@
     <url-pattern>/listrdf/*</url-pattern>
   </servlet-mapping>
 
-  <!--   
   <servlet>
     <servlet-name>SearchController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController</servlet-class>
-  </servlet> 
-  -->
-  <servlet>
-    <servlet-name>SearchController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SolrPagedSearchController</servlet-class>
   </servlet>
  
   <servlet-mapping>
@@ -932,16 +914,10 @@
     <url-pattern>/searchcontroller</url-pattern>
   </servlet-mapping>
 
-  <!--
   <servlet>
     <servlet-name>AutocompleteController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.AutocompleteController</servlet-class>
   </servlet>
-  -->
-  <servlet>
-    <servlet-name>AutocompleteController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.SolrAutocompleteController</servlet-class>
-  </servlet>
   <servlet-mapping>
     <servlet-name>AutocompleteController</servlet-name>
     <url-pattern>/autocomplete</url-pattern>
@@ -987,15 +963,9 @@
     <url-pattern>/contact</url-pattern>
   </servlet-mapping>
 
-  <!--
   <servlet>
     <servlet-name>JSON Service</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.JSONServlet</servlet-class>
-  </servlet>
-  -->
-  <servlet>
-    <servlet-name>JSON Service</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SolrJsonServlet</servlet-class>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.JsonServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>JSON Service</servlet-name>