From 9f9b6cacbebb6e8cb64b3dd5fd88c307b52db9fb Mon Sep 17 00:00:00 2001
From: Ted Nathan Husted <husted@apache.org>
Date: Fri, 1 Sep 2006 16:58:55 +0000
Subject: [PATCH] WW-1429 Fix authentifcation/interceptor settings.

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@439376 13f79535-47bb-0310-9956-ffa450edef68
---
 apps/mailreader/src/main/resources/mailreader-default.xml | 5 -----
 apps/mailreader/src/main/resources/mailreader-support.xml | 4 ++--
 apps/mailreader/src/main/webapp/pages/tour.html           | 8 ++------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/apps/mailreader/src/main/resources/mailreader-default.xml b/apps/mailreader/src/main/resources/mailreader-default.xml
index 8f673b737..bedba1cae 100644
--- a/apps/mailreader/src/main/resources/mailreader-default.xml
+++ b/apps/mailreader/src/main/resources/mailreader-default.xml
@@ -26,11 +26,6 @@
                 <interceptor-ref name="defaultStack"/>
             </interceptor-stack>
 
-            <interceptor-stack name="guest-submit" >
-                <interceptor-ref name="token-session" />
-                <interceptor-ref name="guest"/>
-            </interceptor-stack>
-
         </interceptors>
 
         <default-interceptor-ref name="user"/>
diff --git a/apps/mailreader/src/main/resources/mailreader-support.xml b/apps/mailreader/src/main/resources/mailreader-support.xml
index ec7ccb90d..ef79ea6a6 100644
--- a/apps/mailreader/src/main/resources/mailreader-support.xml
+++ b/apps/mailreader/src/main/resources/mailreader-support.xml
@@ -28,13 +28,13 @@
             <exception-mapping
                     exception="org.apache.struts.apps.mailreader.dao.ExpiredPasswordException"
                     result="expired"/>
-            <interceptor-ref name="guest-submit"/>
+            <interceptor-ref name="guest"/>
         </action>
 
         <action name="Registration!*" class="mailreader2.Registration" method="{1}">
             <result name="input">/pages/Registration.jsp</result>
             <result type="redirect-action">MainMenu</result>
-            <interceptor-ref name="guest-submit"/>
+            <interceptor-ref name="guest"/>
         </action>
 
         <action name="Subscription!save" class="mailreader2.SubscriptionSave">
diff --git a/apps/mailreader/src/main/webapp/pages/tour.html b/apps/mailreader/src/main/webapp/pages/tour.html
index abc7dacf9..35c8ccc70 100644
--- a/apps/mailreader/src/main/webapp/pages/tour.html
+++ b/apps/mailreader/src/main/webapp/pages/tour.html
@@ -1448,8 +1448,8 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
 </p>
 
 <p>
-    The MailReader defines four custom Interceptor stacks: "user", "user-submit",
-    "guest", and "guest-submit".
+    The MailReader defines three custom Interceptor stacks: "user", "user-submit",
+    and "guest".
 </p>
 
 <hr/>
@@ -1468,10 +1468,6 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
   &lt;interceptor-stack name="<strong>guest</strong>" >
       &lt;interceptor-ref name="defaultStack"/>
   &lt;/interceptor-stack>
-  &lt;interceptor-stack name="<strong>guest-submit</strong>" >
-      &lt;interceptor-ref name="token-session" />
-      &lt;interceptor-ref name="guest"/>
-  &lt;/interceptor-stack>
 &lt;/interceptors>
 &lt;<strong>default-interceptor-ref</strong> name="user"/></code></pre>
 <hr/>