Author: husted
Date: Fri Apr 7 08:43:16 2006
New Revision: 392324
URL: http://svn.apache.org/viewcvs?rev=392324&view=rev
Log:
MailReader Course
* lab 3-1 - Localize validators
Modified:
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Login-validation.xml
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/MailReaderSupport.java
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register-validation.xml
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register.java
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties
Modified:
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Login-validation.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Login-validation.xml?rev=392324&r1=392323&r2=392324&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Login-validation.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Login-validation.xml
Fri Apr 7 08:43:16 2006
@@ -3,12 +3,12 @@
<validators>
<field name="username">
<field-validator type="requiredstring">
- <message>Username is required</message>
+ <message key="error.username.required"/>
</field-validator>
</field>
<field name="password">
<field-validator type="requiredstring">
- <message>Password is required</message>
+ <message key="error.password.required"/>
</field-validator>
</field>
</validators>
Modified:
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/MailReaderSupport.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/MailReaderSupport.java?rev=392324&r1=392323&r2=392324&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/MailReaderSupport.java
(original)
+++
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/MailReaderSupport.java
Fri Apr 7 08:43:16 2006
@@ -83,16 +83,16 @@
public static final String CANCEL = "cancel";
- // ---- Messages ----
+ // ---- Message Keys ----
public static final String ERROR_DATABASE_MISSING =
- "Database is missing";
+ "error.database.missing";
public static final String ERROR_USERNAME_UNIQUE =
- "That username is already in use - please select another";
+ "error.username.unique";
public static final String ERROR_PASSWORD_MISMATCH =
- "Invalid username and/or password, please try again";
+ "error.password.mismatch";
// ---- ApplicationAware ----
@@ -111,7 +111,7 @@
public UserDatabase getDatabase() {
Object db = getApplication().get(DATABASE_KEY);
if (db == null) {
- this.addActionError(ERROR_DATABASE_MISSING);
+ this.addActionError(getText(ERROR_DATABASE_MISSING));
}
return (UserDatabase) db;
}
@@ -191,7 +191,7 @@
User user = database.findUser(username);
if (user != null) {
- addActionError(ERROR_USERNAME_UNIQUE);
+ addActionError(getText(ERROR_USERNAME_UNIQUE));
return null;
}
Modified:
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register-validation.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register-validation.xml?rev=392324&r1=392323&r2=392324&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register-validation.xml
(original)
+++
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register-validation.xml
Fri Apr 7 08:43:16 2006
@@ -4,52 +4,52 @@
<field name="username">
<field-validator type="requiredstring">
- <message>Username is required</message>
+ <message key="error.username.required"/>
</field-validator>
</field>
<field name="fullName">
<field-validator type="requiredstring">
- <message>Full Name is required</message>
+ <message key="error.fullName.required"/>
</field-validator>
</field>
<field name="fromAddress">
<field-validator type="requiredstring">
- <message>From Address is required</message>
+ <message key="error.fromAddress.required"/>
</field-validator>
<field-validator type="email">
- <message>Invalid format for From Address</message>
+ <message key="error.fromAddress.format"/>
</field-validator>
</field>
<field name="replyToAddress">
<field-validator type="email">
- <message>Invalid format for Reply To Address</message>
+ <message key="error.replyToAddress.format"/>
</field-validator>
</field>
<field name="password">
<field-validator type="requiredstring">
- <message>Password is required</message>
+ <message key="error.password.required"/>
</field-validator>
<field-validator type="stringlength">
<param name="trim">true</param>
<param name="minLength">4</param>
<param name="maxLength">10</param>
- <message>Password length is not in the range 4 through
10.</message>
+ <message key="error.password.mismatch"/>
</field-validator>
</field>
<field name="password2">
<field-validator type="requiredstring">
- <message>Confirmation password is required</message>
+ <message key="error.password2.required"/>
</field-validator>
</field>
<validator type="expression">
<param name="expression">password eq password2</param>
- <message>Invalid username and/or password, please try again</message>
+ <message key="error.password.mismatch"/>
</validator>
</validators>
Modified:
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register.java
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register.java?rev=392324&r1=392323&r2=392324&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register.java
(original)
+++
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/Register.java
Fri Apr 7 08:43:16 2006
@@ -10,7 +10,7 @@
boolean haveUser = (user != null);
if (haveUser) {
- addActionError(ERROR_USERNAME_UNIQUE);
+ addActionError(getText(ERROR_USERNAME_UNIQUE));
return Action.INPUT;
}
Modified:
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties?rev=392324&r1=392323&r2=392324&view=diff
==============================================================================
---
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties
(original)
+++
struts/sandbox/trunk/mailreader-course/action2/lab-3-1/src/java/resources.properties
Fri Apr 7 08:43:16 2006
@@ -14,6 +14,9 @@
fromAddress=From Address
replyToAddress=Reply To Address
+button.cancel=Cancel
+button.save=Save
+
menu.title=MailReader - Main Menu
menu.heading=Menu Options for
menu.registration=Edit your registration profile
@@ -21,41 +24,41 @@
login.title=MailReader - Logon
+error.database.missing=User database is missing, cannot validate logon
credentials
+error.username.unique=That username is already in use - please select another
+error.password.mismatch=Invalid username and/or password, please try again
+
+error.username.required=Username is required
+error.fullName.required=Full Name is required
+error.fromAddress.required=From Address is required
+error.fromAddress.format=Invalid format for From Address
+error.replyToAddress.format=Invalid format for Reply To Address
+error.password.required=Password is required
+error.password2.required=Confirmation password is required
+error.password.match=Password and confirmation password must match
+
+error.host.required=Mail Server is required
+error.type.invalid=Server Type must be 'imap' or 'pop3'
+error.type.required=Server Type is required
# Future use
-button.cancel=Cancel
button.confirm=Confirm
button.doSubmit=DO_SUBMIT
button.doReset=DO_RESULT
button.doCancel=org.apache.struts.taglib.html.CANCEL
button.reset=Reset
-button.save=Save
change.message=Your password has expired. Please ask the system administrator
to change it.
change.try=Try Again
change.title=Password Has Expired
database.load=Cannot load database from {0}
-error.database.missing=User database is missing, cannot validate logon
credentials
-error.fromAddress.format=Invalid format for From Address
-error.fromAddress.required=From Address is required
-error.fullName.required=Full Name is required
-error.host.required=Mail Server is required
-error.noSubscription=No Subscription bean in user session
-error.password.expired=Your password has expired for username {0}
-error.password.required=Password is required
-error.password2.required=Confirmation password is required
-error.password.match=Password and confirmation password must match
-error.password.mismatch=Invalid username and/or password, please try again
-error.replyToAddress.format=Invalid format for Reply To Address
webwork.messages.invalid.token=Cannot submit this form out of order
-error.type.invalid=Server Type must be 'imap' or 'pop3'
-error.type.required=Server Type is required
-error.username.required=Username is required
-error.username.unique=That username is already in use - please select another
errors.footer=</ul><hr>
errors.header=<h3><font color="red">Validation Error</font></h3><p>You must
correct the following error(s) before proceeding:</p><ul>
errors.prefix=<li>
errors.suffix=</li>
errors.ioException=I/O exception rendering error messages: {0}
+error.noSubscription=No Subscription bean in user session
+error.password.expired=Your password has expired for username {0}
expired.password=User Password has expired for {0}
heading.autoConnect=Auto
heading.subscriptions=Current Subscriptions
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
