struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r428209 - in /struts/struts2/trunk/apps/mailreader/src/main: resources/struts.xml webapp/pages/Logon.jsp webapp/pages/MainMenu.jsp webapp/pages/Registration.jsp webapp/pages/Subscription.jsp
Date Thu, 03 Aug 2006 01:17:09 GMT
Author: husted
Date: Wed Aug  2 18:17:08 2006
New Revision: 428209

URL: http://svn.apache.org/viewvc?rev=428209&view=rev
Log:
WW-1353 Refactor MailReader to use namespaces and conventional, finely-grained actions with
no aliases. (Refactoring for wildcards is next.)

Removed:
    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.xml
    struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/Logon.jsp
    struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/MainMenu.jsp

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=428209&r1=428208&r2=428209&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/resources/struts.xml Wed Aug  2 18:17:08
2006
@@ -113,53 +113,44 @@
             <interceptor-ref name="guest"/>
         </action>
 
-    </package>
-
-    <package name="registration" namespace="/registration" extends="default">
-
-        <action name="Update" class="mailreader2.registration.Update">
+        <action name="registration/Update" class="mailreader2.registration.Update">
             <result name="input">/pages/registration.jsp</result>
             <result type="redirect-action">MainMenu</result>
         </action>
 
-        <action name="Create" class="mailreader2.registration.Create">
+        <action name="registration/Create" class="mailreader2.registration.Create">
             <result name="input">/pages/registration.jsp</result>
             <result type="redirect-action">MainMenu</result>
             <interceptor-ref name="guest-submit"/>
         </action>
 
-        <action name="Input" class="mailreader2.registration.Input">
+        <action name="registration/Input" class="mailreader2.registration.Input">
             <result>/pages/registration.jsp</result>
             <interceptor-ref name="guest"/>
         </action>
 
-        <action name="Retrieve" class="mailreader2.registration.Retrieve">
+        <action name="registration/Retrieve" class="mailreader2.registration.Retrieve">
             <result name="input">/pages/Logon.jsp</result>
             <result type="redirect-action">MainMenu</result>
             <interceptor-ref name="guest"/>
         </action>
 
-    </package>
-
-    <package name="subscription" namespace="/subscription" extends="default">
-
-        <action name="Delete" class="mailreader2.subscription.Delete">
+        <action name="subscription/Delete" class="mailreader2.subscription.Delete">
             <result>/pages/subscription.jsp</result>
         </action>
 
-        <action name="Edit" class="mailreader2.subscription.Edit">
+        <action name="subscription/Edit" class="mailreader2.subscription.Edit">
             <result>/pages/subscription.jsp</result>
         </action>
 
-        <action name="Input" class="mailreader2.subscription.Input">
+        <action name="subscription/Input" class="mailreader2.subscription.Input">
             <result>/pages/subscription.jsp</result>
         </action>
 
-        <action name="Save" class="mailreader2.subscription.Save">
+        <action name="subscription/Save" class="mailreader2.subscription.Save">
             <result name="input">/pages/subscription.jsp</result>
             <result type="redirect-action">
-                <param name="actionName">Input</param>
-                <param name="namespace">/registration</param>
+                <param name="actionName">registration/Input</param>
             </result>
             <interceptor-ref name="user-submit"/>
         </action>

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=428209&r1=428208&r2=428209&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 Wed Aug  2 18:17:08
2006
@@ -12,7 +12,7 @@
 <body onLoad="self.focus();document.Retrieve.username.focus()">
 
 <s:actionerror/>
-<s:form action="Retrieve" namespace="/registration" validate="true">
+<s:form action="registration/Retrieve" 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/MainMenu.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/MainMenu.jsp?rev=428209&r1=428208&r2=428209&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/MainMenu.jsp (original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/pages/MainMenu.jsp Wed Aug  2 18:17:08
2006
@@ -14,7 +14,7 @@
         value="user.fullName"/></h3>
 <ul>
     <li>
-        <s:url id="Input" action="Input" namespace="/registration"/>
+        <s:url id="Input" action="registration/Input" />
         <s:a href="%{Input}">
             <s:text name="mainMenu.registration"/>
         </s:a>



Mime
View raw message