svn commit: r439376 - in /struts/struts2/trunk/apps/mailreader/src/main: resources/mailreader-default.xml resources/mailreader-support.xml webapp/pages/tour.html

[husted]

Author: husted
Date: Fri Sep  1 09:58:55 2006
New Revision: 439376

URL: http://svn.apache.org/viewvc?rev=439376&view=rev
Log:
WW-1429 Fix authentifcation/interceptor settings.

Modified:
    
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-default.xml
    
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-support.xml
    struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-default.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-default.xml?rev=439376&r1=439375&r2=439376&view=diff
==============================================================================
--- 
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-default.xml 
(original)
+++ 
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-default.xml 
Fri Sep  1 09:58:55 2006
@@ -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"/>

Modified: 
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-support.xml
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-support.xml?rev=439376&r1=439375&r2=439376&view=diff
==============================================================================
--- 
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-support.xml 
(original)
+++ 
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader-support.xml 
Fri Sep  1 09:58:55 2006
@@ -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">

Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html?rev=439376&r1=439375&r2=439376&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html 
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/tour.html Fri 
Sep  1 09:58:55 2006
@@ -1448,8 +1448,8 @@
 </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/>
@@ -1467,10 +1467,6 @@
   &lt;/interceptor-stack>
   &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>