Author: jmitchell
Date: Thu Mar 15 06:00:02 2007
New Revision: 518613
URL: http://svn.apache.org/viewvc?view=rev&rev=518613
Log:
WW-1767 Fix references from 'redirect-action' to 'redirectAction'
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml?view=diff&rev=518613&r1=518612&r2=518613
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-default.xml
Thu Mar 15 06:00:02 2007
@@ -33,7 +33,7 @@
<global-results>
<result name="error">/pages/Error.jsp</result>
<result name="invalid.token">/pages/Error.jsp</result>
- <result name="login" type="redirect-action">Login_input</result>
+ <result name="login" type="redirectAction">Login_input</result>
</global-results>
<global-exception-mappings>
Modified:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml?view=diff&rev=518613&r1=518612&r2=518613
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/java/mailreader-support.xml
Thu Mar 15 06:00:02 2007
@@ -17,13 +17,13 @@
</action>
<action name="Logout" class="mailreader2.Logout">
- <result type="redirect-action">Welcome</result>
+ <result type="redirectAction">Welcome</result>
</action>
<action name="Login_*" method="{1}" class="mailreader2.Login">
<result name="input">/Login.jsp</result>
- <result name="cancel" type="redirect-action">Welcome</result>
- <result type="redirect-action">MainMenu</result>
+ <result name="cancel" type="redirectAction">Welcome</result>
+ <result type="redirectAction">MainMenu</result>
<result name="expired" type="chain">ChangePassword</result>
<exception-mapping
exception="org.apache.struts.apps.mailreader.dao.ExpiredPasswordException"
@@ -33,7 +33,7 @@
<action name="Registration_*" method="{1}"
class="mailreader2.Registration">
<result name="input">/Registration.jsp</result>
- <result type="redirect-action">MainMenu</result>
+ <result type="redirectAction">MainMenu</result>
<interceptor-ref name="guest"/>
</action>
</package>
@@ -42,7 +42,7 @@
<global-results>
<result name="input">/Subscription.jsp</result>
- <result type="redirect-action">Registration_input</result>
+ <result type="redirectAction">Registration_input</result>
</global-results>
<action name="Subscription_save" method="save"
class="mailreader2.Subscription">
