Author: husted
Date: Tue Aug 1 15:38:18 2006
New Revision: 427775
URL: http://svn.apache.org/viewvc?rev=427775&view=rev
Log:
WW-1353 MailReader - Update mappings and links to correct operation using
wildcards instead of ! aliases. Note that there might be an issue with wildcard
matching. Ideally Registration_save and Subscription_save should be
Registration!save and Subscription!save, so that the links are consistent.
Added:
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/RegistrationSave-validation.xml
(contents, props changed)
- copied, changed from r427593,
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/RegistrationSave-validation.xml
Removed:
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/RegistrationSave-validation.xml
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/index.html
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Registration.jsp
struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Subscription.jsp
struts/struts2/trunk/docs/tags/index.html
Copied:
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/RegistrationSave-validation.xml
(from r427593,
struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/RegistrationSave-validation.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/RegistrationSave-validation.xml?p2=struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/RegistrationSave-validation.xml&p1=struts/struts2/trunk/apps/mailreader/src/main/java/mailreader2/RegistrationSave-validation.xml&r1=427593&r2=427775&rev=427775&view=diff
==============================================================================
(empty)
Propchange:
struts/struts2/trunk/apps/mailreader/src/main/resources/mailreader2/RegistrationSave-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
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=427775&r1=427774&r2=427775&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/resources/struts.properties
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/resources/struts.properties
Tue Aug 1 15:38:18 2006
@@ -1,5 +1,3 @@
struts.objectFactory = spring
struts.devMode = true
-struts.action.extension = do
struts.custom.i18n.resources = resources
-
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=427775&r1=427774&r2=427775&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml Tue Aug
1 15:38:18 2006
@@ -80,7 +80,8 @@
<interceptor-ref name="guest"/>
</action>
- <action name="Registration!save" class="mailreader2.RegistrationSave">
+ <!-- last match wins -->
+ <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" />
@@ -91,7 +92,8 @@
<result type="redirect-action">Registration!input</result>
</action>
- <action name="Subscription!save" class="mailreader2.SubscriptionSave">
+ <!-- last match wins -->
+ <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/index.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/index.html?rev=427775&r1=427774&r2=427775&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/index.html (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/index.html Tue Aug 1
15:38:18 2006
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome.do">
+ <META HTTP-EQUIV="Refresh" CONTENT="0;URL=Welcome.action">
</head>
<body>
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=427775&r1=427774&r2=427775&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 Aug 1 15:38:18 2006
@@ -17,8 +17,8 @@
<body onLoad="self.focus();document.Registration.username.focus()">
<s:actionerror/>
-<s:form action="Registration!execute" validate="false">
- <s:token />
+<s:form action="Registration" validate="true">
+ <s:token/>
<s:hidden name="task"/>
<s:if test="task == 'Create'">
<s:textfield label="%{getText('username')}" name="username"/>
@@ -42,7 +42,7 @@
name="user.replyToAddress"/>
<s:if test="task == 'Create'">
- <s:submit value="%{getText('button.save')}" action="RegistrationSave"/>
+ <s:submit value="%{getText('button.save')}"
action="Registration_save"/>
<s:reset value="%{getText('button.reset')}"/>
@@ -50,7 +50,7 @@
onclick="form.onsubmit=null"/>
</s:if>
<s:else>
- <s:submit value="%{getText('button.save')}" action="Registration"/>
+ <s:submit value="%{getText('button.save')}"/>
<s:reset value="%{getText('button.reset')}"/>
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=427775&r1=427774&r2=427775&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 Aug 1 15:38:18 2006
@@ -17,11 +17,11 @@
type="text/css"/>
</head>
-<body onLoad="self.focus();document.Subscription.username.focus()">
+<body onLoad="self.focus();document.Subscription_save.username.focus()">
<s:actionerror/>
-<s:form action="Subscription!save" validate="false">
- <s:token />
+<s:form action="Subscription_save" validate="true">
+ <s:token/>
<s:hidden name="task"/>
<s:label label="%{getText('username')}" name="user.username"/>
Modified: struts/struts2/trunk/docs/tags/index.html
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/docs/tags/index.html?rev=427775&r1=427774&r2=427775&view=diff
==============================================================================
--- struts/struts2/trunk/docs/tags/index.html (original)
+++ struts/struts2/trunk/docs/tags/index.html Tue Aug 1 15:38:18 2006
@@ -1,11 +1,11 @@
<html>
<head>
-<title>Struts Action 2 2.0-dev Taglib Index</title>
+<title>Struts 2.0.0-SNAPSHOT Taglib Index</title>
</head>
<body>
-<h1>Struts Action 2 2.0-dev Taglib Index</h1>
+<h1>Struts 2.0.0-SNAPSHOT Taglib Index</h1>
<p>
<table width="100%">
