From fde6fc116d88b1b47623b368148df7ca69c50e9a Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 3 Sep 2010 20:58:16 +0000
Subject: [PATCH] NIHVIVO-736 Create a Login.java controller to replace
 login_process.jsp.

---
 productMods/WEB-INF/web.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 58f309fd..9d1f03e3 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -1060,14 +1060,14 @@
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>login</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.Login</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>
@@ -1222,6 +1222,15 @@
     <servlet-name>authenticate</servlet-name>
     <url-pattern>/authenticate</url-pattern>
   </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>login</servlet-name>
+    <url-pattern>/login</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>