From 47875673a243106905e16cd26e49477af9a469db Mon Sep 17 00:00:00 2001
From: j2blake <jeb228@cornell.edu>
Date: Mon, 4 Feb 2013 17:23:22 -0500
Subject: [PATCH] Clean up web.xml and create a unit test to keep it clean.

VIVO-19
---
 productMods/WEB-INF/web.xml | 217 +-----------------------------------
 1 file changed, 6 insertions(+), 211 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index ff022163..8a0d7bbe 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -125,8 +125,8 @@
   <filter-mapping>
     <filter-name>VitroRequestPrep</filter-name>
     <url-pattern>/*</url-pattern>
-    <dispatcher>request</dispatcher>
-    <dispatcher>forward</dispatcher>
+    <dispatcher>REQUEST</dispatcher>
+    <dispatcher>FORWARD</dispatcher>
   </filter-mapping>
 
    <filter>
@@ -136,7 +136,7 @@
   <filter-mapping>
     <filter-name>PageRoutingFilter</filter-name>
     <url-pattern>/*</url-pattern>
-    <dispatcher>request</dispatcher>
+    <dispatcher>REQUEST</dispatcher>
   </filter-mapping>
   
   <!--  Spring setup ****************************************************  -->
@@ -167,24 +167,8 @@
     
     -->
   <!-- Servlets ********************************************************** -->
-  <servlet>
-    <!--adding only trimSpaces param to defaults to clean up html output-->
-    <servlet-name>jsp</servlet-name>
-    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-    <init-param>
-      <param-name>fork</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>xpoweredBy</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>trimSpaces</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <load-on-startup>3</load-on-startup>
-  </servlet><!--
+
+  <!--
 
   <servlet>
   	<servlet-name>ProcessRdfForm</servlet-name>
@@ -241,15 +225,6 @@
      <url-pattern>/RecomputeInferences</url-pattern>
   </servlet-mapping>
   
-  <servlet>
-     <servlet-name>SDBSetupController</servlet-name>
-     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.SDBSetupController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-     <servlet-name>SDBSetupController</servlet-name>
-     <url-pattern>/sdbsetup</url-pattern>
-  </servlet-mapping>
-  
    <servlet>
     <servlet-name>DeletePropertyController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.DeletePropertyController</servlet-class>
@@ -325,12 +300,6 @@
   </servlet-mapping>
   -->
   
-  <servlet>
-    <servlet-name>fetch</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.QueryServlet</servlet-class>
-    <!--load-on-startup>2</load-on-startup-->
-  </servlet>
-
   <servlet>
     <servlet-name>AboutController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.AboutController</servlet-class>
@@ -398,24 +367,6 @@
     <url-pattern>/uploadImages</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>FlagUpdateController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.FlagUpdateController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>FlagUpdateController</servlet-name>
-    <url-pattern>/flagUpdate</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>SitemapIndexController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SitemapIndexController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>SitemapIndexController</servlet-name>
-    <url-pattern>/sitemap.xml</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>RDFUploadFormController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.RDFUploadFormController</servlet-class>
@@ -471,24 +422,6 @@
     <url-pattern>/jenaXmlFileUpload/*</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>OwlImportController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.owl.OwlImportController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>OwlImportController</servlet-name>
-    <url-pattern>/owl</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>OwlImportServlet</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.owl.ProtegeOwlImportServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>OwlImportServlet</servlet-name>
-    <url-pattern>/importOwl</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>JenaAdminServlet</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.JenaAdminActions</servlet-class>
@@ -588,16 +521,6 @@
     <url-pattern>/datapropEdit</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-
-    <servlet-name>KeywordEditController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.KeywordEditController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>KeywordEditController</servlet-name>
-    <url-pattern>/keywordEdit</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>OntologyEditController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.OntologyEditController</servlet-class>
@@ -787,24 +710,6 @@
     <url-pattern>/admin/wait</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>StatementChangeListingController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.StatementChangeListingController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>StatementChangeListingController</servlet-name>
-    <url-pattern>/statementHistory</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>WriteOutChangesController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.WriteOutChangesController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>WriteOutChangesController</servlet-name>
-    <url-pattern>/writeOutChanges</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>ListVClassWebappsController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ListVClassWebappsController</servlet-class>
@@ -1004,15 +909,6 @@
     <url-pattern>/edit/reorder</url-pattern>
   </servlet-mapping>
    
-  <servlet>
-    <servlet-name>AdminController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.AdminController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>AdminController</servlet-name>
-    <url-pattern>/adminCon</url-pattern>
-  </servlet-mapping>
-
   <servlet>
     <servlet-name>TermsOfUseController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TermsOfUseController</servlet-class>
@@ -1041,16 +937,7 @@
     <url-pattern>/dataservice</url-pattern>
   </servlet-mapping>
   
-   <servlet>
-    <servlet-name>UMLSTerminology</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.servlet.UMLSTerminologyAnnotation</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>UMLSTerminology</servlet-name>
-    <url-pattern>/UMLSTermsRetrieval</url-pattern>
-  </servlet-mapping>
-  
-    <servlet>
+  <servlet>
     <servlet-name>ConceptSearchService</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.servlet.ConceptSearchServlet</servlet-class>
   </servlet>
@@ -1059,15 +946,6 @@
     <url-pattern>/conceptSearchService</url-pattern>
   </servlet-mapping>
   
-   <servlet>
-    <servlet-name>ProcessTerminologyAnnotation</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.servlet.ProcessTerminologyController</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>ProcessTerminologyAnnotation</servlet-name>
-    <url-pattern>/edit/processTerminologyAnnotation</url-pattern>
-  </servlet-mapping>
-
   <!-- Google Refine servlets begins -->
 
   <servlet>
@@ -1223,32 +1101,6 @@
     <url-pattern>/browse</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>pubsbyorg</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.vclass.PubsByDepartmentServlet</servlet-class>
-    <init-param>
-      <param-name>workspaceDir</param-name>
-      <param-value>/usr/local/services/vivo/logs</param-value>
-    </init-param>
-    <!--load-on-startup>2</load-on-startup-->
-  </servlet>
-
-  <servlet>
-    <servlet-name>coauthors</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.vclass.CoAuthorServlet</servlet-class>
-    <init-param>
-      <param-name>workspaceDir</param-name>
-      <param-value>/usr/local/services/vivo/logs</param-value>
-    </init-param>
-    <!--load-on-startup>2</load-on-startup-->
-  </servlet>
-
-  <servlet>
-    <servlet-name>generic_create</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.GenericDBCreate</servlet-class>
-    <!--load-on-startup>2</load-on-startup-->
-  </servlet>
-
   <servlet>
     <servlet-name>serveFiles</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.filestorage.serving.FileServingServlet</servlet-class>
@@ -1258,21 +1110,6 @@
     <url-pattern>/file/*</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>generic_editprep</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.GenericDBEditPrep</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>generic_update</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.GenericDBUpdate</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>generic_delete</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.GenericDBDelete</servlet-class>
-  </servlet>
-
   <servlet>
     <servlet-name>SparqlQuery</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.SparqlQueryServlet</servlet-class>
@@ -1283,20 +1120,6 @@
     <url-pattern>/admin/sparqlquery</url-pattern>
   </servlet-mapping>
   
-
-  <!--  
-   <servlet>
-    <servlet-name>VisualizationController</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationController</servlet-class>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>VisualizationController</servlet-name>
-    <url-pattern>/visualization</url-pattern>
-  </servlet-mapping>
-  
-  -->
-
    <servlet>
     <servlet-name>StandardVisualizationController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.visualization.StandardVisualizationController</servlet-class>
@@ -1423,10 +1246,6 @@
 
     
   <!-- ============================== servlet-mappings ======================== -->
-  <servlet-mapping>
-    <servlet-name>fetch</servlet-name>
-    <url-pattern>/fetch</url-pattern>
-  </servlet-mapping>
    <servlet-mapping>
     <servlet-name>mailusers</servlet-name>
     <url-pattern>/mailusers</url-pattern>
@@ -1478,30 +1297,6 @@
     <servlet-name>logout</servlet-name>
     <url-pattern>/logout</url-pattern>
   </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>pubsbyorg</servlet-name>
-    <url-pattern>/pubsbyorg</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>coauthors</servlet-name>
-    <url-pattern>/coauthors</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>generic_create</servlet-name>
-    <url-pattern>/generic_create</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>generic_editprep</servlet-name>
-    <url-pattern>/generic_editprep</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>generic_update</servlet-name>
-    <url-pattern>/generic_update</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>generic_delete</servlet-name>
-    <url-pattern>/generic_delete</url-pattern>
-  </servlet-mapping>
 
   <!-- ==================== sparql query builder ==================== -->