From ca4b049797d3b04f4dc274acacc29770d2e0109f Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 14 Jan 2011 17:30:46 +0000
Subject: [PATCH] NIHVIVO-1679 Remove servlet mappings to old individual page.
 They are left in as comments in case someone needs them.

---
 productMods/WEB-INF/web.xml | 38 +++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 56eba224..41699120 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -1142,14 +1142,32 @@
      <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-mapping>
+    <servlet-name>entity</servlet-name>
+    <url-pattern>/entityold</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>entity</servlet-name>
+    <url-pattern>/entityold/*</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>entity</servlet-name>
+    <url-pattern>/individualold/*</url-pattern>
+  </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>entity</servlet-name>
+    <url-pattern>/displayold/*</url-pattern>
+  </servlet-mapping>
+  -->
   
   <servlet>
-  <servlet-name>ontology</servlet-name>
-  <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.OntologyController</servlet-class>
+    <servlet-name>ontology</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.OntologyController</servlet-class>
   </servlet>
   
   <servlet>
@@ -1416,22 +1434,6 @@
     <url-pattern>/mailusers</url-pattern>
   </servlet-mapping>
   
-  <servlet-mapping>
-    <servlet-name>entity</servlet-name>
-    <url-pattern>/entityold</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>entity</servlet-name>
-    <url-pattern>/entityold/*</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>entity</servlet-name>
-    <url-pattern>/individualold/*</url-pattern>
-  </servlet-mapping>
-  <servlet-mapping>
-    <servlet-name>entity</servlet-name>
-    <url-pattern>/displayold/*</url-pattern>
-  </servlet-mapping>
    <servlet-mapping>
     <servlet-name>ontology</servlet-name>
     <url-pattern>/ontology/*</url-pattern>