From 4311fa231aeb15b8a6d5e1eb7ce2218e25994b41 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 17 Nov 2010 19:27:16 +0000
Subject: [PATCH] NIHVIVO-1207 Rename Shibboleth servlets to more general
 ExternalAuth servlets. Add functionality to deal with self-editors as well as
 Users.

---
 productMods/WEB-INF/web.xml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 5da37870..0e3a70d9 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -1123,13 +1123,13 @@
   </servlet>
 
   <servlet>
-    <servlet-name>loginShibbolethSetup</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginShibbolethSetup</servlet-class>
+    <servlet-name>loginExternalAuthSetup</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginExternalAuthSetup</servlet-class>
   </servlet>
 
   <servlet>
-    <servlet-name>loginShibbolethReturn</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginShibbolethReturn</servlet-class>
+    <servlet-name>loginExternalAuthReturn</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginExternalAuthReturn</servlet-class>
   </servlet>
 
   <servlet>
@@ -1137,6 +1137,15 @@
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.edit.Logout</servlet-class>
   </servlet>
 
+  <servlet>
+    <servlet-name>unrecognizedUser</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.UnrecognizedUserController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>unrecognizedUser</servlet-name>
+    <url-pattern>/unrecognizedUser</url-pattern>
+  </servlet-mapping>
+
   <servlet>
     <servlet-name>browsecontroller</servlet-name>
     <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.BrowseController</servlet-class>
@@ -1315,12 +1324,12 @@
   </servlet-mapping>
   -->
   <servlet-mapping>
-    <servlet-name>loginShibbolethSetup</servlet-name>
-    <url-pattern>/loginShibboleth</url-pattern>
+    <servlet-name>loginExternalAuthSetup</servlet-name>
+    <url-pattern>/loginExternalAuth</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
-    <servlet-name>loginShibbolethReturn</servlet-name>
-    <url-pattern>/loginShibbolethReturn</url-pattern>
+    <servlet-name>loginExternalAuthReturn</servlet-name>
+    <url-pattern>/loginExternalAuthReturn</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
     <!-- for backward-compatibility -->