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 2006/04/05 16:06:50 UTC

svn commit: r391621 - in /struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2: Constants.java MailreaderSupport.java

Author: husted
Date: Wed Apr  5 07:06:41 2006
New Revision: 391621

URL: http://svn.apache.org/viewcvs?rev=391621&view=rev
Log:
MailReader 
* Change "magic" logon to text ExpiredPasswordException 

Modified:
    struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java
    struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java

Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java?rev=391621&r1=391620&r2=391621&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Constants.java Wed Apr  5 07:06:41 2006
@@ -99,6 +99,20 @@
      */
     public static final String ERROR_DATABASE_MISSING = "error.database.missing";
 
+    /**
+     * <P>
+     * A "magic" username to trigger an ExpiredPasswordException for testing.
+     *</p>
+     */
+    public static final String EXPIRED_PASSWORD_EXCEPTION = "ExpiredPasswordException";
+
+    /**
+     * <p>
+     * Name of field to associate with authentification errors.
+     * <p>
+     */
+    public static final String PASSWORD_MISMATCH_FIELD = "password";
+
     // ---- Log Messages ----
 
     /**

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=391621&r1=391620&r2=391621&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 Wed Apr  5 07:06:41 2006
@@ -345,8 +345,8 @@
     public User findUser(String username, String password)
             throws ExpiredPasswordException {
         // FIXME: Stupid testing hack to compensate for inadequate DAO layer
-        if ("Hermes".equals(username)) {
-            throw new ExpiredPasswordException("Hermes");
+        if (Constants.EXPIRED_PASSWORD_EXCEPTION.equals(username)) {
+            throw new ExpiredPasswordException(Constants.EXPIRED_PASSWORD_EXCEPTION);
         }
 
         User user = getDatabase().findUser(username);
@@ -354,7 +354,8 @@
             user = null;
         }
         if (user == null) {
-            this.addFieldError("password", getText("error.password.mismatch"));
+            this.addFieldError(Constants.PASSWORD_MISMATCH_FIELD,
+                    getText("error.password.mismatch"));
         }
         return user;
     }



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