From a89c1550d09341f54caa1bc83b69a2761c13ba3b Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Sat, 24 Jul 2010 21:37:23 +0000
Subject: [PATCH] Merge To trunk. Adding filtering of Positions in past.
 NIHVIVO-984

---
 productMods/WEB-INF/web.xml                   | 1298 +++++++++++++++++
 .../setup/VivoMergedListFilteringSetup.java   |  116 ++
 2 files changed, 1414 insertions(+)
 create mode 100644 productMods/WEB-INF/web.xml
 create mode 100644 src/edu/cornell/mannlib/vitro/webapp/servlet/setup/VivoMergedListFilteringSetup.java

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
new file mode 100644
index 00000000..9247fcc9
--- /dev/null
+++ b/productMods/WEB-INF/web.xml
@@ -0,0 +1,1298 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+  version="2.4">
+
+  <!-- Environment variables for the Vitro web application -->
+  <!-- Example: -->
+  <!-- <env-entry><env-entry-name>somename/required</env-entry-name> -->
+  <!--            <description>optional desc </description> -->
+  <!--            <env-entry-value>some kind of value, required</env-entry-value> -->
+  <!--            <env-entry-type>(required)java.lang.String || java.lang.Integer ||  -->
+  <!--            java.lang.Double || java.lang.Boolean || java.lang.Float</env-entry-type> -->
+  <!-- </env-entry> -->
+
+  <env-entry>
+    <env-entry-name>jdbc/vitro/connectionType</env-entry-name>
+    <!--
+           				How to get a DataSource, Valid valies:
+                        SERVER_XML_POOL gets a named DataSource connection from the
+                        JNDI context, most likely that was set up tomcat/conf/server.xml
+                        PROPERTIES_FILE_POOL makes a DataSource using properties from
+                        a file in the classpath at /beans/connection.properties
+           -->
+    <!--            <env-entry-value>SERVER_XML_POOL</env-entry-value> -->
+    <env-entry-type>java.lang.String</env-entry-type>
+    <env-entry-value>PROPERTIES_FILE_POOL</env-entry-value>
+  </env-entry>
+
+
+  <env-entry>
+    <env-entry-name>jdbc/vitro/namedDS</env-entry-name>
+    <!--This is the name of the JNDI named DataSource for use with SERVER_XML_POOL-->
+    <env-entry-type>java.lang.String</env-entry-type>
+    <env-entry-value>mySharedDBPool</env-entry-value>
+  </env-entry>
+  <!-- end environment vars -->
+
+  <!-- Listeners ****************************************************** -->
+
+  <!-- DefaultThemeSetup needs to run before the JenaDataSourceSetup
+       to allow creation of default portal and tab -->
+  <listener>
+    <listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.DefaultThemeSetup</listener-class>
+  </listener>
+
+  <!-- experimental ModelMaker for ingest workflows - BJL 2008-06-01 -->
+  <listener>
+    <listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.VitroJenaModelMakerSetup</listener-class>
+  </listener>
+
+  <!-- Comment out this listener to run Vitro without a database -->
+  <!-- If used, this listener must be run before JenaDataSourceSetup -->
+  <listener>
+    <listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaPersistentDataSourceSetup</listener-class>
+  </listener>
+
+  <!-- experimental JenaMulgaraBridge, replaces JenaPersistentDataSourceSetup. -->
+  <!--     <listener>
+ -->
+  <!--     	<listener-class>
+ -->
+  <!--     		edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaMulgaraBridgeSetup
+ -->
+  <!--     	</listener-class>
+ -->
+  <!--     </listener> -->
+
+  <!-- This listener is required in order to use a Jena triple store (currently the only option) -->
+  <listener>
+    <listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetup</listener-class>
+  </listener>
+
+  <!-- Invokes process to perform updates to align with ontology changes if needed -->
+  <!-- Needs to run before submodels are attached and Pellet is set up -->
+  
+  <listener>
+     <listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase</listener-class>
+  </listener>
+ 
+  <listener>
+    <listener-class>
+        edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup
+    </listener-class>
+  </listener> 
+  
+  <!-- Invokes a process to move any uploaded files into the new file storage system. -->
+  <!-- Needs to run after FileStorageSetup and JenaDataSourceSetup. -->
+  <!-- Should run before Pellet is set up. -->  
+  <listener>
+    <listener-class>
+        edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateUploadedFiles
+    </listener-class>
+  </listener> 
+  
+  <!-- Attaching submodels permits extra RDF files to be made visible without storing the data in the DB. -->
+  <listener>
+     <listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.AttachSubmodels</listener-class>
+  </listener>
+
+  <!-- Pellet setup enables reasoning.  Inferences are cached in a separate DB graph. -->
+  <!-- Changing the class name sets the kinds of inferences that are materialized. -->
+  <!-- See documentation for details. -->
+  <!-- If used, must be run after JenaDataSourceSetup -->
+
+  <listener>
+    <listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.PelletReasonerSetup</listener-class>
+  </listener>
+
+
+  <!-- The followng listener records all edit changes, in reified form, to another database model -->
+  <!-- still at an experimental stage -->
+  <!-- if used, this listener should be run after all other Jena-related listeners, to avoid logging unnecessary data and slowing the context startup process -->
+
+  <!-- 
+    <listener>
+    	<listener-class>
+    		edu.cornell.mannlib.vitro.webapp.servlet.setup.ModelAuditorSetup
+    	</listener-class>
+    </listener>    
+-->
+
+  <listener>
+    <listener-class> edu.cornell.mannlib.vitro.webapp.search.lucene.LuceneSetup </listener-class>
+  </listener>
+
+  <!--  vivo specific, must appear before other policies -->
+  <listener>
+    <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.VivoPolicySetup</listener-class>
+  </listener>
+  
+	<!--<listener>
+		<listener-class>
+	        edu.cornell.mannlib.vitro.webapp.auth.policy.setup.SelfEditingPolicySetup
+		</listener-class>
+	</listener>  -->
+    
+    <listener>
+        <listener-class>
+            edu.cornell.mannlib.vitro.webapp.auth.identifier.UserToIndIdentifierFactorySetup
+        </listener-class>
+    </listener>
+
+  <listener>
+    <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.EditorEditingPolicySetup
+    </listener-class>
+  </listener>
+
+  <listener>
+    <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.CuratorEditingPolicySetup
+    </listener-class>
+  </listener>
+
+  <listener>
+    <listener-class> edu.cornell.mannlib.vitro.webapp.auth.policy.setup.DbAdminEditingPolicySetup
+    </listener-class>
+  </listener>
+ 
+  <listener>
+    <listener-class>
+        edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreeMarkerSetup
+    </listener-class>
+  </listener>
+
+  <!-- On shutdown, this will kill the background thread started by Apache Commons File Upload -->
+  <listener>
+    <listener-class>
+      org.apache.commons.fileupload.servlet.FileCleanerCleanup
+    </listener-class>
+  </listener>
+  
+  <!--
+    <listener>
+        <listener-class>
+            edu.cornell.mannlib.vitro.webapp.auth.identifier.SetupFakeSelfEditingIdentifierFactory
+        </listener-class>
+    </listener>
+-->
+
+  <!--
+    <listener>
+         <listener-class>
+             edu.cornell.mannlib.vitro.webapp.auth.policy.setup.AlwaysAuthorizePolicySetup
+        </listener-class>
+    </listener>
+-->
+
+  <!--  vivo specific -->
+  <listener>
+    <listener-class>edu.cornell.mannlib.vitro.webapp.servlet.setup.VivoMergedListFilteringSetup</listener-class>
+  </listener>  
+  
+  <!-- Filters ********************************************************** -->
+  <!-- in 2.4 spec, filter chain order is first by filter-mapping <url-pattern> order in web.xml,
+	 then filter-mapping <servlet-name> order in web.xml -->
+
+  <filter>
+    <filter-name>Character Set Encoding Filter</filter-name>
+    <filter-class>edu.cornell.mannlib.vitro.webapp.filters.CharsetEncodingFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>Character Set Encoding Filter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <filter>
+    <filter-name>JSession Strip Filter</filter-name>
+    <filter-class>edu.cornell.mannlib.vitro.webapp.filters.JSessionStripFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>JSession Strip Filter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>URL Rewriter Filter</filter-name>
+    <filter-class>edu.cornell.mannlib.vitro.webapp.filters.URLRewriterFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>URL Rewriter Filter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  <filter>
+    <filter-name>Portal Picker Filter</filter-name>
+    <filter-class>edu.cornell.mannlib.vitro.webapp.filters.PortalPickerFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>Portal Picker Filter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter>
+    <filter-name>VitroRequestPrep</filter-name>
+    <filter-class>edu.cornell.mannlib.vitro.webapp.filters.VitroRequestPrep</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>VitroRequestPrep</filter-name>
+    <url-pattern>/*</url-pattern>
+    <dispatcher>request</dispatcher>
+    <dispatcher>forward</dispatcher>
+  </filter-mapping>
+
+  <!--filter>
+        <filter-name>AuthSetupForRequest</filter-name>
+        <filter-class>edu.cornell.mannlib.vitro.webapp.auth.filters.AuthSetupForRequest</filter-class>
+  </filter>
+  <filter-mapping>
+        <filter-name>AuthSetupForRequest</filter-name>
+        <url-pattern>/*</url-pattern>
+  </filter-mapping-->
+
+  <!--  Spring setup ****************************************************  -->
+<!--
+  <context-param>
+	<param-name>contextConfigLocation</param-name>
+	<param-value>/WEB-INF/baseConfig/*.xml, /WEB-INF/localConfig/*.xml</param-value>
+  </context-param>
+  
+  <listener>
+    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+  </listener>
+
+  <servlet>
+	<servlet-name>dispatcher</servlet-name>
+	<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
+	 <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>/WEB-INF/baseConfig/dispatcher-servlet.xml, /WEB-INF/localConfig/dispatcher-servlet.xml</param-value>
+        </init-param>        
+	<load-on-startup>2</load-on-startup>	
+  </servlet>
+
+  <servlet-mapping>
+	<servlet-name>dispatcher</servlet-name>
+	<url-pattern>/spring</url-pattern>
+  </servlet-mapping>
+    
+    -->
+  <!-- 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>IndexController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.IndexController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>IndexController</servlet-name>
+    <url-pattern>/SearchIndex</url-pattern>
+  </servlet-mapping>
+
+<!-- This is the new navigation controller.  It is not ready for the 1.1 release
+     see http://issues.library.cornell.edu/browse/NIHVIVO-597  
+  <servlet>
+  	<servlet-name>NavigationController</servlet-name>
+  	<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.NavigationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+  	<servlet-name>NavigationController</servlet-name>
+  	<url-pattern>/nav/*</url-pattern>
+  </servlet-mapping>
+  -->
+  
+  <servlet>
+    <servlet-name>TestController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.TestController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>TestController</servlet-name>
+    <url-pattern>/test</url-pattern>
+  </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>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>AboutController</servlet-name>
+    <url-pattern>/about</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>FreeMarkerTestController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.TestController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>FreeMarkerTestController</servlet-name>
+    <url-pattern>/freemarkertest</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>FakeSelfEditController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.FakeSelfEditController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>FakeSelfEditController</servlet-name>
+    <url-pattern>/admin/fakeselfedit</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>SiteAdminController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.SiteAdminController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>SiteAdminController</servlet-name>
+    <url-pattern>/siteAdmin</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>SiteAdminController</servlet-name>
+    <url-pattern>/siteAdmin.jsp</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>ImageUploadController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ImageUploadController</servlet-name>
+    <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>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>RDFUploadFormController</servlet-name>
+    <url-pattern>/uploadRDFForm</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>RDFUploadController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.RDFUploadController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>RDFUploadController</servlet-name>
+    <url-pattern>/uploadRDF</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>JenaIngestController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.JenaIngestController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>JenaIngestController</servlet-name>
+    <url-pattern>/ingest</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>JenaExportController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.JenaExportController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>JenaExportController</servlet-name>
+    <url-pattern>/export/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>JenaXMLFileUpload</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.jena.JenaXMLFileUpload</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>JenaXMLFileUpload</servlet-name>
+    <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>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>JenaAdminServlet</servlet-name>
+    <url-pattern>/jenaAdmin</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>EditFrontController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vedit.controller.EditFrontController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>EditFrontController</servlet-name>
+    <url-pattern>/editForm</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>OperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vedit.controller.OperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>OperationController</servlet-name>
+    <url-pattern>/doEdit</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>EntityEditController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.EntityEditController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>EntityEditController</servlet-name>
+    <url-pattern>/entityEdit</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>VclassEditController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.VclassEditController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>VclassEditController</servlet-name>
+    <url-pattern>/vclassEdit</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>Classes2ClassesOperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.Classes2ClassesOperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Classes2ClassesOperationController</servlet-name>
+    <url-pattern>/classes2ClassesOp</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>Properties2PropertiesOperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.Properties2PropertiesOperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Properties2PropertiesOperationController</servlet-name>
+    <url-pattern>/props2PropsOp</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>NamespacePrefixOperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.NamespacePrefixOperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>NamespacePrefixOperationController</servlet-name>
+    <url-pattern>/namespacePrefixOp</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>RefactorOperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.RefactorOperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>RefactorOperationController</servlet-name>
+    <url-pattern>/refactorOp</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>IndividualTypeOperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.IndividualTypeOperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>IndividualTypeOperationController</servlet-name>
+    <url-pattern>/individualTypeOp</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>Tabs2TypesOperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.Tabs2TypesOperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>Tabs2TypesOperationController</servlet-name>
+    <url-pattern>/tabs2TypesOp</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>TabIndividualRelationOperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.TabIndividualRelationOperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>TabIndividualRelationOperationController</servlet-name>
+    <url-pattern>/tabIndividualRelationOp</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>TabHierarchyOperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.TabHierarchyOperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>TabHierarchyOperationController</servlet-name>
+    <url-pattern>/doTabHierarchyOperation</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>DatapropEditController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.DatapropEditController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DatapropEditController</servlet-name>
+    <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>TabEditController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.TabEditController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>TabEditController</servlet-name>
+    <url-pattern>/tabEdit</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>UserEditController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.UserEditController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>UserEditController</servlet-name>
+    <url-pattern>/userEdit</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>OntologyEditController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.OntologyEditController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>OntologyEditController</servlet-name>
+    <url-pattern>/ontologyEdit</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>PropertyEditController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.PropertyEditController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>PropertyEditController</servlet-name>
+    <url-pattern>/propertyEdit</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>PortalEditController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.PortalEditController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>PortalEditController</servlet-name>
+    <url-pattern>/portalEdit</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>EntityRetryController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.EntityRetryController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>EntityRetryController</servlet-name>
+    <url-pattern>/entity_retry</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>VclassRetryController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.VclassRetryController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>VclassRetryController</servlet-name>
+    <url-pattern>/vclass_retry</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>DatatypeRetryController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.DatatypeRetryController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DatatypeRetryController</servlet-name>
+    <url-pattern>/datatype_retry</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>AllTabsForPortalListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.AllTabsForPortalListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>AllTabsForPortalListingController</servlet-name>
+    <url-pattern>/listTabs</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>AllClassGroupsListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.AllClassGroupsListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>AllClassGroupsListingController</servlet-name>
+    <url-pattern>/listGroups</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>PropertyGroupsListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.PropertyGroupsListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>PropertyGroupsListingController</servlet-name>
+    <url-pattern>/listPropertyGroups</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>OntologiesListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.OntologiesListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>OntologiesListingController</servlet-name>
+    <url-pattern>/listOntologies</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>NamespacesListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.NamespacesListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>NamespacesListingController</servlet-name>
+    <url-pattern>/listNamespaces</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>RestrictionsListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.jena.RestrictionsListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>RestrictionsListingController</servlet-name>
+    <url-pattern>/listRestrictions</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>RestrictionOperationController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.RestrictionOperationController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>RestrictionOperationController</servlet-name>
+    <url-pattern>/addRestriction</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>PortalsListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.PortalsListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>PortalsListingController</servlet-name>
+    <url-pattern>/listPortals</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>UsersListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.UsersListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>UsersListingController</servlet-name>
+    <url-pattern>/listUsers</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>VClassWebappsListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.VClassWebappsListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>VClassWebappsListingController</servlet-name>
+    <url-pattern>/listVClassWebapps</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>IndividualsListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.IndividualsListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>IndividualsListingController</servlet-name>
+    <url-pattern>/listIndividuals</url-pattern>
+  </servlet-mapping>
+
+
+  <servlet>
+    <servlet-name>ClassHierarchyListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ClassHierarchyListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ClassHierarchyListingController</servlet-name>
+    <url-pattern>/showClassHierarchy</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>ObjectPropertyHierarchyListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ObjectPropertyHierarchyListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ObjectPropertyHierarchyListingController</servlet-name>
+    <url-pattern>/showObjectPropertyHierarchy</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>DataPropertyHierarchyListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.DataPropertyHierarchyListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DataPropertyHierarchyListingController</servlet-name>
+    <url-pattern>/showDataPropertyHierarchy</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>PropertyWebappsListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.PropertyWebappsListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>PropertyWebappsListingController</servlet-name>
+    <url-pattern>/listPropertyWebapps</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>DatatypePropertiesListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.DatatypePropertiesListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DatatypePropertiesListingController</servlet-name>
+    <url-pattern>/listDatatypeProperties</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>DataPropertyStatementListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.DataPropertyStatementListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DataPropertyStatementListingController</servlet-name>
+    <url-pattern>/listDataPropertyStatements</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>ObjectPropertyStatementListingController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.listing.ObjectPropertyStatementListingController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ObjectPropertyStatementListingController</servlet-name>
+    <url-pattern>/listObjectPropertyStatements</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>EntityListController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityListController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>EntityListController</servlet-name>
+    <url-pattern>/entitylist</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>IndividualListController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>IndividualListController</servlet-name>
+    <url-pattern>/individuallist</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>SearchController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.search.controller.PagedSearchController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>SearchController</servlet-name>
+    <url-pattern>/search</url-pattern>
+  </servlet-mapping>
+  <!-- for now, need to make sure the links on CALS' site doesn't break -->
+  <servlet-mapping>
+    <servlet-name>SearchController</servlet-name>
+    <url-pattern>/search.jsp</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>SearchController</servlet-name>
+    <url-pattern>/fedsearch</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>SearchController</servlet-name>
+    <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-mapping>
+    <servlet-name>AutocompleteController</servlet-name>
+    <url-pattern>/autocomplete</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>AutocompleteController</servlet-name>
+    <url-pattern>/populateselect</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>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>TermsOfUseController</servlet-name>
+    <url-pattern>/termsOfUse</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>ContactFormController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ContactFormController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ContactFormController</servlet-name>
+    <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-mapping>
+    <servlet-name>JSON Service</servlet-name>
+    <url-pattern>/dataservice</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>TabEntitiesController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.TabEntitiesController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>TabEntitiesController</servlet-name>
+    <url-pattern>/TabEntitiesController</url-pattern>
+  </servlet-mapping>
+
+  <!--  NOTICE: index.jsp is mapped to TabControler so that we 
+    		can have the urls that use to be in the system still work even 
+            though we no longer use index.jsp           -->
+  <servlet>
+    <servlet-name>TabController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.TabController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>TabController</servlet-name>
+    <url-pattern>/index.jsp</url-pattern>
+  </servlet-mapping>
+
+  <!-- <servlet>
+       <servlet-name>EntityPropertyListController</servlet-name>     
+       <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityPropertyListController</servlet-class>
+     </servlet>
+     <servlet-mapping>
+       <servlet-name>EntityPropertyListController</servlet-name>
+       <url-pattern>/entityPropList</url-pattern>
+     </servlet-mapping>
+-->
+
+  <servlet>
+    <servlet-name>EntityMergedPropertyListController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityMergedPropertyListController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>EntityMergedPropertyListController</servlet-name>
+    <url-pattern>/entityMergedPropList</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>DashboardPropertyListController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.DashboardPropertyListController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DashboardPropertyListController</servlet-name>
+    <url-pattern>/dashboardPropList</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>dwr-invoker</servlet-name>
+    <servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>logLevel</param-name>
+      <param-value>DEBUG</param-value>
+    </init-param>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>dwr-invoker</servlet-name>
+    <url-pattern>/dwr/*</url-pattern>
+  </servlet-mapping>
+
+  <!-- Deprecated servlet (still used in Datastar) - retain temporarily for testing and comparison. -->
+  <servlet>
+    <servlet-name>sendmail</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.ContactMailServlet</servlet-class>
+    <load-on-startup>5</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>sendmail</servlet-name>
+    <url-pattern>/sendmail</url-pattern>
+  </servlet-mapping>
+  <!-- end deprecated servlet -->
+  
+  <servlet>
+   <servlet-name>sendMail</servlet-name>
+   <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.ContactMailController</servlet-class>
+   <load-on-startup>5</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>sendMail</servlet-name>
+    <url-pattern>/submitFeedback</url-pattern>
+  </servlet-mapping>
+  
+  <servlet>
+    <servlet-name>mailusers</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.MailUsersServlet</servlet-class>
+     <load-on-startup>5</load-on-startup>
+  </servlet>
+
+  <servlet>
+    <servlet-name>entity</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityController</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>updateEntityFlags</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.UpdateEntityFlagServlet</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>authenticate</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>logout</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.Logout</servlet-class>
+    <init-param>
+      <param-name>properties</param-name>
+      <param-value>WEB-INF/classes/formbeans/Login_forms.properties</param-value>
+    </init-param>
+    <!--load-on-startup>2</load-on-startup-->
+  </servlet>
+
+  <servlet>
+    <servlet-name>browsecontroller</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.BrowseController</servlet-class>
+    <load-on-startup>5</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>browsecontroller</servlet-name>
+    <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>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>serveFiles</servlet-name>
+    <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>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>SparqlQuery</servlet-name>
+    <url-pattern>/admin/sparqlquery</url-pattern>
+  </servlet-mapping>
+  
+  <!-- 
+  <servlet>
+    <servlet-name>DummyVisClient</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.visualization.DummyVisClientController</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>DummyVisClient</servlet-name>
+    <url-pattern>/admin/dummyVisClient</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>/admin/visQuery</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>authtest</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.auth.AuthTestController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>authtest</servlet-name>
+    <url-pattern>/authtest</url-pattern>
+  </servlet-mapping>
+
+  <servlet>
+  	<servlet-name>primitiveRdfEdit</servlet-name>
+  	<servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.PrimitiveRdfEdit</servlet-class>  	
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>primitiveRdfEdit</servlet-name>
+    <url-pattern>/edit/primitiveRdfEdit</url-pattern>    
+  </servlet-mapping>
+
+  <servlet>
+    <servlet-name>primitiveDelete</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.PrimitiveDelete</servlet-class>    
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>primitiveDelete</servlet-name>
+    <url-pattern>/edit/primitiveDelete</url-pattern>    
+  </servlet-mapping>
+   
+  <!-- ============================== 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>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>entity</servlet-name>
+    <url-pattern>/entity</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>entity</servlet-name>
+    <url-pattern>/entity/*</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>entity</servlet-name>
+    <url-pattern>/individual/*</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>entity</servlet-name>
+    <url-pattern>/display/*</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>updateEntityFlags</servlet-name>
+    <url-pattern>/updateEntityFlags</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>authenticate</servlet-name>
+    <url-pattern>/authenticate</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <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>
+
+  <!-- ==================== tag libraries ============================== -->
+  <jsp-config>
+    <taglib>
+      <taglib-uri>/WEB-INF/tlds/database.tld</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/database.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+      <taglib-uri>http://java.sun.com/jstl/core</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/c.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+      <taglib-uri>http://java.sun.com/jstl/functions</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/fn.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+      <taglib-uri>http://vitro.mannlib.cornell.edu/edit/tags</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/form.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+      <taglib-uri>http://vitro.mannlib.cornell.edu/vitro/tags</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/vitroForm.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+      <taglib-uri>http://vitro.mannlib.cornell.edu/vitro/tags/PropertyEditLink</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/PropertyEditLink.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+      <taglib-uri>http://mannlib.cornell.edu/vitro/ListSparqlTag/0.1/</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/ListSparqlTag.tld</taglib-location>
+    </taglib>
+
+    <taglib>
+      <taglib-uri>http://jakarta.apache.org/taglibs/string-1.1</taglib-uri>
+      <taglib-location>/WEB-INF/tlds/taglibs-string.tld</taglib-location>
+    </taglib>
+  </jsp-config>
+
+  <!-- ==================== error pages ================================ -->
+  <!-- 	<error-page>
+ -->
+  <!-- 		<error-code>404</error-code>
+ -->
+  <!-- 		<location>/templates/error/error404.jsp</location>
+ -->
+  <!-- 	</error-page>
+ -->
+
+  
+</web-app>
diff --git a/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/VivoMergedListFilteringSetup.java b/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/VivoMergedListFilteringSetup.java
new file mode 100644
index 00000000..973d1f43
--- /dev/null
+++ b/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/VivoMergedListFilteringSetup.java
@@ -0,0 +1,116 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.servlet.setup;
+
+import javax.servlet.ServletContextEvent;
+
+import net.sf.jga.fn.UnaryFunctor;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.controller.EntityMergedPropertyListController;
+import edu.cornell.mannlib.vitro.webapp.dao.filtering.IndividualFiltering;
+import edu.cornell.mannlib.vitro.webapp.dao.filtering.filters.VitroFiltersImpl;
+
+/**
+ * This adds an object to the servlet context that will be used by 
+ * EntityMergedPropertiesListController to convert the individual that
+ * is specified by the URI of the request to an individual that is filtered.  
+ * The object is a function from an Individual to an Individual.  The original
+ * Individual is wrapped in an object that will filter out any object property statements
+ * to Individuals of core:Position whos date is in the past.
+ * 
+ * This is related to http://issues.library.cornell.edu/browse/NIHVIVO-984
+ * 
+ * @author bdc34
+ *
+ */
+public class VivoMergedListFilteringSetup implements javax.servlet.ServletContextListener {
+	private static final Log log = LogFactory.getLog(VivoMergedListFilteringSetup.class);
+	
+	@Override
+	public void contextDestroyed(ServletContextEvent arg0) {
+	}
+
+	@Override
+	public void contextInitialized(ServletContextEvent arg0) {
+		log.info("Setting up Vivo Merged List Filtering.");
+		
+		UnaryFunctor<Individual,Individual> fn = new UnaryFunctor<Individual,Individual>(){
+
+			@Override
+			public Individual fn(Individual subject) {			
+				if( subject != null && subject.isVClass("http://xmlns.com/foaf/0.1/Organization")){
+					return new IndividualFiltering(subject, new VitroFiltersImpl(){
+						
+	//					@Override
+	//					public UnaryFunctor<Individual, Boolean> getIndividualFilter(){
+	//						return new UnaryFunctor<Individual,Boolean>(){
+	//							@Override
+	//							public Boolean fn(Individual arg) {
+	//								return ! isPast(arg);
+	//							}							
+	//						};						
+	//					}
+						
+						/**
+						 * This returns true if we should keep the statement, false if we should get rid of the statement
+						 */
+						@Override
+						public UnaryFunctor<ObjectPropertyStatement, Boolean> getObjectPropertyStatementFilter(){
+							return new UnaryFunctor<ObjectPropertyStatement,Boolean>(){
+								@Override
+								public Boolean fn(ObjectPropertyStatement arg) {
+									if( "http://vivoweb.org/ontology/core#organizationForPosition".equals(arg.getPropertyURI())){
+										return ! positionInPast(arg.getObject());
+									}else{
+										return true;
+									}
+								}							
+							};						
+						}
+						
+						
+					});
+				}else{
+					return subject;
+				}
+			}			
+		};
+		
+		EntityMergedPropertyListController.setMergedPropertyListFilter(fn, arg0.getServletContext());		
+	}
+	
+	
+	private boolean positionInPast(Individual ind){	
+		
+		if( ind.isVClass( "http://vivoweb.org/ontology/core#Position" ) ){
+			
+			//positionShortView.jsp does not check core:endDate
+//			for(DataPropertyStatement stmt : ind.getDataPropertyStatements("http://vivoweb.org/ontology/core#endDate")){
+//				 DateTime end = new DateTime( stmt.getData() );
+//				 if( end.isBeforeNow() )
+//					 return true; 
+//			}
+			
+			for(DataPropertyStatement stmt : ind.getDataPropertyStatements("http://vivoweb.org/ontology/core#endYear")){
+				int endYear = Integer.MAX_VALUE;
+				try{
+					endYear = Integer.parseInt(stmt.getData());
+				}catch(NumberFormatException nfe){
+					log.warn("Could not parse year: " + stmt.getData());
+				}
+				int nowYear = (new DateTime()).getYear();
+				
+				//This should use the same logic as positionShortView.jsp
+				return nowYear > endYear;				
+			}
+		}
+		return false;
+	}
+}