From 8fbfc2267ff474aed96dfcb80971afaefc62bd49 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 29 Nov 2010 21:37:04 +0000
Subject: [PATCH] NIHVIVO-151 send all logout requests directly to /logout.
 Remove old links to login_process.jsp

---
 productMods/WEB-INF/web.xml     | 5 -----
 productMods/WEB-INF/web.xml.sdb | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 2fc7d0a4..612b0ec0 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -1348,11 +1348,6 @@
     <servlet-name>loginExternalAuthReturn</servlet-name>
     <url-pattern>/loginExternalAuthReturn</url-pattern>
   </servlet-mapping>
-  <servlet-mapping>
-    <!-- for backward-compatibility -->
-    <servlet-name>login</servlet-name>
-    <url-pattern>/login_process.jsp</url-pattern> 
-  </servlet-mapping>
   <servlet-mapping>
     <servlet-name>logout</servlet-name>
     <url-pattern>/logout</url-pattern>
diff --git a/productMods/WEB-INF/web.xml.sdb b/productMods/WEB-INF/web.xml.sdb
index 886500ab..e45edefd 100644
--- a/productMods/WEB-INF/web.xml.sdb
+++ b/productMods/WEB-INF/web.xml.sdb
@@ -1339,11 +1339,6 @@
     <servlet-name>loginExternalAuthReturn</servlet-name>
     <url-pattern>/loginExternalAuthReturn</url-pattern>
   </servlet-mapping>
-  <servlet-mapping>
-    <!-- for backward-compatibility -->
-    <servlet-name>login</servlet-name>
-    <url-pattern>/login_process.jsp</url-pattern> 
-  </servlet-mapping>
   <servlet-mapping>
     <servlet-name>logout</servlet-name>
     <url-pattern>/logout</url-pattern>