Author: husted
Date: Tue Jul 25 20:04:47 2006
New Revision: 425589
URL: http://svn.apache.org/viewvc?rev=425589&view=rev
Log:
WW-1353 Update MailReader to use wildcards instead of bangs.
Modified:
struts/struts2/trunk/apps/mailreader/src/main/resources/struts.properties
struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Logon.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Registration.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp
Modified:
struts/struts2/trunk/apps/mailreader/src/main/resources/struts.properties
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/struts.properties?rev=425589&r1=425588&r2=425589&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/resources/struts.properties
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/resources/struts.properties
Tue Jul 25 20:04:47 2006
@@ -2,5 +2,4 @@
struts.devMode = true
struts.action.extension = do
struts.custom.i18n.resources = resources
-struts.compatibilityMode = true
Modified: struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml?rev=425589&r1=425588&r2=425589&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml Tue Jul
25 20:04:47 2006
@@ -55,7 +55,7 @@
<interceptor-ref name="guest"/>
</action>
- <action name="Logon" class="mailreader2.Logon">
+ <action name="Logon!*" class="mailreader2.Logon" method="{1}">
<result name="input">/pages/Logon.jsp</result>
<result name="cancel" type="redirect-action">Welcome</result>
<result type="redirect-action">MainMenu</result>
@@ -74,24 +74,24 @@
<result>/pages/MainMenu.jsp</result>
</action>
- <action name="Registration" class="mailreader2.Registration">
+ <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"/>
</action>
- <action name="RegistrationSave" class="mailreader2.RegistrationSave">
+ <action name="Registration!save" class="mailreader2.RegistrationSave">
<result name="input">/pages/Registration.jsp</result>
<result type="redirect-action">MainMenu</result>
<interceptor-ref name="guest-submit" />
</action>
- <action name="Subscription" class="mailreader2.Subscription">
+ <action name="Subscription!*" class="mailreader2.Subscription"
method="{1}">
<result name="input">/pages/Subscription.jsp</result>
<result type="redirect-action">Registration!input</result>
</action>
- <action name="SubscriptionSave" class="mailreader2.SubscriptionSave">
+ <action name="Subscription!save" class="mailreader2.SubscriptionSave">
<result name="input">/pages/Subscription.jsp</result>
<result type="redirect-action">Registration!input</result>
<interceptor-ref name="user-submit" />
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Logon.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Logon.jsp?rev=425589&r1=425588&r2=425589&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Logon.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Logon.jsp Tue
Jul 25 20:04:47 2006
@@ -12,7 +12,7 @@
<body onLoad="self.focus();document.Logon.username.focus()">
<s:actionerror />
-<s:form method="POST" validate="true">
+<s:form action="Logon!execute" validate="true">
<s:textfield label="%{getText('username')}" name="username"/>
<s:password label="%{getText('password')}" name="password"
showPassword="true"/>
Modified:
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Registration.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Registration.jsp?rev=425589&r1=425588&r2=425589&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Registration.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Registration.jsp
Tue Jul 25 20:04:47 2006
@@ -17,7 +17,7 @@
<body onLoad="self.focus();document.Registration.username.focus()">
<s:actionerror/>
-<s:form method="POST" validate="false">
+<s:form action="Registration!execute" validate="false">
<s:token />
<s:hidden name="task"/>
<s:if test="task == 'Create'">
Modified:
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp?rev=425589&r1=425588&r2=425589&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp
Tue Jul 25 20:04:47 2006
@@ -20,7 +20,7 @@
<body onLoad="self.focus();document.Subscription.username.focus()">
<s:actionerror/>
-<s:form method="POST" action="SubscriptionSave" validate="false">
+<s:form action="Subscription!save" validate="false">
<s:token />
<s:hidden name="task"/>
<s:label label="%{getText('username')}" name="user.username"/>
