From 6b049a481485d22addb305d51ca187e626a22b23 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 15 Nov 2010 18:17:10 +0000
Subject: [PATCH] NIHVIVO-1207 Break the two-part Shibboleth process into two
 servlets.

---
 productMods/WEB-INF/web.xml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 4e15860c..3a74b483 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -1107,8 +1107,13 @@
   </servlet>
 
   <servlet>
-    <servlet-name>loginShibboleth</servlet-name>
-    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginShibboleth</servlet-class>
+    <servlet-name>loginShibbolethSetup</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginShibbolethSetup</servlet-class>
+  </servlet>
+
+  <servlet>
+    <servlet-name>loginShibbolethReturn</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginShibbolethReturn</servlet-class>
   </servlet>
 
   <servlet>
@@ -1292,9 +1297,13 @@
     <url-pattern>/login</url-pattern>
   </servlet-mapping>
   <servlet-mapping>
-    <servlet-name>loginShibboleth</servlet-name>
+    <servlet-name>loginShibbolethSetup</servlet-name>
     <url-pattern>/loginShibboleth</url-pattern>
   </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>loginShibbolethReturn</servlet-name>
+    <url-pattern>/loginShibbolethReturn</url-pattern>
+  </servlet-mapping>
   <servlet-mapping>
     <!-- for backward-compatibility -->
     <servlet-name>login</servlet-name>