struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hus...@apache.org
Subject svn commit: r389314 - in /struts/sandbox/trunk/action2: ./ apps/mailreader/src/java/ apps/mailreader/src/java/mailreader2/ apps/mailreader/src/webapp/pages/
Date Mon, 27 Mar 2006 22:32:47 GMT
Author: husted
Date: Mon Mar 27 14:32:45 2006
New Revision: 389314

URL: http://svn.apache.org/viewcvs?rev=389314&view=rev
Log:
Action2 Apps
* Mailreader - Work in progress
** Add support for Locale change  
** Change Subscription workflow to validate edit/delete from base class. Save is validated
from subclass.

Removed:
    struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-delete-validation.xml
    struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription-edit-validation.xml
Modified:
    struts/sandbox/trunk/action2/README.txt
    struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
    struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration.java
    struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
    struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp

Modified: struts/sandbox/trunk/action2/README.txt
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/README.txt?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/README.txt (original)
+++ struts/sandbox/trunk/action2/README.txt Mon Mar 27 14:32:45 2006
@@ -72,9 +72,6 @@
 + Logon - Cancel
 + Register - Cancel
 
-Issues
-* Powered image not displaying.
-
 ----
 
 Logon
@@ -173,7 +170,8 @@
 ----
 
 Locale change
-* TODO
++ Change locale from Welcome page.
++ Buttons and Labels reflect changed locale
 
 ----
 

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
(original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
Mon Mar 27 14:32:45 2006
@@ -332,7 +332,7 @@
      * <p> Persist the User object, including subscriptions, to the database.
      * </p>
      *
-     * @throws javax.servlet.ServletException On any error
+     * @throws java.lang.Exception on database error
      */
     public void saveUser() throws Exception {
         try {

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration.java?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration.java (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration.java Mon
Mar 27 14:32:45 2006
@@ -4,8 +4,7 @@
 
 
 /**
- * <p> Provide an Edit method for retrieving an existing user, and a Save
- * method for updating or inserting a user. </p>
+ * <p>Insert or update a User object to the persistent store. </p>
  */
 public final class Registration extends MailreaderSupport {
 

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/xwork.xml Mon Mar 27 14:32:45 2006
@@ -33,16 +33,6 @@
             <result name="expired" type="chain">ChangePassword</result>
         </action>
 
-        <action name="Something"
-                class="mailreader2.Logon">
-            <exception-mapping
-                    exception="org.apache.struts.apps.mailreader.dao.ExpiredPasswordException"
-                    result="expired"/>
-            <result>/pages/MainMenu.jsp</result>
-            <result name="input">/pages/Logon.jsp</result>
-            <result name="expired" type="chain">ChangePassword</result>
-        </action>
-
         <action name="ChangePassword">
             <result>/pages/ChangePassword.jsp</result>
         </action>

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/ChangePassword.jsp Mon Mar
27 14:32:45 2006
@@ -1,3 +1,4 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Logon.jsp Mon Mar 27 14:32:45
2006
@@ -1,3 +1,4 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -15,9 +16,9 @@
 
     <saf:textfield label="%{getText('prompt.password')}" name="password"/>
 
-    <saf:submit/>
+    <saf:submit value="%{getText('button.save')}"/>
 
-    <saf:reset/>
+    <saf:reset value="%{getText('button.reset')}"/>
 
     <saf:submit action="Welcome" value="%{getText('button.cancel')}"
                onclick="form.onsubmit=null"/>

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/MainMenu.jsp Mon Mar 27
14:32:45 2006
@@ -1,3 +1,4 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp Mon Mar
27 14:32:45 2006
@@ -1,3 +1,4 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -38,9 +39,9 @@
     <saf:textfield label="%{getText('prompt.replyToAddress')}"
                    name="user.replyToAddress"/>
 
-    <saf:submit/>
+    <saf:submit value="%{getText('button.save')}"/>
 
-    <saf:reset/>
+    <saf:reset value="%{getText('button.reset')}"/>
 
     <saf:if test="task == 'Create'">
         <saf:submit action="Welcome" value="%{getText('button.cancel')}"

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp Mon Mar
27 14:32:45 2006
@@ -1,3 +1,4 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp?rev=389314&r1=389313&r2=389314&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Welcome.jsp Mon Mar 27 14:32:45
2006
@@ -1,3 +1,4 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
 <%@ taglib uri="/webwork" prefix="saf" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -24,15 +25,10 @@
 <hr/>
 
 <ul>
-    <li><a href="<saf:url action="Locale?language=en"/>">English</a></li>
-    <li><a href="<saf:url action="Locale?language=ja"/>">Japanese</a></li>
-    <li><a href="<saf:url action="Locale?language=ru"/>">Russian</a></li>
+    <li><a href="<saf:url action="Welcome?request_locale=en"/>">English</a></li>
+    <li><a href="<saf:url action="Welcome?request_locale=ja"/>">Japanese</a></li>
+    <li><a href="<saf:url action="Welcome?request_locale=ru"/>">Russian</a></li>
 </ul>
-
-<p><saf:i18n name="alternate">
-    <img src="<saf:url><saf:text name="struts.logo.path"/></saf:url>"
-         alt="<saf:text name="struts.logo.alt"/>"/>
-</saf:i18n></p>
 
 <p><a href="<saf:url action="Tour" />"><saf:text name="index.tour"/></a></p>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message