You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2005/12/08 14:35:21 UTC

svn commit: r355087 - in /struts/apps/trunk/mailreader/src: java/org/apache/struts/apps/mailreader/actions/ webapp/WEB-INF/

Author: husted
Date: Thu Dec  8 05:35:15 2005
New Revision: 355087

URL: http://svn.apache.org/viewcvs?rev=355087&view=rev
Log:
MailReader 
* Create base DynaActionForm element to coincide with BaseAction class. 

Modified:
    struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/BaseAction.java
    struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/LogonAction.java
    struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/RegistrationAction.java
    struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/SubscriptionAction.java
    struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml

Modified: struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/BaseAction.java
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/BaseAction.java?rev=355087&r1=355086&r2=355087&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/BaseAction.java (original)
+++ struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/BaseAction.java Thu Dec  8 05:35:15 2005
@@ -50,7 +50,30 @@
  * </p>
  * @version $Rev$ $Date$
  */
-public class BaseAction extends MappingDispatchAction {
+public abstract class BaseAction extends MappingDispatchAction {
+
+    // ---- Fields ----
+
+    /**
+     * <p>
+     * Name of username field ["username"].
+     * </p>
+     */
+    public static String USERNAME = "username";
+
+    /**
+     * <p>
+     * Name of password field ["password"].
+     * </p>
+     */
+    public static String PASSWORD = "password";
+
+    /**
+     * <p>
+     * Name of task field ["task"].
+     * </p>
+     */
+    public final static String TASK = "task";
 
     // ---- Protected Variables ----
 

Modified: struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/LogonAction.java
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/LogonAction.java?rev=355087&r1=355086&r2=355087&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/LogonAction.java (original)
+++ struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/LogonAction.java Thu Dec  8 05:35:15 2005
@@ -38,22 +38,6 @@
 
     /**
      * <p>
-     * Name of username field ["username"].
-     * </p>
-     */
-    public static String USERNAME = "username";
-
-    /**
-     * <p>
-     * Name of password field ["password"].
-     * </p>
-     */
-    public static String PASSWORD = "password";
-
-    // ---- Public Methods ----
-
-    /**
-     * <p>
      * Use "username" and "password" fields from ActionForm to retrieve a User
      * object from the database. If credentials are not valid, or database
      * has disappeared, post error messages and forward to input.

Modified: struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/RegistrationAction.java
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/RegistrationAction.java?rev=355087&r1=355086&r2=355087&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/RegistrationAction.java (original)
+++ struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/RegistrationAction.java Thu Dec  8 05:35:15 2005
@@ -38,13 +38,6 @@
 
     /**
      * <p>
-     * Name of task field ["task"].
-     * </p>
-     */
-    public final static String TASK = "task";
-
-    /**
-     * <p>
      * Name of fromAddress field ["fromAddress"].
      * </p>
      */
@@ -59,14 +52,7 @@
 
     /**
      * <p>
-     * Name of password field ["password"].
-     * </p>
-     */
-    public final static String PASSWORD = "password";
-
-    /**
-     * <p>
-     * Name of password2 field ["password2"].
+     * Name of password confirmation field ["password2"].
      * </p>
      */
     public final static String PASSWORD2 = "password2";
@@ -77,13 +63,6 @@
      * </p>
      */
     public final static String REPLY_TO_ADDRESS = "replyToAddress";
-
-    /**
-     * <p>
-      * Name of username field ["username"].
-     * </p>
-      */
-     public final static String USERNAME = "username";
 
     // ---- Private Methods ----
 

Modified: struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/SubscriptionAction.java
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/SubscriptionAction.java?rev=355087&r1=355086&r2=355087&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/SubscriptionAction.java (original)
+++ struts/apps/trunk/mailreader/src/java/org/apache/struts/apps/mailreader/actions/SubscriptionAction.java Thu Dec  8 05:35:15 2005
@@ -20,16 +20,11 @@
  * and a Save method for updating or inserting a subscription.
  * </p>
  */
-public class SubscriptionAction extends BaseAction {
+public final class SubscriptionAction extends BaseAction {
 
     // --- Public Constants --
 
     /**
-     * Name of task field ["task"].
-     */
-    public final static String TASK = "task";
-
-    /**
      * Name of autoConnect field ["autoConnect"].
      */
     public final static String AUTO_CONNECT = "autoConnect";
@@ -40,19 +35,9 @@
     public final static String HOST = "host";
 
     /**
-     * Name of password field ["password"].
-     */
-    public final static String PASSWORD = "password";
-
-    /**
      * Name of type field ["type"].
      */
     public final static String TYPE = "type";
-
-    /**
-     * Name of username field ["username"].
-     */
-    public final static String USERNAME = "username";
 
     // ---- Private Methods ----
 

Modified: struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewcvs/struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml?rev=355087&r1=355086&r2=355087&view=diff
==============================================================================
--- struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml (original)
+++ struts/apps/trunk/mailreader/src/webapp/WEB-INF/struts-config.xml Thu Dec  8 05:35:15 2005
@@ -34,34 +34,34 @@
   <!-- ========== Form Bean Definitions =================================== -->
   <form-beans>
 
+   <!-- Base form bean (abstract) -->
+   <form-bean       name="BaseForm"
+                   type="org.apache.struts.validator.DynaValidatorForm">
+    <form-property name="username" type="java.lang.String"/>
+    <form-property name="password" type="java.lang.String"/>
+    <form-property name="task" type="java.lang.String" initial="Create"/>
+   </form-bean>
+
     <!-- Logon form bean -->
     <form-bean       name="LogonForm"
-                     type="org.apache.struts.validator.DynaValidatorForm">
-      <form-property name="username" type="java.lang.String"/>
-      <form-property name="password" type="java.lang.String"/>
+                     extends="BaseForm">
     </form-bean>
 
     <!-- RegistrationAction form bean -->
     <form-bean      name="RegistrationForm"
-                    type="org.apache.struts.validator.DynaValidatorForm">
-        <form-property name="task" type="java.lang.String" initial="Create"/>
+                    extends="BaseForm">
         <form-property name="fromAddress" type="java.lang.String"/>
         <form-property name="fullName" type="java.lang.String"/>
-        <form-property name="password" type="java.lang.String"/>
         <form-property name="password2" type="java.lang.String"/>
         <form-property name="replyToAddress" type="java.lang.String"/>
-        <form-property name="username" type="java.lang.String"/>
       </form-bean>
 
     <!-- Subscription form bean -->
     <form-bean      name="SubscriptionForm"
-                    type="org.apache.struts.validator.DynaValidatorForm">
-        <form-property name="task" type="java.lang.String" initial="Create"/>
+                    extends="BaseForm">
         <form-property name="autoConnect" type="java.lang.Boolean" initial="FALSE" reset="true"/>
         <form-property name="host" type="java.lang.String" />
-        <form-property name="password" type="java.lang.String" />
         <form-property name="type" type="java.lang.String" />
-        <form-property name="username" type="java.lang.String" />
     </form-bean>
 
     </form-beans>



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