diff --git a/apps/mailreader/src/main/java/mailreader2/AppData.java b/apps/mailreader/src/main/java/mailreader2/AppData.java
index fde44477a..26ed3e63b 100644
--- a/apps/mailreader/src/main/java/mailreader2/AppData.java
+++ b/apps/mailreader/src/main/java/mailreader2/AppData.java
@@ -37,6 +37,7 @@ public class AppData {
 
     /**
      * <p>Adapt internal Integer value to external boolean value. </p>
+     *
      * @return False if host_auto==0, True otherwise
      */
     public boolean isHost_auto_checkbox() {
@@ -57,6 +58,7 @@ public class AppData {
     /**
      * <p>Return true if a logic or state test passed,
      * such as whether a record already exists.</p>
+     *
      * @return True if a business logic test passed.
      */
     public boolean isNominal() {
diff --git a/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java b/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
index c32fb71e0..c7a269cdc 100644
--- a/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
+++ b/apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
@@ -29,7 +29,7 @@ import java.io.*;
 
 /**
  * <p><code>ServletContextListener</code> that initializes and finalizes the
- * persistent storage of User and Subscription information for the Struts
+ * persistent storage of User and Support information for the Struts
  * Demonstration Application, using an in-memory database backed by an XML
  * file.</p>
  * <p/>
@@ -50,7 +50,7 @@ import java.io.*;
  * <li>Class to store protocol list (an array here). </li>
  * <p/>
  * </ul>
- * <p>
+ * <p/>
  * DEVELOPMENT NOTE - Another approach would be to instantiate the database via Spring.
  * </p>
  */
diff --git a/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java b/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
index 10cc36823..627c456bc 100644
--- a/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
+++ b/apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
@@ -1,16 +1,19 @@
 package mailreader2;
 
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.ActionInvocation;
 import com.opensymphony.xwork2.Action;
-import java.util.Map;
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.interceptor.Interceptor;
 import org.apache.struts.apps.mailreader.dao.User;
 
-public class AuthenticationInterceptor implements Interceptor  {
+import java.util.Map;
 
-    public void destroy () {}
+public class AuthenticationInterceptor implements Interceptor {
 
-    public void init() {}
+    public void destroy() {
+    }
+
+    public void init() {
+    }
 
     public String intercept(ActionInvocation actionInvocation) throws Exception {
 
@@ -18,12 +21,11 @@ public class AuthenticationInterceptor implements Interceptor  {
 
         User user = (User) session.get(Constants.USER_KEY);
 
-        boolean isAuthenticated = (null!=user) && (null!=user.getDatabase());
+        boolean isAuthenticated = (null != user) && (null != user.getDatabase());
 
         if (!isAuthenticated) {
-            return Action.LOGIN;            
-        }
-        else {
+            return Action.LOGIN;
+        } else {
             return actionInvocation.invoke();
         }
 
diff --git a/apps/mailreader/src/main/java/mailreader2/Constants.java b/apps/mailreader/src/main/java/mailreader2/Constants.java
index 5685e9617..44b64a46a 100644
--- a/apps/mailreader/src/main/java/mailreader2/Constants.java
+++ b/apps/mailreader/src/main/java/mailreader2/Constants.java
@@ -75,7 +75,7 @@ public final class Constants {
     public static final String PACKAGE = "org.apache.struts.apps.mailreader";
 
     /**
-     * <p> The session scope attribute under which the Subscription object
+     * <p> The session scope attribute under which the Support object
      * currently selected by our logged-in User is stored. </p>
      */
     public static final String SUBSCRIPTION_KEY = "subscription";
@@ -91,11 +91,10 @@ public final class Constants {
      */
     public static final String HOST = "host";
 
-    
     // ---- Error Messages ----
 
     /**
-     * <p>
+     * <p/>
      * A static message in case message resource is not loaded.
      * </p>
      */
@@ -103,31 +102,31 @@ public final class Constants {
             "ERROR:  Message resources not loaded -- check servlet container logs for error messages.";
 
     /**
-     * <p>
+     * <p/>
      * A static message in case database resource is not loaded.
-     * <p>
+     * <p/>
      */
     public static final String ERROR_DATABASE_NOT_LOADED =
             "ERROR:  User database not loaded -- check servlet container logs for error messages.";
 
     /**
-     * <p>
+     * <p/>
      * A standard key from the message resources file, to test if it is available.
-     * <p>
+     * <p/>
      */
     public static final String ERROR_DATABASE_MISSING = "error.database.missing";
 
     /**
-     * <P>
+     * <p/>
      * A "magic" username to trigger an ExpiredPasswordException for testing.
-     *</p>
+     * </p>
      */
     public static final String EXPIRED_PASSWORD_EXCEPTION = "ExpiredPasswordException";
 
     /**
-     * <p>
+     * <p/>
      * Name of field to associate with authentification errors.
-     * <p>
+     * <p/>
      */
     public static final String PASSWORD_MISMATCH_FIELD = "password";
 
diff --git a/apps/mailreader/src/main/java/mailreader2/Logoff.java b/apps/mailreader/src/main/java/mailreader2/Logoff.java
index 4cbafa55a..4d8839307 100644
--- a/apps/mailreader/src/main/java/mailreader2/Logoff.java
+++ b/apps/mailreader/src/main/java/mailreader2/Logoff.java
@@ -24,9 +24,7 @@ package mailreader2;
 public class Logoff extends MailreaderSupport {
 
     public String execute() {
-
         setUser(null);
-
         return SUCCESS;
     }
 }
diff --git a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
index 7b5837dd8..4382c83c1 100644
--- a/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
+++ b/apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
@@ -19,8 +19,6 @@
 package mailreader2;
 
 import com.opensymphony.util.BeanUtils;
-import org.apache.struts2.interceptor.ApplicationAware;
-import org.apache.struts2.interceptor.SessionAware;
 import com.opensymphony.xwork2.ActionSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,6 +28,8 @@ import org.apache.struts.apps.mailreader.dao.User;
 import org.apache.struts.apps.mailreader.dao.UserDatabase;
 import org.apache.struts.apps.mailreader.dao.impl.memory.MemorySubscription;
 import org.apache.struts.apps.mailreader.dao.impl.memory.MemoryUser;
+import org.apache.struts2.interceptor.ApplicationAware;
+import org.apache.struts2.interceptor.SessionAware;
 
 import java.util.Map;
 
@@ -54,13 +54,13 @@ public class MailreaderSupport extends ActionSupport
 
     /**
      * Return CANCEL so apropriate result can be selected.
+     *
      * @return "cancel" so apropriate result can be selected.
      */
     public String cancel() {
         return Constants.CANCEL;
     }
 
-
     // ---- ApplicationAware ----
 
     /**
@@ -140,7 +140,7 @@ public class MailreaderSupport extends ActionSupport
      * @param value The task to set.
      */
     public void setTask(String value) {
-        task =  value;
+        task = value;
     }
 
     // ---- Token property (utilized by UI) ----
@@ -166,18 +166,17 @@ public class MailreaderSupport extends ActionSupport
      * @param value The token to set.
      */
     public void setToken(String value) {
-        token =  value;
+        token = value;
     }
 
-
     // ---- Host property ----
 
     /**
-     * <p>Field to store Subscription host.</p>
+     * <p>Field to store Support host.</p>
      * <p/>
      * <p> The host is an immutable property of the Subscrtion DAP object, so
      * we need to store it locally until we are ready to create the
-     * Subscription. </p>
+     * Support. </p>
      */
     private String host;
 
@@ -191,7 +190,7 @@ public class MailreaderSupport extends ActionSupport
     }
 
     /**
-     * <p>Store new Subscription host.</p>
+     * <p>Store new Support host.</p>
      *
      * @param value
      */
@@ -401,7 +400,7 @@ public class MailreaderSupport extends ActionSupport
 
         try {
             user = database.findUser(username);
-         }
+        }
 
         catch (ExpiredPasswordException e) {
             user = getUser(); // Just so that it is not null
@@ -437,19 +436,19 @@ public class MailreaderSupport extends ActionSupport
         }
     }
 
-    // ---- Subscription property ----
+    // ---- Support property ----
 
     /**
-     * <p>Obtain the cached Subscription object, if any. </p>
+     * <p>Obtain the cached Support object, if any. </p>
      *
-     * @return Cached Subscription object or null
+     * @return Cached Support object or null
      */
     public Subscription getSubscription() {
         return (Subscription) getSession().get(Constants.SUBSCRIPTION_KEY);
     }
 
     /**
-     * <p>Store new User Subscription.</p>
+     * <p>Store new User Support.</p>
      *
      * @param subscription
      */
@@ -458,13 +457,13 @@ public class MailreaderSupport extends ActionSupport
     }
 
     /**
-     * <p> Obtain User Subscription object for the given host, or return null
+     * <p> Obtain User Support object for the given host, or return null
      * if not found. </p>
-     *
+     * <p/>
      * <p>It would be possible for this code to throw a NullPointerException,
      * but the ExceptionHandler in the xwork.xml will catch that for us.</p>
      *
-     * @return The matching Subscription or null
+     * @return The matching Support or null
      */
     public Subscription findSubscription(String host) {
         Subscription subscription;
@@ -473,19 +472,19 @@ public class MailreaderSupport extends ActionSupport
     }
 
     /**
-     * <p>Obtain uSER Subscription for the local Host property.</p>
+     * <p>Obtain uSER Support for the local Host property.</p>
      * <p/>
      * <p>Usually, the host property will be set from the client request,
      * because it was embedded in a link to the Subcription action.
      *
-     * @return Subscription or null if not found
+     * @return Support or null if not found
      */
     public Subscription findSubscription() {
         return findSubscription(getHost());
     }
 
     /**
-     * <p>Provide a "temporary" User Subscription object that can be used to
+     * <p>Provide a "temporary" User Support object that can be used to
      * capture input values.</p>
      */
     public void createInputSubscription() {
@@ -495,11 +494,11 @@ public class MailreaderSupport extends ActionSupport
     }
 
     /**
-     * <p>Provide new User Subscription object for the given host, or null if
+     * <p>Provide new User Support object for the given host, or null if
      * the host is not unique.</p>
      *
      * @param host
-     * @return New User Subscription object or null
+     * @return New User Support object or null
      */
     public Subscription createSubscription(String host) {
 
@@ -509,7 +508,7 @@ public class MailreaderSupport extends ActionSupport
 
         if (null != sub) {
             // FIXME - localization - "error.host.unique")
-            addFieldError(Constants.HOST,"That hostname is already defined");
+            addFieldError(Constants.HOST, "That hostname is already defined");
             return null;
         }
 
@@ -517,10 +516,10 @@ public class MailreaderSupport extends ActionSupport
     }
 
     /**
-     * <p>Create a new Subscription from the current Subscription object,
-     * making the new Subscription the current Subscription. </p>
+     * <p>Create a new Support from the current Support object,
+     * making the new Support the current Support. </p>
      * <p/>
-     * <p>Usually, the "current" Subscription is a temporary object being used
+     * <p>Usually, the "current" Support is a temporary object being used
      * to capture input values.</p>
      *
      * @param host
@@ -536,17 +535,17 @@ public class MailreaderSupport extends ActionSupport
     }
 
     /**
-     * <p>Delete the current Subscription object from the database.</p>
+     * <p>Delete the current Support object from the database.</p>
      */
-    public void removeSubscription()  {
+    public void removeSubscription() {
         getUser().removeSubscription(getSubscription());
         getSession().remove(Constants.SUBSCRIPTION_KEY);
     }
 
     /**
-     * <p>Provide MailServer Host for current User Subscription.</p>
+     * <p>Provide MailServer Host for current User Support.</p>
      *
-     * @return MailServer Host for current User Subscription
+     * @return MailServer Host for current User Support
      */
     public String getSubscriptionHost() {
         Subscription sub = getSubscription();
diff --git a/apps/mailreader/src/main/java/mailreader2/Registration.java b/apps/mailreader/src/main/java/mailreader2/Registration.java
deleted file mode 100644
index e6764eef2..000000000
--- a/apps/mailreader/src/main/java/mailreader2/Registration.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package mailreader2;
-
-import org.apache.struts.apps.mailreader.dao.User;
-
-
-/**
- * <p>Insert or update a User object to the persistent store. </p>
- */
-public class Registration extends MailreaderSupport {
-
-    /**
-     * <p>Double check that there is not a valid User logon. </p>
-     *
-     * @return True if there is not a valid User logon
-     */
-    private boolean isCreating() {
-        User user = getUser();
-        return (null == user) || (null == user.getDatabase());
-    }
-
-    /**
-     * <p> Retrieve User object to edit or null if User does not exist. </p>
-     *
-     * @return The "Success" result for this mapping
-     * @throws Exception on any error
-     */
-    public String input() throws Exception {
-
-        if (isCreating()) {
-            createInputUser();
-            setTask(Constants.CREATE);
-        } else {
-            setTask(Constants.EDIT);
-            setUsername(getUser().getUsername());
-            setPassword(getUser().getPassword());
-            setPassword2(getUser().getPassword());
-        }
-
-        return INPUT;
-    }
-
-    /**
-     * <p> Insert or update a User object to the persistent store. </p>
-     * <p/>
-     * <p> If a User is not logged in, then a new User is created and
-     * automatically logged in. Otherwise, the existing User is updated. </p>
-     *
-     * @return The "Success" result for this mapping
-     * @throws Exception on any error
-     */
-    public String execute()
-            throws Exception {
-
-        boolean creating = Constants.CREATE.equals(getTask());
-        creating = creating && isCreating(); // trust but verify
-
-        if (creating) {
-
-            User user = findUser(getUsername(), getPassword());
-            boolean haveUser = (user != null);
-
-            if (haveUser) {
-                addActionError(getText("error.username.unique"));
-                return INPUT;
-            }
-
-            copyUser(getUsername(), getPassword());
-
-        } else {
-
-            // FIXME: Any way to call the RegisrationSave validators from here?
-            String newPassword = getPassword();
-            if (newPassword != null) {
-                String confirmPassword = getPassword2();
-                boolean matches = ((null != confirmPassword)
-                        && (confirmPassword.equals(newPassword)));
-                if (matches) {
-                    getUser().setPassword(newPassword);
-                } else {
-                    addActionError(getText("error.password.match"));
-                    return INPUT;
-                }
-            }
-        }
-
-        saveUser();
-
-        return SUCCESS;
-    }
-
-}
diff --git a/apps/mailreader/src/main/java/mailreader2/RegistrationSave.java b/apps/mailreader/src/main/java/mailreader2/RegistrationSave.java
deleted file mode 100644
index 9692a915d..000000000
--- a/apps/mailreader/src/main/java/mailreader2/RegistrationSave.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package mailreader2;
-
-/**
- * <p>Stub class to allow extra validation on initial Save.</p>
- */
-public final class RegistrationSave extends Registration {
-
-}
diff --git a/apps/mailreader/src/main/java/mailreader2/Subscription.java b/apps/mailreader/src/main/java/mailreader2/Subscription.java
deleted file mode 100644
index e67da1bf1..000000000
--- a/apps/mailreader/src/main/java/mailreader2/Subscription.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package mailreader2;
-
-import com.opensymphony.xwork2.Preparable;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * <p> Provide an Edit method for retrieving an existing subscription, and a
- * Save method for updating or inserting a subscription. </p>
- */
-public class Subscription extends MailreaderSupport
-        implements Preparable {
-
-    /**
-     * <p>Field to store list of MailServer types</p>
-     */
-    private Map types = null;
-
-    /**
-     * <p>Provide the list of MailServer types.</p>
-     *
-     * @return List of MailServer types
-     */
-    public Map getTypes() {
-        return types;
-    }
-
-    /**
-     * <p>Setup the MailerServer types and set the local Host property from
-     * the User Subscription (if any). </p>
-     */
-    public void prepare() {
-
-        Map m = new LinkedHashMap();
-        m.put("imap", "IMAP Protocol");
-        m.put("pop3", "POP3 Protocol");
-        types = m;
-
-        setHost(getSubscriptionHost());
-
-    }
-
-    /**
-     * <p>Setup a temporary User Subscription object to capture input
-     * values.</p>
-     *
-     * @return INPUT
-     */
-    public String input() {
-        createInputSubscription();
-        setTask(Constants.CREATE);
-        return INPUT;
-    }
-
-    /**
-     * <p>Load User Subscription for the local Host property.</p>
-     * <p/>
-     * <p>Usually, the Host is being set from the request by a link to an Edit
-     * or Delete task.</p>
-     *
-     * @return INPUT or Error, if Subscription is not found
-     */
-    public String find() {
-
-        org.apache.struts.apps.mailreader.dao.Subscription
-                sub = findSubscription();
-
-        if (sub == null) {
-            return ERROR;
-        }
-
-        setSubscription(sub);
-
-        return INPUT;
-
-    }
-
-    /**
-     * <p>Prepare to present a confirmation page before removing
-     * Subscription.</p>
-     *
-     * @return INPUT or Error, if Subscription is not found
-     */
-    public String delete() {
-
-        setTask(Constants.DELETE);
-        return find();
-    }
-
-    /**
-     * <p>Prepare to edit User Subscription.</p>
-     *
-     * @return INPUT or Error, if Subscription is not found
-     */
-    public String edit() {
-
-        setTask(Constants.EDIT);
-        return find();
-    }
-
-    /**
-     * <p> Examine the Task property and DELETE, CREATE, or save the User
-     * Subscription, as appropriate. </p>
-     *
-     * @return SUCCESS
-     * @throws Exception on a database error
-     */
-    public String save() throws Exception {
-
-        if (Constants.DELETE.equals(getTask())) {
-            removeSubscription();
-        }
-
-        if (Constants.CREATE.equals(getTask())) {
-            copySubscription(getHost());
-        }
-
-        if (hasErrors()) return INPUT;
-        
-        saveUser();
-        return SUCCESS;
-    }
-
-}
diff --git a/apps/mailreader/src/main/java/mailreader2/SubscriptionSave.java b/apps/mailreader/src/main/java/mailreader2/SubscriptionSave.java
deleted file mode 100644
index 413cdf5ba..000000000
--- a/apps/mailreader/src/main/java/mailreader2/SubscriptionSave.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package mailreader2;
-
-/**
- * <p> Workaround class. Submitting to an alias doesn't seem to work. </p>
- */
-public final class SubscriptionSave extends Subscription {
-
-    public void prepare() {
-        super.prepare();
-            // checkbox workaround
-        getSubscription().setAutoConnect(false);
-    }
-
-    public String execute() throws Exception {
-        return save();
-    }
-
-
-
-}
diff --git a/apps/mailreader/src/main/java/mailreader2/Welcome-action.xml b/apps/mailreader/src/main/java/mailreader2/Welcome-action.xml
new file mode 100644
index 000000000..8577d073c
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/Welcome-action.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE struts PUBLIC
+        "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+        "http://struts.apache.org/dtds/struts-2.0.dtd">
+
+<struts>
+    <package name="Welcome" namespace="/" extends="MailreaderSupport">
+
+        <action name="Welcome" class="mailreader2.Welcome">
+            <result>/pages/Welcome.jsp</result>
+            <interceptor-ref name="guest"/>
+        </action>
+
+    </package>
+</struts>
diff --git a/apps/mailreader/src/main/java/mailreader2/Welcome.java b/apps/mailreader/src/main/java/mailreader2/Welcome.java
index 08ec12581..c7348bd21 100644
--- a/apps/mailreader/src/main/java/mailreader2/Welcome.java
+++ b/apps/mailreader/src/main/java/mailreader2/Welcome.java
@@ -14,14 +14,13 @@ public class Welcome extends MailreaderSupport {
         }
 
         // Confirm database loaded
-        if (null==getDatabase()) {
-             addActionError(Constants.ERROR_DATABASE_NOT_LOADED);
+        if (null == getDatabase()) {
+            addActionError(Constants.ERROR_DATABASE_NOT_LOADED);
         }
 
         if (hasErrors()) {
             return ERROR;
-        }
-        else {
+        } else {
             return SUCCESS;
         }
     }
diff --git a/apps/mailreader/src/main/resources/mailreader2/RegistrationSave-validation.xml b/apps/mailreader/src/main/java/mailreader2/registration/Create-validation.xml
similarity index 97%
rename from apps/mailreader/src/main/resources/mailreader2/RegistrationSave-validation.xml
rename to apps/mailreader/src/main/java/mailreader2/registration/Create-validation.xml
index 689640742..ccf277b4a 100644
--- a/apps/mailreader/src/main/resources/mailreader2/RegistrationSave-validation.xml
+++ b/apps/mailreader/src/main/java/mailreader2/registration/Create-validation.xml
@@ -1,28 +1,28 @@
-<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-
-<validators>
-
-    <field name="password">
-        <field-validator type="requiredstring">
-            <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 key="errors.range"/>
-        </field-validator>
-    </field>
-
-    <field name="password2">
-        <field-validator type="requiredstring">
-            <message key="error.password2.required"/>
-        </field-validator>
-    </field>
-
-    <validator type="expression">
-        <param name="expression">password eq password2</param>
-        <message key="error.password.match"/>
-    </validator>
-
-</validators>
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+
+    <field name="password">
+        <field-validator type="requiredstring">
+            <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 key="errors.range"/>
+        </field-validator>
+    </field>
+
+    <field name="password2">
+        <field-validator type="requiredstring">
+            <message key="error.password2.required"/>
+        </field-validator>
+    </field>
+
+    <validator type="expression">
+        <param name="expression">password eq password2</param>
+        <message key="error.password.match"/>
+    </validator>
+
+</validators>
diff --git a/apps/mailreader/src/main/java/mailreader2/registration/Create.java b/apps/mailreader/src/main/java/mailreader2/registration/Create.java
new file mode 100644
index 000000000..7e7bca129
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/registration/Create.java
@@ -0,0 +1,33 @@
+package mailreader2.registration;
+
+import mailreader2.Constants;
+import org.apache.struts.apps.mailreader.dao.User;
+
+/**
+ * <p>Insert new user, providing extra validation.</p>
+ * <p/>
+ * <p>(On an update, the password change is optional.)</p>
+ */
+public final class Create extends Update {
+
+    public String execute()
+            throws Exception {
+
+        // trust but verify
+        boolean creating = Constants.CREATE.equals(getTask());
+        creating = creating && isCreating();
+        if (!creating) return ERROR;
+
+        User user = findUser(getUsername(), getPassword());
+        boolean haveUser = (user != null);
+
+        if (haveUser) {
+            addActionError(getText("error.username.unique"));
+            return INPUT;
+        }
+
+        copyUser(getUsername(), getPassword());
+
+        return SUCCESS;
+    }
+}
diff --git a/apps/mailreader/src/main/java/mailreader2/registration/Input.java b/apps/mailreader/src/main/java/mailreader2/registration/Input.java
new file mode 100644
index 000000000..a034366cf
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/registration/Input.java
@@ -0,0 +1,31 @@
+package mailreader2.registration;
+
+import mailreader2.Constants;
+
+/**
+ * <p> Retrieve User object to edit or null if User does not exist. </p>
+ */
+public class Input extends Support {
+
+    /**
+     * <p> Retrieve User object to edit or null if User does not exist. </p>
+     *
+     * @return The "Success" result for this mapping
+     * @throws Exception on any error
+     */
+    public String execute() throws Exception {
+
+        if (isCreating()) {
+            createInputUser();
+            setTask(Constants.CREATE);
+        } else {
+            setTask(Constants.EDIT);
+            setUsername(getUser().getUsername());
+            setPassword(getUser().getPassword());
+            setPassword2(getUser().getPassword());
+        }
+
+        return SUCCESS;
+    }
+
+}
diff --git a/apps/mailreader/src/main/resources/mailreader2/Logon-validation.xml b/apps/mailreader/src/main/java/mailreader2/registration/Retrieve-validation.xml
similarity index 100%
rename from apps/mailreader/src/main/resources/mailreader2/Logon-validation.xml
rename to apps/mailreader/src/main/java/mailreader2/registration/Retrieve-validation.xml
diff --git a/apps/mailreader/src/main/java/mailreader2/Logon.java b/apps/mailreader/src/main/java/mailreader2/registration/Retrieve.java
similarity index 80%
rename from apps/mailreader/src/main/java/mailreader2/Logon.java
rename to apps/mailreader/src/main/java/mailreader2/registration/Retrieve.java
index 0c8fa735e..0fed8130c 100644
--- a/apps/mailreader/src/main/java/mailreader2/Logon.java
+++ b/apps/mailreader/src/main/java/mailreader2/registration/Retrieve.java
@@ -1,45 +1,46 @@
-/*
- * $Id: LogonAction.java 360442 2005-12-31 20:10:04Z husted $
- *
- * Copyright 2000-2004 Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package mailreader2;
-
-import org.apache.struts.apps.mailreader.dao.User;
-import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
-
-/**
- * <p> Validate a user logon. </p>
- */
-public final class Logon extends MailreaderSupport {
-
-    public String execute() throws ExpiredPasswordException  {
-
-        User user = findUser(getUsername(), getPassword());
-
-        if (user != null) {
-            setUser(user);
-        }
-
-        if (hasErrors()) {
-            return INPUT;
-        }
-
-       return SUCCESS;
-
-    }
-
-}
+/*
+ * $Id: LogonAction.java 360442 2005-12-31 20:10:04Z husted $
+ *
+ * Copyright 2000-2004 Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package mailreader2.registration;
+
+import mailreader2.MailreaderSupport;
+import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
+import org.apache.struts.apps.mailreader.dao.User;
+
+/**
+ * <p> Validate a user logon. </p>
+ */
+public final class Retrieve extends MailreaderSupport {
+
+    public String execute() throws ExpiredPasswordException {
+
+        User user = findUser(getUsername(), getPassword());
+
+        if (user != null) {
+            setUser(user);
+        }
+
+        if (hasErrors()) {
+            return INPUT;
+        }
+
+        return SUCCESS;
+
+    }
+
+}
diff --git a/apps/mailreader/src/main/java/mailreader2/registration/Support.java b/apps/mailreader/src/main/java/mailreader2/registration/Support.java
new file mode 100644
index 000000000..0316314e1
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/registration/Support.java
@@ -0,0 +1,20 @@
+package mailreader2.registration;
+
+import mailreader2.MailreaderSupport;
+import org.apache.struts.apps.mailreader.dao.User;
+
+/**
+ * <p>Base class to store shared methods.</p>
+ */
+public class Support extends MailreaderSupport {
+
+    /**
+     * <p>Double check that there is not a valid User logon. </p>
+     *
+     * @return True if there is not a valid User logon
+     */
+    protected boolean isCreating() {
+        User user = getUser();
+        return (null == user) || (null == user.getDatabase());
+    }
+}
diff --git a/apps/mailreader/src/main/resources/mailreader2/Registration-validation.xml b/apps/mailreader/src/main/java/mailreader2/registration/Update-validation.xml
similarity index 96%
rename from apps/mailreader/src/main/resources/mailreader2/Registration-validation.xml
rename to apps/mailreader/src/main/java/mailreader2/registration/Update-validation.xml
index 03cba1e78..44d66bc19 100644
--- a/apps/mailreader/src/main/resources/mailreader2/Registration-validation.xml
+++ b/apps/mailreader/src/main/java/mailreader2/registration/Update-validation.xml
@@ -1,32 +1,32 @@
-<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-
-<validators>
-
-    <field name="username">
-        <field-validator type="requiredstring">
-            <message key="error.username.required"/>
-        </field-validator>
-    </field>
-
-    <field name="user.fullName">
-        <field-validator type="requiredstring">
-            <message key="error.fullName.required"/>
-        </field-validator>
-    </field>
-
-    <field name="user.fromAddress">
-        <field-validator type="requiredstring">
-            <message key="error.fromAddress.required"/>
-        </field-validator>
-        <field-validator type="email">
-            <message key="errors.email"/>
-        </field-validator>
-    </field>
-
-    <field name="user.replyToAddress">
-        <field-validator type="email">
-            <message key="errors.email"/>
-        </field-validator>
-    </field>
-
-</validators>
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+
+    <field name="username">
+        <field-validator type="requiredstring">
+            <message key="error.username.required"/>
+        </field-validator>
+    </field>
+
+    <field name="user.fullName">
+        <field-validator type="requiredstring">
+            <message key="error.fullName.required"/>
+        </field-validator>
+    </field>
+
+    <field name="user.fromAddress">
+        <field-validator type="requiredstring">
+            <message key="error.fromAddress.required"/>
+        </field-validator>
+        <field-validator type="email">
+            <message key="errors.email"/>
+        </field-validator>
+    </field>
+
+    <field name="user.replyToAddress">
+        <field-validator type="email">
+            <message key="errors.email"/>
+        </field-validator>
+    </field>
+
+</validators>
diff --git a/apps/mailreader/src/main/java/mailreader2/registration/Update.java b/apps/mailreader/src/main/java/mailreader2/registration/Update.java
new file mode 100644
index 000000000..57d335aac
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/registration/Update.java
@@ -0,0 +1,41 @@
+package mailreader2.registration;
+
+import mailreader2.Constants;
+
+/**
+ * <p> Update a User object to the persistent store. </p>
+ */
+public class Update extends Support {
+
+    private String fixNull(String value) {
+        if (value == null) return null;
+        String buffer = value.trim();
+        if (buffer.length() == 0) return null;
+        return buffer;
+    }
+
+    public String execute()
+            throws Exception {
+
+        boolean creating = Constants.CREATE.equals(getTask());
+        creating = creating && isCreating(); // trust but verify
+        if (creating) return ERROR;
+        // FIXME: Any way to call the RegisrationSave validators from here?
+        String newPassword = fixNull(getPassword());
+        String confirmPassword = fixNull(getPassword2());
+        if (newPassword != null) {
+            boolean matches = ((confirmPassword != null)
+                    && (confirmPassword.equals(newPassword)));
+            if (matches) {
+                getUser().setPassword(newPassword);
+            } else {
+                addActionError(getText("error.password.match"));
+                return INPUT;
+            }
+        }
+
+        saveUser();
+
+        return SUCCESS;
+    }
+}
diff --git a/apps/mailreader/src/main/java/mailreader2/subscription/Delete.java b/apps/mailreader/src/main/java/mailreader2/subscription/Delete.java
new file mode 100644
index 000000000..893916f01
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/subscription/Delete.java
@@ -0,0 +1,15 @@
+package mailreader2.subscription;
+
+import mailreader2.Constants;
+
+/**
+ * <p>Prepare to present a confirmation page before removing
+ * subscription.</p>
+ */
+public class Delete extends Edit {
+
+    public String execute() throws Exception {
+        setTask(Constants.DELETE);
+        return find();
+    }
+}
diff --git a/apps/mailreader/src/main/resources/mailreader2/Subscription-validation.xml b/apps/mailreader/src/main/java/mailreader2/subscription/Edit-validation.xml
similarity index 96%
rename from apps/mailreader/src/main/resources/mailreader2/Subscription-validation.xml
rename to apps/mailreader/src/main/java/mailreader2/subscription/Edit-validation.xml
index bc422c8b9..df903c25b 100644
--- a/apps/mailreader/src/main/resources/mailreader2/Subscription-validation.xml
+++ b/apps/mailreader/src/main/java/mailreader2/subscription/Edit-validation.xml
@@ -1,11 +1,11 @@
-<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-
-<validators>
-
-    <field name="host">
-        <field-validator type="requiredstring">
-            <message key="error.host.required"/>
-        </field-validator>
-    </field>
-
-</validators>
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+
+    <field name="host">
+        <field-validator type="requiredstring">
+            <message key="error.host.required"/>
+        </field-validator>
+    </field>
+
+</validators>
diff --git a/apps/mailreader/src/main/java/mailreader2/subscription/Edit.java b/apps/mailreader/src/main/java/mailreader2/subscription/Edit.java
new file mode 100644
index 000000000..1baf3f976
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/subscription/Edit.java
@@ -0,0 +1,16 @@
+package mailreader2.subscription;
+
+import mailreader2.Constants;
+
+/**
+ * <p>Prepare to edit User Support.</p>
+ */
+public class Edit extends Support {
+
+    public String execute() throws Exception {
+        setTask(Constants.EDIT);
+        return find();
+    }
+
+
+}
diff --git a/apps/mailreader/src/main/java/mailreader2/subscription/Input.java b/apps/mailreader/src/main/java/mailreader2/subscription/Input.java
new file mode 100644
index 000000000..2053dd617
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/subscription/Input.java
@@ -0,0 +1,17 @@
+package mailreader2.subscription;
+
+import mailreader2.Constants;
+
+/**
+ * <p>Setup a temporary User Support object to capture input
+ * values.</p>
+ */
+public class Input extends Support {
+
+    public String execute() {
+        createInputSubscription();
+        setTask(Constants.CREATE);
+        return SUCCESS;
+    }
+
+}
diff --git a/apps/mailreader/src/main/resources/mailreader2/SubscriptionSave-validation.xml b/apps/mailreader/src/main/java/mailreader2/subscription/Save-validation.xml
similarity index 96%
rename from apps/mailreader/src/main/resources/mailreader2/SubscriptionSave-validation.xml
rename to apps/mailreader/src/main/java/mailreader2/subscription/Save-validation.xml
index 7d28623e3..9f2f6d793 100644
--- a/apps/mailreader/src/main/resources/mailreader2/SubscriptionSave-validation.xml
+++ b/apps/mailreader/src/main/java/mailreader2/subscription/Save-validation.xml
@@ -1,23 +1,23 @@
-<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-
-<validators>
-
-    <field name="subscription.username">
-        <field-validator type="requiredstring">
-            <message key="error.username.required"/>
-        </field-validator>
-    </field>
-
-    <field name="subscription.password">
-        <field-validator type="requiredstring">
-            <message key="error.password.required"/>
-        </field-validator>
-    </field>
-
-    <field name="subscription.type">
-        <field-validator type="requiredstring">
-            <message key="error.type.invalid"/>
-        </field-validator>
-    </field>
-
-</validators>
+<!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+
+<validators>
+
+    <field name="subscription.username">
+        <field-validator type="requiredstring">
+            <message key="error.username.required"/>
+        </field-validator>
+    </field>
+
+    <field name="subscription.password">
+        <field-validator type="requiredstring">
+            <message key="error.password.required"/>
+        </field-validator>
+    </field>
+
+    <field name="subscription.type">
+        <field-validator type="requiredstring">
+            <message key="error.type.invalid"/>
+        </field-validator>
+    </field>
+
+</validators>
diff --git a/apps/mailreader/src/main/java/mailreader2/subscription/Save.java b/apps/mailreader/src/main/java/mailreader2/subscription/Save.java
new file mode 100644
index 000000000..e24e53070
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/subscription/Save.java
@@ -0,0 +1,38 @@
+package mailreader2.subscription;
+
+import mailreader2.Constants;
+
+/**
+ * <p> Workaround class. Submitting to an alias doesn't seem to work. </p>
+ */
+public final class Save extends Edit {
+
+    public void prepare() {
+        super.prepare();
+        // checkbox workaround
+        getSubscription().setAutoConnect(false);
+    }
+
+    /**
+     * <p> Examine the Task property and DELETE, CREATE, or save the User
+     * Support, as appropriate. </p>
+     *
+     * @return SUCCESS
+     * @throws Exception on a database error
+     */
+    public String execute() throws Exception {
+
+        if (Constants.DELETE.equals(getTask())) {
+            removeSubscription();
+        }
+
+        if (Constants.CREATE.equals(getTask())) {
+            copySubscription(getHost());
+        }
+
+        if (hasErrors()) return INPUT;
+
+        saveUser();
+        return SUCCESS;
+    }
+}
diff --git a/apps/mailreader/src/main/java/mailreader2/subscription/Support.java b/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
new file mode 100644
index 000000000..ebdd5e901
--- /dev/null
+++ b/apps/mailreader/src/main/java/mailreader2/subscription/Support.java
@@ -0,0 +1,66 @@
+package mailreader2.subscription;
+
+import com.opensymphony.xwork2.Preparable;
+import mailreader2.MailreaderSupport;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * <p> Provide an Edit method for retrieving an existing subscription, and a
+ * Save method for updating or inserting a subscription. </p>
+ */
+public class Support extends MailreaderSupport
+        implements Preparable {
+
+    /**
+     * <p>Field to store list of MailServer types</p>
+     */
+    private Map types = null;
+
+    /**
+     * <p>Provide the list of MailServer types.</p>
+     *
+     * @return List of MailServer types
+     */
+    public Map getTypes() {
+        return types;
+    }
+
+    /**
+     * <p>Setup the MailerServer types and set the local Host property from
+     * the User Support (if any). </p>
+     */
+    public void prepare() {
+
+        Map m = new LinkedHashMap();
+        m.put("imap", "IMAP Protocol");
+        m.put("pop3", "POP3 Protocol");
+        types = m;
+
+        setHost(getSubscriptionHost());
+
+    }
+
+    /**
+     * <p>Load User Support for the local Host property.</p>
+     * <p/>
+     * <p>Usually, the Host is being set from the request by a link to an Edit
+     * or Delete task.</p>
+     *
+     * @return INPUT or Error, if Support is not found
+     */
+    public String find() {
+
+        org.apache.struts.apps.mailreader.dao.Subscription
+                sub = findSubscription();
+
+        if (sub == null) {
+            return ERROR;
+        }
+
+        setSubscription(sub);
+
+        return SUCCESS;
+    }
+}
diff --git a/apps/mailreader/src/main/resources/sql-map-config.xml b/apps/mailreader/src/main/resources/sql-map-config.xml
index 6ffeda2ab..394415187 100644
--- a/apps/mailreader/src/main/resources/sql-map-config.xml
+++ b/apps/mailreader/src/main/resources/sql-map-config.xml
@@ -1,25 +1,25 @@
 <!DOCTYPE sqlMapConfig PUBLIC
-          "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"
-          "http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
+        "-//ibatis.apache.org//DTD SQL Map Config 2.0//EN"
+        "http://ibatis.apache.org/dtd/sql-map-config-2.dtd">
 
 <sqlMapConfig>
 
-  <properties resource="sql/sql-map-config-hsql.properties"/>
+    <properties resource="sql/sql-map-config-hsql.properties"/>
 
-  <settings cacheModelsEnabled="true" enhancementEnabled="false"
-            maxSessions="64" maxTransactions="8" maxRequests="128"/>
+    <settings cacheModelsEnabled="true" enhancementEnabled="false"
+              maxSessions="64" maxTransactions="8" maxRequests="128"/>
 
-  <transactionManager type="JDBC">
-    <dataSource type="SIMPLE">
-      <property value="${driver}" name="JDBC.Driver"/>
-      <property value="${url}" name="JDBC.ConnectionURL"/>
-      <property value="${username}" name="JDBC.Username"/>
-      <property value="${password}" name="JDBC.Password"/>
-      <property value="15" name="Pool.MaximumActiveConnections"/>
-      <property value="15" name="Pool.MaximumIdleConnections"/>
-      <property value="1000" name="Pool.MaximumWait"/>
-    </dataSource>
-  </transactionManager>
+    <transactionManager type="JDBC">
+        <dataSource type="SIMPLE">
+            <property value="${driver}" name="JDBC.Driver"/>
+            <property value="${url}" name="JDBC.ConnectionURL"/>
+            <property value="${username}" name="JDBC.Username"/>
+            <property value="${password}" name="JDBC.Password"/>
+            <property value="15" name="Pool.MaximumActiveConnections"/>
+            <property value="15" name="Pool.MaximumIdleConnections"/>
+            <property value="1000" name="Pool.MaximumWait"/>
+        </dataSource>
+    </transactionManager>
 
-  <sqlMap resource="sql/sql-map.xml"/>
+    <sqlMap resource="sql/sql-map.xml"/>
 </sqlMapConfig>
\ No newline at end of file
diff --git a/apps/mailreader/src/main/resources/sql/sql-map.xml b/apps/mailreader/src/main/resources/sql/sql-map.xml
index 61b026e29..e6ea17ba9 100644
--- a/apps/mailreader/src/main/resources/sql/sql-map.xml
+++ b/apps/mailreader/src/main/resources/sql/sql-map.xml
@@ -1,10 +1,10 @@
 <!DOCTYPE sqlMap PUBLIC "-//ibatis.apache.org//DTD SQL Map 2.0//EN"
-                        "http://ibatis.apache.org/dtd/sql-map-2.dtd">
+        "http://ibatis.apache.org/dtd/sql-map-2.dtd">
 
 <sqlMap namespace="mailreader">
 
     <typeAlias alias="data"
-      type="mailreader2.AppData"/>
+               type="mailreader2.AppData"/>
 
     <select id="LOCALE_LIST" resultClass="data">
         SELECT pk_locale AS locale_key, locale_code
@@ -19,7 +19,7 @@
 
     <insert id="REGISTRATION_INSERT" parameterClass="data">
         INSERT INTO registration
-            (pk_registration, fk_locale, username, password, fullname, email_from, email_replyto)
+        (pk_registration, fk_locale, username, password, fullname, email_from, email_replyto)
         VALUES (#registration_key#, #locale_key#, #username#, #password#, #fullname#, #email_from#, #email_replyto#);
     </insert>
 
@@ -37,7 +37,7 @@
 
     <select id="REGISTRATION_EDIT" parameterClass="data" resultClass="data">
         SELECT pk_registration AS registration_key, fk_locale AS locale_key,
-            username, password, fullname, email_from, email_replyto
+        username, password, fullname, email_from, email_replyto
         FROM registration
         WHERE pk_registration=#registration_key#;
     </select>
@@ -45,7 +45,7 @@
     <update id="REGISTRATION_UPDATE" parameterClass="data">
         UPDATE registration
         SET fk_locale=#locale_key#, username=#username#, password=#password#, fullname=#fullname#,
-            email_from=#email_from#, email_replyto=#email_replyto#
+        email_from=#email_from#, email_replyto=#email_replyto#
         WHERE pk_registration=#registration_key#;
     </update>
 
@@ -53,36 +53,36 @@
         SELECT COUNT(*)
         FROM subscription
         WHERE fk_registration=#registration_key#
-            AND subscription_host=#subscription_host#;
+        AND subscription_host=#subscription_host#;
     </select>
 
     <insert id="SUBSCRIPTION_INSERT" parameterClass="data">
         INSERT INTO subscription
-            (pk_subscription, fk_registration, fk_protocol, subscription_host, host_user, host_pass, host_auto)
+        (pk_subscription, fk_registration, fk_protocol, subscription_host, host_user, host_pass, host_auto)
         VALUES (#subscription_key#, #registration_key#, #protocol_key#, #subscription_host#,
-            #host_user#, #host_pass#, #host_auto#);
+        #host_user#, #host_pass#, #host_auto#);
     </insert>
 
     <select id="SUBSCRIPTION_LIST" parameterClass="data" resultClass="data">
         SELECT pk_subscription AS subscription_key,
-            subscription_host, host_user, host_pass, host_auto, protocol_name
+        subscription_host, host_user, host_pass, host_auto, protocol_name
         FROM subscription
-            JOIN protocol ON pk_protocol=fk_protocol
+        JOIN protocol ON pk_protocol=fk_protocol
         WHERE fk_registration=#registration_key#;
     </select>
 
     <select id="SUBSCRIPTION_EDIT" parameterClass="data" resultClass="data">
         SELECT pk_subscription AS subscription_key, fk_protocol AS protocol_key,
-            subscription_host, host_user, host_pass, host_auto, protocol_name
+        subscription_host, host_user, host_pass, host_auto, protocol_name
         FROM subscription
-            JOIN protocol ON pk_protocol=fk_protocol
+        JOIN protocol ON pk_protocol=fk_protocol
         WHERE pk_subscription=#subscription_key#;
     </select>
 
     <update id="SUBSCRIPTION_UPDATE" parameterClass="data">
         UPDATE subscription
         SET fk_registration=#registration_key#, fk_protocol=#protocol_key#,
-            subscription_host=#subscription_host#, host_user=#host_user#, host_pass=#host_pass#, host_auto=#host_auto#
+        subscription_host=#subscription_host#, host_user=#host_user#, host_pass=#host_pass#, host_auto=#host_auto#
         WHERE pk_subscription=#subscription_key#;
     </update>
 
diff --git a/apps/mailreader/src/main/resources/struts.xml b/apps/mailreader/src/main/resources/struts.xml
index b2e772a51..2ab2a7bda 100644
--- a/apps/mailreader/src/main/resources/struts.xml
+++ b/apps/mailreader/src/main/resources/struts.xml
@@ -1,112 +1,169 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE struts PUBLIC
-    "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
-    "http://struts.apache.org/dtds/struts-2.0.dtd">
+        "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
+        "http://struts.apache.org/dtds/struts-2.0.dtd">
 
 <struts>
     <include file="struts-default.xml"/>
 
-    <package name="default" namespace="/" extends="struts-default">
+    <package name="default" namespace="" extends="struts-default">
 
         <interceptors>
 
             <interceptor name="authentication"
                          class="mailreader2.AuthenticationInterceptor"/>
 
-            <interceptor-stack name="user" >
-                <interceptor-ref name="authentication" />
+            <interceptor-stack name="user">
+                <interceptor-ref name="authentication"/>
                 <interceptor-ref name="defaultStack"/>
             </interceptor-stack>
 
-            <interceptor-stack name="user-submit" >
-                <interceptor-ref name="token-session" />
+            <interceptor-stack name="user-submit">
+                <interceptor-ref name="token-session"/>
                 <interceptor-ref name="user"/>
             </interceptor-stack>
 
-            <interceptor-stack name="guest" >
+            <interceptor-stack name="guest">
                 <interceptor-ref name="defaultStack"/>
             </interceptor-stack>
 
-            <interceptor-stack name="guest-submit" >
-                <interceptor-ref name="token-session" />
+            <interceptor-stack name="guest-submit">
+                <interceptor-ref name="token-session"/>
                 <interceptor-ref name="guest"/>
             </interceptor-stack>
 
         </interceptors>
 
         <default-interceptor-ref name="user"/>
-        
-        <default-action-ref name="Welcome"/>
+
+        <!-- default-action-ref name="Welcome"/ -->
 
         <global-results>
             <result name="error">/pages/Error.jsp</result>
             <result name="invalid.token">/pages/Error.jsp</result>
-            <result name="login" type="redirect-action">Logon!input</result>
+            <result name="login" type="redirect-action">Logon</result>
+            <result name="cancel" type="redirect-action">Welcome</result>
+            <result name="success" type="redirect-action">MainMenu</result>
+            <result name="expired" type="chain">ChangePassword</result>
         </global-results>
 
         <global-exception-mappings>
             <exception-mapping
                     result="error"
                     exception="java.lang.Throwable"/>
-        </global-exception-mappings>
-
-        <action name="Welcome" class="mailreader2.Welcome">
-            <result>/pages/Welcome.jsp</result>
-            <interceptor-ref name="guest"/>
-        </action>
-
-        <action name="Logon!*" class="mailreader2.Logon" method="{1}">
-            <result name="input">/pages/Logon.jsp</result>
-            <result name="cancel" type="redirect-action">Welcome</result>
-            <result type="redirect-action">MainMenu</result>
-            <result name="expired" type="chain">ChangePassword</result>
             <exception-mapping
                     exception="org.apache.struts.apps.mailreader.dao.ExpiredPasswordException"
                     result="expired"/>
-            <interceptor-ref name="guest"/>
+        </global-exception-mappings>
+
+        <!--
+        <action name="*" class="mailreader2.{1}">
+            <result name="input">/pages/{1}.jsp</result>
         </action>
 
+        <action name="*/*" class="mailreader2.{1}.{2}">
+            <result name="input">/pages/{1}.jsp</result>
+            <result type="redirect-action">MainMenu</result>
+        </action>
+
+        <action name="*/Create" class="mailreader2.{1}.Create">
+            <result name="input">/pages/{1}.jsp</result>
+            <result type="redirect-action">MainMenu</result>
+            <interceptor-ref name="user-submit" />
+        </action>
+
+        <action name="*/Update" class="mailreader2.{1}.Update">
+            <result name="input">/pages/{1}.jsp</result>
+            <result type="redirect-action">MainMenu</result>
+            <interceptor-ref name="user-submit" />
+        </action>
+
+        <action name="*/Save" class="mailreader2.{1}.Save">
+            <result name="input">/pages/{1}.jsp</result>
+            <result type="redirect-action">MainMenu</result>
+            <interceptor-ref name="user-submit" />
+        </action>
+
+        -->
+
         <action name="ChangePassword">
-            <result>/pages/ChangePassword.jsp</result>
-        </action>
-
-        <action name="MainMenu" class="mailreader2.MailreaderSupport">
-            <result>/pages/MainMenu.jsp</result>
-        </action>
-
-        <action name="Registration!*" class="mailreader2.Registration" method="{1}">
-            <result name="input">/pages/Registration.jsp</result>
-            <result type="redirect-action">MainMenu</result>
-            <interceptor-ref name="guest"/>
-        </action>
-
-        <!-- last match wins -->
-        <action name="Registration_save" class="mailreader2.RegistrationSave">
-            <result name="input">/pages/Registration.jsp</result>
-            <result type="redirect-action">MainMenu</result>
-            <interceptor-ref name="guest-submit" />
-        </action>
-
-        <action name="Subscription!*" class="mailreader2.Subscription" method="{1}">
-            <result name="input">/pages/Subscription.jsp</result>
-            <result type="redirect-action">Registration!input</result>
-        </action>
-
-        <!-- last match wins -->
-        <action name="Subscription_save" class="mailreader2.SubscriptionSave">
-            <result name="input">/pages/Subscription.jsp</result>
-            <result type="redirect-action">Registration!input</result>
-            <interceptor-ref name="user-submit" />
+            <result name="input">/pages/ChangePassword.jsp</result>
         </action>
 
         <action name="Logoff" class="mailreader2.Logoff">
             <result type="redirect-action">Welcome</result>
         </action>
 
+        <action name="Logon">
+            <result>/pages/Logon.jsp</result>
+            <interceptor-ref name="guest"/>
+        </action>
+
+        <action name="MainMenu" class="mailreader2.MailreaderSupport">
+            <result>/pages/MainMenu.jsp</result>
+        </action>
+
         <action name="Tour">
-            <result>/pages/tour.html</result>
+            <result>/pages/Tour.html</result>
+            <interceptor-ref name="guest"/>
+        </action>
+
+        <action name="Welcome" class="mailreader2.Welcome">
+            <result>/pages/Welcome.jsp</result>
             <interceptor-ref name="guest"/>
         </action>
 
     </package>
+
+    <package name="registration" namespace="/registration" extends="default">
+
+        <action name="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">
+            <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">
+            <result>/pages/registration.jsp</result>
+            <interceptor-ref name="guest"/>
+        </action>
+
+        <action name="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">
+            <result>/pages/subscription.jsp</result>
+        </action>
+
+        <action name="Edit" class="mailreader2.subscription.Edit">
+            <result>/pages/subscription.jsp</result>
+        </action>
+
+        <action name="Input" class="mailreader2.subscription.Input">
+            <result>/pages/subscription.jsp</result>
+        </action>
+
+        <action name="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>
+            </result>
+            <interceptor-ref name="user-submit"/>
+        </action>
+
+    </package>
+
 </struts>
diff --git a/apps/mailreader/src/main/webapp/WEB-INF/web.xml b/apps/mailreader/src/main/webapp/WEB-INF/web.xml
index 72571326a..758310ab4 100644
--- a/apps/mailreader/src/main/webapp/WEB-INF/web.xml
+++ b/apps/mailreader/src/main/webapp/WEB-INF/web.xml
@@ -33,7 +33,7 @@
             mailreader2.ApplicationListener
         </listener-class>
     </listener>
-       
+
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>
     </welcome-file-list>
diff --git a/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp b/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp
index 7d9861f49..d7bd5015c 100644
--- a/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp
+++ b/apps/mailreader/src/main/webapp/pages/ChangePassword.jsp
@@ -16,7 +16,7 @@
 </p>
 
 <p>
-    <a href="<s:url action="Logon!input"/>">
+    <a href="<s:url action="Logon"/>">
         <s:text name="change.try"/>
     </a>
 </p>
diff --git a/apps/mailreader/src/main/webapp/pages/Error.jsp b/apps/mailreader/src/main/webapp/pages/Error.jsp
index 1d955f417..fbdc687f8 100644
--- a/apps/mailreader/src/main/webapp/pages/Error.jsp
+++ b/apps/mailreader/src/main/webapp/pages/Error.jsp
@@ -20,7 +20,7 @@
 
 <h3>Error Message</h3>
 
-<s:actionerror />
+<s:actionerror/>
 
 <p>
     <s:property value="%{exception.message}"/>
diff --git a/apps/mailreader/src/main/webapp/pages/Logon.jsp b/apps/mailreader/src/main/webapp/pages/Logon.jsp
index dce7f972b..b3e9102bd 100644
--- a/apps/mailreader/src/main/webapp/pages/Logon.jsp
+++ b/apps/mailreader/src/main/webapp/pages/Logon.jsp
@@ -9,10 +9,10 @@
           type="text/css"/>
 </head>
 
-<body onLoad="self.focus();document.Logon.username.focus()">
+<body onLoad="self.focus();document.Retrieve.username.focus()">
 
-<s:actionerror />
-<s:form action="Logon!execute" validate="true">
+<s:actionerror/>
+<s:form action="Retrieve" namespace="/registration" validate="true">
     <s:textfield label="%{getText('username')}" name="username"/>
 
     <s:password label="%{getText('password')}" name="password" showPassword="true"/>
@@ -21,8 +21,8 @@
 
     <s:reset value="%{getText('button.reset')}"/>
 
-    <s:submit action="Logon!cancel" value="%{getText('button.cancel')}"
-                onclick="form.onsubmit=null"/>
+    <s:submit action="Welcome" value="%{getText('button.cancel')}"
+              onclick="form.onsubmit=null"/>
 </s:form>
 
 <jsp:include page="Footer.jsp"/>
diff --git a/apps/mailreader/src/main/webapp/pages/MainMenu.jsp b/apps/mailreader/src/main/webapp/pages/MainMenu.jsp
index 9b958ecca..df6d75cf2 100644
--- a/apps/mailreader/src/main/webapp/pages/MainMenu.jsp
+++ b/apps/mailreader/src/main/webapp/pages/MainMenu.jsp
@@ -13,13 +13,21 @@
 <h3><s:text name="mainMenu.heading"/> <s:property
         value="user.fullName"/></h3>
 <ul>
-    <li><a href="<s:url action="Registration!input" />">
-        <s:text name="mainMenu.registration"/>
-    </a>
+    <li>
+        <s:url id="Input" action="Input" namespace="/registration"/>
+        <s:a href="%{Input}">
+            <s:text name="mainMenu.registration"/>
+        </s:a>
+    </li>
+    <li>
+        <s:url id="Logoff" action="Logoff"/>
+        <s:a href="%{Logoff}">
+            <s:text name="mainMenu.logoff"/>
+        </s:a>
     </li>
-    <li><a href="<s:url action="Logoff"/>">
-        <s:text name="mainMenu.logoff"/>
-    </a>
 </ul>
+
+<jsp:include page="Footer.jsp"/>
+
 </body>
 </html>
diff --git a/apps/mailreader/src/main/webapp/pages/Registration.jsp b/apps/mailreader/src/main/webapp/pages/Registration.jsp
index 0889f3eff..9889114ca 100644
--- a/apps/mailreader/src/main/webapp/pages/Registration.jsp
+++ b/apps/mailreader/src/main/webapp/pages/Registration.jsp
@@ -14,10 +14,10 @@
           type="text/css"/>
 </head>
 
-<body onLoad="self.focus();document.Registration.username.focus()">
+<body onLoad="self.focus();document.Update.username.focus()">
 
 <s:actionerror/>
-<s:form action="Registration" validate="true">
+<s:form action="Update" validate="true">
     <s:token/>
     <s:hidden name="task"/>
     <s:if test="task == 'Create'">
@@ -33,29 +33,29 @@
     <s:password label="%{getText('password2')}" name="password2"/>
 
     <s:textfield label="%{getText('fullName')}"
-                   name="user.fullName"/>
+                 name="user.fullName"/>
 
     <s:textfield label="%{getText('fromAddress')}"
-                   name="user.fromAddress"/>
+                 name="user.fromAddress"/>
 
     <s:textfield label="%{getText('replyToAddress')}"
-                   name="user.replyToAddress"/>
+                 name="user.replyToAddress"/>
 
     <s:if test="task == 'Create'">
-        <s:submit value="%{getText('button.save')}" action="Registration_save"/>
+        <s:submit value="%{getText('button.save')}" action="Create"/>
 
         <s:reset value="%{getText('button.reset')}"/>
 
         <s:submit action="Welcome" value="%{getText('button.cancel')}"
-                    onclick="form.onsubmit=null"/>
+                  onclick="form.onsubmit=null"/>
     </s:if>
     <s:else>
         <s:submit value="%{getText('button.save')}"/>
 
         <s:reset value="%{getText('button.reset')}"/>
 
-        <s:submit action="MainMenu" value="%{getText('button.cancel')}"
-                    onclick="form.onsubmit=null"/>
+        <s:submit value="%{getText('button.cancel')}"
+                  action="MainMenu" onclick="form.onsubmit=null"/>
     </s:else>
 
 </s:form>
@@ -100,23 +100,27 @@
                     <s:property value="autoConnect"/>
                 </td>
                 <td align="center">
-
-                    <a href="<s:url action="Subscription!delete"><s:param name="host" value="host"/></s:url>">
+                    <s:url id="Delete" action="Delete" namespace="/subscription">
+                        <s:param name="host" value="host"/>
+                    </s:url>
+                    <s:a href="%{Delete}">
                         <s:text name="registration.deleteSubscription"/>
-                    </a>
+                    </s:a>
                     &nbsp;
-                    <a href="<s:url action="Subscription!edit"><s:param name="host" value="host"/></s:url>">
+                    <s:url id="Edit" action="Edit" namespace="/subscription">
+                        <s:param name="host" value="host"/>
+                    </s:url>
+                    <s:a href="%{Edit}">
                         <s:text name="registration.editSubscription"/>
-                    </a>
-
+                    </s:a>
                 </td>
             </tr>
         </s:iterator>
 
     </table>
 
-    <a href="<s:url action="Subscription!input"/>"><s:text
-            name="registration.addSubscription"/></a>
+    <s:url id="Input" action="Input" namespace="/subscription"/>
+    <s:a href="%{Input}"><s:text name="registration.addSubscription"/></s:a>
 
 </s:if>
 
diff --git a/apps/mailreader/src/main/webapp/pages/Subscription.jsp b/apps/mailreader/src/main/webapp/pages/Subscription.jsp
index cb48937a3..abf868304 100644
--- a/apps/mailreader/src/main/webapp/pages/Subscription.jsp
+++ b/apps/mailreader/src/main/webapp/pages/Subscription.jsp
@@ -17,10 +17,10 @@
           type="text/css"/>
 </head>
 
-<body onLoad="self.focus();document.Subscription_save.username.focus()">
+<body onLoad="self.focus();document.Save.username.focus()">
 
 <s:actionerror/>
-<s:form action="Subscription_save" validate="true">
+<s:form action="Save" validate="true">
     <s:token/>
     <s:hidden name="task"/>
     <s:label label="%{getText('username')}" name="user.username"/>
@@ -35,31 +35,31 @@
 
     <s:if test="task == 'Delete'">
         <s:label label="%{getText('mailUsername')}"
-                   name="subscription.username"/>
+                 name="subscription.username"/>
         <s:label label="%{getText('mailPassword')}"
-                   name="subscription.password"/>
+                 name="subscription.password"/>
         <s:label label="%{getText('mailServerType')}"
-                   name="subscription.type"/>
+                 name="subscription.type"/>
         <s:label label="%{getText('autoConnect')}"
-                   name="subscription.autoConnect"/>
+                 name="subscription.autoConnect"/>
         <s:submit value="%{getText('button.confirm')}"/>
     </s:if>
     <s:else>
         <s:textfield label="%{getText('mailUsername')}"
-                       name="subscription.username"/>
+                     name="subscription.username"/>
         <s:textfield label="%{getText('mailPassword')}"
-                       name="subscription.password"/>
+                     name="subscription.password"/>
         <s:select label="%{getText('mailServerType')}"
-                    name="subscription.type" list="types"/>
+                  name="subscription.type" list="types"/>
         <s:checkbox label="%{getText('autoConnect')}"
-                      name="subscription.autoConnect"/>
+                    name="subscription.autoConnect"/>
         <s:submit value="%{getText('button.save')}"/>
         <s:reset value="%{getText('button.reset')}"/>
     </s:else>
 
-    <s:submit action="Registration!input"
-                value="%{getText('button.cancel')}"
-                onclick="form.onsubmit=null"/>
+    <s:submit action="MainMenu"
+              value="%{getText('button.cancel')}"
+              onclick="form.onsubmit=null"/>
 </s:form>
 
 <jsp:include page="Footer.jsp"/>
diff --git a/apps/mailreader/src/main/webapp/pages/Welcome.jsp b/apps/mailreader/src/main/webapp/pages/Welcome.jsp
index 7389acda1..85e25cac2 100644
--- a/apps/mailreader/src/main/webapp/pages/Welcome.jsp
+++ b/apps/mailreader/src/main/webapp/pages/Welcome.jsp
@@ -14,10 +14,14 @@
 <h3><s:text name="index.heading"/></h3>
 
 <ul>
-    <li><a href="<s:url action="Registration!input"/>"><s:text
-            name="index.registration"/></a></li>
-    <li><a href="<s:url action="Logon!input"/>"><s:text
-            name="index.logon"/></a></li>
+    <li>
+        <s:url id="Input" action="Input" namespace="/registration"/>
+        <s:a href="%{Input}"><s:text name="index.registration"/></s:a>
+    </li>
+    <li>
+        <s:url id="Logon" action="Logon"/>
+        <s:a href="%{Logon}"><s:text name="index.logon"/></s:a>
+    </li>
 </ul>
 
 <h3>Language Options</h3>
@@ -29,25 +33,31 @@
         <s:a href="%{en}">English</s:a>
     </li>
     <li>
-        <a href="<s:url action="Welcome">
+        <s:url id="ja" action="Welcome">
             <s:param name="request_locale">ja</s:param>
-        </s:url>">Japanese</a>
-   </li>
+        </s:url>
+        <s:a href="%{ja}">Japanese</s:a>
+    </li>
     <li>
-        <a href="<s:url value="Welcome.do">
-            <s:param name="request_locale" value="'ru'" />
-            </s:url>">Russian</a>
+        <s:url id="ru" action="Welcome">
+            <s:param name="request_locale">ru</s:param>
+        </s:url>
+        <s:a href="%{ru}">Russian</s:a>
     </li>
 </ul>
 
 <hr/>
 
-<p><s:i18n name="alternate">
-    <img src="<s:text name="struts.logo.path"/>"
-         alt="<s:text name="struts.logo.alt"/>"/>
-</s:i18n></p>
+<p>
+    <s:i18n name="alternate">
+        <img src="<s:text name="struts.logo.path"/>"
+             alt="<s:text name="struts.logo.alt"/>"/>
+    </s:i18n>
+</p>
 
-<p><a href="<s:url action="Tour" />"><s:text name="index.tour"/></a></p>
+<p>
+    <s:url id="Tour" action="Tour"/><s:a href="%{Tour}"><s:text name="index.tour"/></s:a>
+</p>
 
 </body>
 </html>
diff --git a/apps/mailreader/src/main/webapp/pages/tour.html b/apps/mailreader/src/main/webapp/pages/tour.html
index c27e9e85b..a6ceb4682 100644
--- a/apps/mailreader/src/main/webapp/pages/tour.html
+++ b/apps/mailreader/src/main/webapp/pages/tour.html
@@ -15,12 +15,12 @@
 
 <p>
     <i>
-        This article is meant to introduce a new user to Apache Struts 2 by 
+        This article is meant to introduce a new user to Apache Struts 2 by
         "walking through" a simple, but functional, application.
-        The article includes code snippets, but for the best result, you might 
-        want to install the MailReader application on your own development 
+        The article includes code snippets, but for the best result, you might
+        want to install the MailReader application on your own development
         workstation and follow along.
-        Of course, the full source code to the MailReader is included in the 
+        Of course, the full source code to the MailReader is included in the
         distribution.
     </i>
 
@@ -29,7 +29,7 @@
 <p>
     <i>
         The tour assumes the reader has a basic understanding of the Java
-        language, JavaBeans, web applications, and JavaServer Pages. For 
+        language, JavaBeans, web applications, and JavaServer Pages. For
         background on these technologies, see the
         <a href="http://struts.apache.org/primer.html">
             Key Technologies Primer</a>.
@@ -179,42 +179,42 @@
 <hr/>
 <h5>web.xml - The Web Application Deployment Descriptor</h5>
 <pre><code>&lt;?xml version="1.0" encoding="ISO-8859-1"?>
-&lt;!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-  "http://java.sun.com/dtd/web-app_2_3.dtd">
-&lt;web-app>
+    &lt;!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+    &lt;web-app>
 
-  &lt;display-name>Struts 2 MailReader&lt;/display-name>
+    &lt;display-name>Struts 2 MailReader&lt;/display-name>
 
-  <strong>&lt;filter>
-    &lt;filter-name>struts2&lt;/filter-name>
-    &lt;filter-class>
-      org.apache.struts2.dispatcher.FilterDispatcher
-    &lt;/filter-class>
-   &lt;/filter></strong>
+    <strong>&lt;filter>
+        &lt;filter-name>struts2&lt;/filter-name>
+        &lt;filter-class>
+        org.apache.struts2.dispatcher.FilterDispatcher
+        &lt;/filter-class>
+        &lt;/filter></strong>
 
-  &lt;filter-mapping>
+    &lt;filter-mapping>
     &lt;filter-name><strong>struts2</strong>&lt;/filter-name>
     &lt;url-pattern>/*&lt;/url-pattern>
-  &lt;/filter-mapping>
+    &lt;/filter-mapping>
 
-  &lt;listener>
+    &lt;listener>
     &lt;listener-class>
-      org.springframework.web.context.ContextLoaderListener
+    org.springframework.web.context.ContextLoaderListener
     &lt;/listener-class>
-  &lt;/listener>
+    &lt;/listener>
 
-  &lt;!-- Application Listener for MailReader database -->
-  &lt;listener>
+    &lt;!-- Application Listener for MailReader database -->
+    &lt;listener>
     &lt;listener-class>
-      mailreader2.ApplicationListener
+    mailreader2.ApplicationListener
     &lt;/listener-class>
-  &lt;/listener>
+    &lt;/listener>
 
-  &lt;welcome-file-list>
+    &lt;welcome-file-list>
     &lt;welcome-file>index.html&lt;/welcome-file>
-  &lt;/welcome-file-list>
+    &lt;/welcome-file-list>
 
-  &lt;/web-app></code></pre>
+    &lt;/web-app></code></pre>
 <hr/>
 
 <p>
@@ -246,10 +246,10 @@
 <p>
     The actions are listed in one or more XML configuration files,
     the default configuration file being named "struts.xml".
-    When the application loads, the struts.xml, and any other files 
-    it includes, are parsed, and the framework creates a set of 
-    configuration objects. 
-    Among other things, the configuration maps a request for a certain 
+    When the application loads, the struts.xml, and any other files
+    it includes, are parsed, and the framework creates a set of
+    configuration objects.
+    Among other things, the configuration maps a request for a certain
     page to a certain action mapping.
 </p>
 
@@ -271,12 +271,12 @@
 <hr/>
 <h5>MailReader's index.html</h5>
 <pre><code>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-&lt;html>&lt;head>
-  &lt;META HTTP-EQUIV="Refresh" CONTENT="0;<strong>URL=Welcome.do</strong>">
-  &lt;/head>
-  &lt;body>
+    &lt;html>&lt;head>
+    &lt;META HTTP-EQUIV="Refresh" CONTENT="0;<strong>URL=Welcome.do</strong>">
+    &lt;/head>
+    &lt;body>
     &lt;p>Loading ...&lt;/p>
-&lt;/body>&lt;/html></code></pre>
+    &lt;/body>&lt;/html></code></pre>
 <hr/>
 
 <p>
@@ -290,7 +290,7 @@
 <p>
     When the client requests "Welcome.do", the request is passed to the "struts2" FilterDispatcher
     (that we registered in the web.xml file).
-    The FilterDispatcher retrieves the appropriate action mapping from the 
+    The FilterDispatcher retrieves the appropriate action mapping from the
     configuration.
     If we just wanted to forward to the Welcome page, we could use a simple
     configuration element.
@@ -298,8 +298,8 @@
 <hr/>
 <h5>A simple "forward thru" action element</h5>
 <pre><code>&lt;action name="<strong>Welcome</strong>">
-  &lt;result><strong>/pages/Welcome.jsp</strong>&lt;/result>
-&lt;/action></code></pre>
+    &lt;result><strong>/pages/Welcome.jsp</strong>&lt;/result>
+    &lt;/action></code></pre>
 <hr/>
 
 <p>
@@ -356,8 +356,8 @@
 <blockquote>
     <p>
         The Struts configuration lets us separate concerns and "say it once".
-        The configuration helps us "normalize" an application, 
-        in much the same way we normalize a database schema. 
+        The configuration helps us "normalize" an application,
+        in much the same way we normalize a database schema.
     </p>
 </blockquote>
 <hr/>
@@ -392,33 +392,33 @@
 <hr/>
 <h5>The Welcome Action class</h5>
 <pre><code>package mailreader2;
-public class Welcome extends MailreaderSupport {
+    public class Welcome extends MailreaderSupport {
 
-  public String execute() {
+    public String execute() {
 
     // Confirm message resources loaded
     String message = getText(Constants.ERROR_DATABASE_MISSING);
     if (Constants.ERROR_DATABASE_MISSING.equals(message)) {
-      <strong>addActionError(Constants.ERROR_MESSAGES_NOT_LOADED);</strong>
+    <strong>addActionError(Constants.ERROR_MESSAGES_NOT_LOADED);</strong>
     }
 
     // Confirm database loaded
     if (null==getDatabase()) {
-      <strong>addActionError(Constants.ERROR_DATABASE_NOT_LOADED);</strong>
+    <strong>addActionError(Constants.ERROR_DATABASE_NOT_LOADED);</strong>
     }
 
     if (hasErrors()) {
-      <strong>return ERROR;</strong>
+    <strong>return ERROR;</strong>
     }
     else {
-      <strong>return SUCCESS;</strong>
+    <strong>return SUCCESS;</strong>
     }
-  }
-}</code></pre>
+    }
+    }</code></pre>
 <hr/>
 
 <p>
-    Several common result names are predefined, 
+    Several common result names are predefined,
     including ERROR, SUCCESS, LOGIN, NONE, and INPUT,
     so that these tokens can be used consistently across Struts 2 applications.
 </p>
@@ -437,10 +437,10 @@ public class Welcome extends MailreaderSupport {
 <hr/>
 <h5>MailReader's global-result element</h5>
 <pre><code> &lt;global-results>
-  &lt;result name=<strong>"error"</strong>><strong>/pages/Error.jsp</strong>&lt;/result>
-  &lt;result name="invalid.token">/pages/Error.jsp&lt;/result>
-  &lt;result name="login" type="redirect-action">Logon!input&lt;/result>
-&lt;/global-results></code></pre>
+    &lt;result name=<strong>"error"</strong>><strong>/pages/Error.jsp</strong>&lt;/result>
+    &lt;result name="invalid.token">/pages/Error.jsp&lt;/result>
+    &lt;result name="login" type="redirect-action">Logon!input&lt;/result>
+    &lt;/global-results></code></pre>
 <hr/>
 
 <p>
@@ -466,10 +466,10 @@ public class Welcome extends MailreaderSupport {
 <hr/>
 <h5>mailreader2.ApplicationListener</h5>
 <pre><code> &lt;listener>
-  &lt;listener-class>
+    &lt;listener-class>
     <strong>mailreader2.ApplicationListener</strong>
-  &lt;/listener-class>
-&lt;/listener></code></pre>
+    &lt;/listener-class>
+    &lt;/listener></code></pre>
 <hr/>
 
 <p>
@@ -492,14 +492,14 @@ public class Welcome extends MailreaderSupport {
 <hr/>
 <h5>The "seed" user element from the MailReader database.xml</h5>
 <pre><code>&lt;user username="<strong>user</strong>" fromAddress="John.User@somewhere.com"
-  fullName="<strong>John Q. User</strong>" password="<strong>pass</strong>">
+    fullName="<strong>John Q. User</strong>" password="<strong>pass</strong>">
     &lt;subscription host="<strong>mail.hotmail.com"</strong> autoConnect="false"
-      password="bar" type="pop3" username="user1234">
+    password="bar" type="pop3" username="user1234">
     &lt;/subscription>
     &lt;subscription host="<strong>mail.yahoo.com</strong>" autoConnect="false" password="foo"
-      type="imap" username="jquser">
+    type="imap" username="jquser">
     &lt;/subscription>
-&lt;/user></code></pre>
+    &lt;/user></code></pre>
 <hr/>
 
 <p>
@@ -521,7 +521,7 @@ public class Welcome extends MailreaderSupport {
 <hr/>
 <h5>struts.properties</h5>
 <pre><code>struts.custom.i18n.resources = <strong>resources</strong>
-struts.action.extension = <strong>do</strong></code></pre>
+    struts.action.extension = <strong>do</strong></code></pre>
 <hr/>
 
 <p>
@@ -530,23 +530,23 @@ struts.action.extension = <strong>do</strong></code></pre>
     for a Resource Bundle named "resources.properties".
     The bundle might be embedded in a JAR, or found in the "WEB-INF/classes"
     folder, or anywhere else on the runtime classpath.
-    In the MailReader, we keep the <strong>original</strong> bundle in the 
-    source tree under "src/main/". When the application is built, the 
-    properties files are  <strong>copied</strong> to "WEB-INF/classes", so 
+    In the MailReader, we keep the <strong>original</strong> bundle in the
+    source tree under "src/main/". When the application is built, the
+    properties files are <strong>copied</strong> to "WEB-INF/classes", so
     that they are on the Java classpath.
 </p>
 
 <hr/>
 <h5>Message Resource entries used by the Welcome page</h5>
 <pre><code><strong>index.heading=</strong>MailReader Application Options
-<strong>index.logon=</strong>Log on to the MailReader Application
-<strong>index.registration=</strong>Register with the MailReader Application
-<strong>index.title=</strong>MailReader Demonstration Application
-<strong>index.tour=</strong>A Walking Tour of the MailReader Demonstration Application</code></pre>
+    <strong>index.logon=</strong>Log on to the MailReader Application
+    <strong>index.registration=</strong>Register with the MailReader Application
+    <strong>index.title=</strong>MailReader Demonstration Application
+    <strong>index.tour=</strong>A Walking Tour of the MailReader Demonstration Application</code></pre>
 <hr/>
 
 <p>
-    If you change a message in the resource, and then rebuild and reload the 
+    If you change a message in the resource, and then rebuild and reload the
     application, the change will appear throughout the application.
     If you provide message resources for additional locales, you can
     localize your application.
@@ -562,45 +562,45 @@ struts.action.extension = <strong>do</strong></code></pre>
 <hr/>
 <h5>Welcome.jsp</h5>
 <pre><code>&lt;%@ page contentType="text/html; charset=UTF-8" %>
-<strong>&lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags" %></strong>
-  &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    <strong>&lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags" %></strong>
+    &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
     &lt;head>
-      &lt;meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-      &lt;title><strong>&lt;s:text name="index.title"/></strong>&lt;/title>
-      &lt;link href="<strong>&lt;s:url value="/css/mailreader.css"/></strong>" rel="stylesheet"
-      type="text/css"/>
+    &lt;meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    &lt;title><strong>&lt;s:text name="index.title"/></strong>&lt;/title>
+    &lt;link href="<strong>&lt;s:url value="/css/mailreader.css"/></strong>" rel="stylesheet"
+    type="text/css"/>
     &lt;/head>
 
     &lt;body>
-      &lt;h3>&lt;s:text name="index.heading"/>&lt;/h3>
+    &lt;h3>&lt;s:text name="index.heading"/>&lt;/h3>
 
-      &lt;ul>
-        &lt;li>&lt;a href="&lt;s:url action="Registration!input"/>">&lt;s:text
-          name="index.registration"/>&lt;/a>&lt;/li>
-        &lt;li>&lt;a href="&lt;s:url action="Logon!input"/>">&lt;s:text
-          name="index.logon"/>&lt;/a>&lt;/li>
-      &lt;/ul>
+    &lt;ul>
+    &lt;li>&lt;a href="&lt;s:url action="Registration!input"/>">&lt;s:text
+    name="index.registration"/>&lt;/a>&lt;/li>
+    &lt;li>&lt;a href="&lt;s:url action="Logon!input"/>">&lt;s:text
+    name="index.logon"/>&lt;/a>&lt;/li>
+    &lt;/ul>
 
-      &lt;h3>Language Options&lt;/h3>
-      &lt;ul>
-        &lt;li>&lt;a href="&lt;s:url action="Welcome?request_locale=en"/>">English&lt;/a>&lt;/li>
-        &lt;li>&lt;a href="&lt;s:url action="Welcome?request_locale=ja"/>">Japanese&lt;/a>&lt;/li>
-        &lt;li>&lt;a href="&lt;s:url action="Welcome?request_locale=ru"/>">Russian&lt;/a>&lt;/li>
-      &lt;/ul>
+    &lt;h3>Language Options&lt;/h3>
+    &lt;ul>
+    &lt;li>&lt;a href="&lt;s:url action="Welcome?request_locale=en"/>">English&lt;/a>&lt;/li>
+    &lt;li>&lt;a href="&lt;s:url action="Welcome?request_locale=ja"/>">Japanese&lt;/a>&lt;/li>
+    &lt;li>&lt;a href="&lt;s:url action="Welcome?request_locale=ru"/>">Russian&lt;/a>&lt;/li>
+    &lt;/ul>
 
     &lt;hr />
 
     &lt;p><strong>&lt;s:i18n name="alternate"></strong>
     &lt;img src="&lt;s:text name="struts.logo.path"/>"
-      alt="&lt;s:text name="struts.logo.alt"/>"/>
+    alt="&lt;s:text name="struts.logo.alt"/>"/>
     <strong>&lt;/s:i18n></strong>&lt;/p>
 
     &lt;p>&lt;a href="&lt;s:url action="Tour" />">&lt;s:text name="index.tour"/>&lt;/a>&lt;/p>
 
-  &lt;/body>
-&lt;/html></code></pre>
+    &lt;/body>
+    &lt;/html></code></pre>
 <hr/>
 
 <p>
@@ -707,28 +707,28 @@ struts.action.extension = <strong>do</strong></code></pre>
 <hr/>
 <h5>Login.jsp</h5>
 <pre><code>&lt;%@ page contentType="text/html; charset=UTF-8" %>
-  &lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags"  %>
-  &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    &lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags" %>
+    &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  &lt;head>
+    &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    &lt;head>
     &lt;title>&lt;s:text name="logon.title"/>&lt;/title>
-      &lt;link href="&lt;s:url value="/css/mailreader.css"/>" rel="stylesheet"
-        type="text/css"/>
-  &lt;/head>
-  &lt;body onLoad="self.focus();document.Logon.username.focus()">
+    &lt;link href="&lt;s:url value="/css/mailreader.css"/>" rel="stylesheet"
+    type="text/css"/>
+    &lt;/head>
+    &lt;body onLoad="self.focus();document.Logon.username.focus()">
     <strong>&lt;s:actionerror/></strong>
     <strong>&lt;s:form method="POST" validate="true"></strong>
-      <strong>&lt;s:textfield label="%{getText('username')}" name="username"/></strong>
-      <strong>&lt;s:password label="%{getText('password')}" name="password"/></strong>
-      <strong>&lt;s:submit value="%{getText('button.save')}"/></strong>
-      <strong>&lt;s:reset value="%{getText('button.reset')}"/></strong>
-      &lt;s:submit <strong>action="Logon!cancel" onclick="form.onsubmit=null"</strong>
-        value="%{getText('button.cancel')}"/>
+    <strong>&lt;s:textfield label="%{getText('username')}" name="username"/></strong>
+    <strong>&lt;s:password label="%{getText('password')}" name="password"/></strong>
+    <strong>&lt;s:submit value="%{getText('button.save')}"/></strong>
+    <strong>&lt;s:reset value="%{getText('button.reset')}"/></strong>
+    &lt;s:submit <strong>action="Logon!cancel" onclick="form.onsubmit=null"</strong>
+    value="%{getText('button.cancel')}"/>
     &lt;/s:form>
     &lt;jsp:include page="Footer.jsp"/>
-  &lt;/body>
-&lt;/html></code></pre>
+    &lt;/body>
+    &lt;/html></code></pre>
 <hr/>
 
 <p>
@@ -795,13 +795,13 @@ struts.action.extension = <strong>do</strong></code></pre>
 
 <hr/>
 <pre><code>&lt;tr>
-  &lt;td class="tdLabel">
+    &lt;td class="tdLabel">
     &lt;label for="Logon_username" class="label">Username:&lt;/label>
-  &lt;/td>
-  &lt;td>
+    &lt;/td>
+    &lt;td>
     &lt;input type="text" name="username" value="" id="Logon_username"/>
-  &lt;/td>
-&lt;/tr></code></pre>
+    &lt;/td>
+    &lt;/tr></code></pre>
 <hr/>
 
 <p>
@@ -814,12 +814,12 @@ struts.action.extension = <strong>do</strong></code></pre>
 
 <hr/>
 <pre><code>&lt;#if (actionErrors?exists && actionErrors?size > 0)>
-  &lt;ul>
+    &lt;ul>
     &lt;#list actionErrors as error>
-      &lt;li>&lt;span class="errorMessage">${error}&lt;/span>&lt;/li>
+    &lt;li>&lt;span class="errorMessage">${error}&lt;/span>&lt;/li>
     &lt;/#list>
-  &lt;/ul>
-&lt;/#if></code></pre>
+    &lt;/ul>
+    &lt;/#if></code></pre>
 <hr/>
 
 <p>
@@ -830,12 +830,12 @@ struts.action.extension = <strong>do</strong></code></pre>
 
 <hr/>
 <pre><code>&lt;#if (actionErrors?exists && actionErrors?size > 0)>
-  <strong>&lt;table></strong>
+    <strong>&lt;table></strong>
     &lt;#list actionErrors as error>
-      <strong>&lt;tr>&lt;td></strong>&lt;span class="errorMessage">${error}&lt;/span><strong>&lt;/td>&lt;/tr></strong>
+    <strong>&lt;tr>&lt;td></strong>&lt;span class="errorMessage">${error}&lt;/span><strong>&lt;/td>&lt;/tr></strong>
     &lt;/#list>
-  <strong>&lt;/table></strong>
-&lt;/#if></code></pre>
+    <strong>&lt;/table></strong>
+    &lt;/#if></code></pre>
 <hr/>
 
 <p>
@@ -918,29 +918,29 @@ struts.action.extension = <strong>do</strong></code></pre>
 <hr/>
 <h5>Validation file for Logon Action</h5>
 <pre><code>&lt;!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
-  "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-&lt;validators>
-  &lt;field name="<strong>username</strong>">
+    "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+    &lt;validators>
+    &lt;field name="<strong>username</strong>">
     &lt;field-validator type="<strong>requiredstring</strong>">
     &lt;message key="<strong>error.username.required</strong>"/>
-  &lt;/field-validator>
-  &lt;/field>
-  &lt;field name="<strong>password</strong>">
+    &lt;/field-validator>
+    &lt;/field>
+    &lt;field name="<strong>password</strong>">
     &lt;field-validator type="<strong>requiredstring</strong>">
     &lt;message key="<strong>error.password.required</strong>"/>
     &lt;/field-validator>
-  &lt;/field>
-&lt;/validators>
+    &lt;/field>
+    &lt;/validators>
 </code></pre>
 <hr/>
 
 <p>
-   You may note that the DTD refers to "XWork". 
-   <a href="http://www.opensymphony.com/xwork/">
-     Open Symphony XWork
-   </a> is a generic command-pattern framework that can be used outside of a 
-   web environment. In practice, Struts 2 is a web-based extension of the 
-   XWork framework. 
+    You may note that the DTD refers to "XWork".
+    <a href="http://www.opensymphony.com/xwork/">
+        Open Symphony XWork
+    </a> is a generic command-pattern framework that can be used outside of a
+    web environment. In practice, Struts 2 is a web-based extension of the
+    XWork framework.
 </p>
 
 <p>
@@ -978,19 +978,19 @@ struts.action.extension = <strong>do</strong></code></pre>
 <hr/>
 <h5>Logon.java</h5>
 <pre><code>package mailreader2;
-import org.apache.struts.apps.mailreader.dao.User;
-public final class <strong>Logon</strong> extends MailreaderSupport {
-public String <strong>execute()</strong> throws ExpiredPasswordException {
-  User user = <strong>findUser(getUsername(), getPassword());</strong>
-  if (user != null) {
+    import org.apache.struts.apps.mailreader.dao.User;
+    public final class <strong>Logon</strong> extends MailreaderSupport {
+    public String <strong>execute()</strong> throws ExpiredPasswordException {
+    User user = <strong>findUser(getUsername(), getPassword());</strong>
+    if (user != null) {
     <strong>setUser(user);</strong>
-  }
-  if (<strong>hasErrors()</strong>) {
+    }
+    if (<strong>hasErrors()</strong>) {
     return INPUT;
-  }
+    }
     return SUCCESS;
-  }
-}</code></pre>
+    }
+    }</code></pre>
 <hr/>
 
 <p>
@@ -1005,7 +1005,7 @@ public String <strong>execute()</strong> throws ExpiredPasswordException {
 
 <p>
     Let's look at the relevant properties and methods from MailreaderSupport
-    and another base class, <strong>ActionSupport</strong>, namely 
+    and another base class, <strong>ActionSupport</strong>, namely
     "getUsername", "getPassword", "findUser", "setUser", and "hasErrors".
 </p>
 
@@ -1029,20 +1029,20 @@ public String <strong>execute()</strong> throws ExpiredPasswordException {
 <hr/>
 <h5>MailreaderSupport.getUsername() and getPassword()</h5>
 <pre><code>private String username = null;
-public String <strong>getUsername()</strong> {
-  return this.username;
-}
-public void setUsername(String username) {
-  this.username = username;
-}
+    public String <strong>getUsername()</strong> {
+    return this.username;
+    }
+    public void setUsername(String username) {
+    this.username = username;
+    }
 
-private String password = null;
-public String <strong>getPassword()</strong> {
-  return this.password;
-}
-public void setPassword(String password) {
-  this.password = password;
-}</code></pre>
+    private String password = null;
+    public String <strong>getPassword()</strong> {
+    return this.password;
+    }
+    public void setPassword(String password) {
+    this.password = password;
+    }</code></pre>
 <hr/>
 
 <p>
@@ -1053,16 +1053,16 @@ public void setPassword(String password) {
 <hr/>
 <h5>MailreaderSupport.findUser</h5>
 <pre><code>public User <strong>findUser</strong>(String username, String password)
-  throws <strong>ExpiredPasswordException</strong> {
-  User user = <strong>getDatabase().findUser(username)</strong>;
-  if ((user != null) && !user.getPassword().equals(password)) {
+    throws <strong>ExpiredPasswordException</strong> {
+    User user = <strong>getDatabase().findUser(username)</strong>;
+    if ((user != null) && !user.getPassword().equals(password)) {
     user = null;
-  }
-  if (user == null) {
+    }
+    if (user == null) {
     this.<strong>addFieldError</strong>("password", getText("error.password.mismatch"));
-  }
-  return user;
-}</code></pre>
+    }
+    return user;
+    }</code></pre>
 <hr/>
 
 <p>
@@ -1090,18 +1090,18 @@ public void setPassword(String password) {
     When "findUser" returns,
     the Logon Action looks to see if a valid (non-null) User object is returned.
     A valid User is passed to the <strong>User property</strong>.
-    Although it is still a JavaBean property, 
+    Although it is still a JavaBean property,
     the User property is not implemented in quite the same way as Username and Password.
 </p>
 
 <hr/>
 <h5>MailreaderSupport.setUser</h5>
 <pre><code>public User getUser() {
-  return (User) <strong>getSession().get(Constants.USER_KEY)</strong>;
-}
-public void setUser(User user) {
-  getSession().put(Constants.USER_KEY, user);
-}</code></pre>
+    return (User) <strong>getSession().get(Constants.USER_KEY)</strong>;
+    }
+    public void setUser(User user) {
+    getSession().put(Constants.USER_KEY, user);
+    }</code></pre>
 <hr/>
 
 <p>
@@ -1109,16 +1109,16 @@ public void setUser(User user) {
     "setUser" passes it to a <strong>Session</strong> property.
 </p>
 
-<hr />
+<hr/>
 <h5>MailreaderSupport.getSession() and setSession()</h5>
 <pre><code>private Map session;
-public Map <strong>getSession()</strong> {
-  return session;
+    public Map <strong>getSession()</strong> {
+    return session;
 
-public void <strong>setSession(Map value)</strong> {
-  session = value;
-}</code></pre>
-<hr />
+    public void <strong>setSession(Map value)</strong> {
+    session = value;
+    }</code></pre>
+<hr/>
 
 <p>
     To look at the MailreaderSupport class, you would think the Session property is a plain-old Map.
@@ -1159,8 +1159,8 @@ public void <strong>setSession(Map value)</strong> {
 </p>
 
 <pre><code>if (action instanceof <code>SessionAware</code>) {
-  ((SessionAware) action).<code>setSession</code>(context.getSession());
-}</code></pre>
+    ((SessionAware) action).<code>setSession</code>(context.getSession());
+    }</code></pre>
 
 <p>
     The framework uses these "Interceptor" classes to create a <strong>front controller</strong>
@@ -1217,7 +1217,7 @@ public void <strong>setSession(Map value)</strong> {
 <hr/>
 <h5>Best Practice:</h5>
 <blockquote>
-  <p><font class="hint">"Use a base class to define common functionality."</font></p>
+    <p><font class="hint">"Use a base class to define common functionality."</font></p>
 </blockquote>
 <hr/>
 
@@ -1242,22 +1242,22 @@ public void <strong>setSession(Map value)</strong> {
 
 <hr/>
 <h5>struts.xml Logon</h5>
-<pre><code>&lt;action name="<strong>Logon</strong>" class="mailreader2.Logon">
-  &lt;result name="<strong>input</strong>">/pages/Logon.jsp&lt;/result>
-  &lt;result name="<strong>cancel</strong>" type="redirect-action">Welcome&lt;/result>
-  &lt;result type="redirect-action">MainMenu&lt;/result>
-  &lt;result name="<strong>expired</strong>" type="chain">ChangePassword&lt;/result>
-  &lt;<strong>exception-mapping</strong>
+<pre><code>&lt;action name="<strong>Logon</strong>" class="mailreader2.registration.Retrieve">
+    &lt;result name="<strong>input</strong>">/pages/Logon.jsp&lt;/result>
+    &lt;result name="<strong>cancel</strong>" type="redirect-action">Welcome&lt;/result>
+    &lt;result type="redirect-action">MainMenu&lt;/result>
+    &lt;result name="<strong>expired</strong>" type="chain">ChangePassword&lt;/result>
+    &lt;<strong>exception-mapping</strong>
     exception="org.apache.struts.apps.mailreader.dao.ExpiredPasswordException"
-  result="<strong>expired</strong>"/>
-  &lt;interceptor-ref name="<strong>guest</strong>"/>
-&lt;/action></code></pre>
+    result="<strong>expired</strong>"/>
+    &lt;interceptor-ref name="<strong>guest</strong>"/>
+    &lt;/action></code></pre>
 <hr/>
 
 <p>
     In the Logon action element, the first result element is named "input".
     If validation or authentification fail,
-    the Action class will return "input" and the framework will transfer control to the 
+    the Action class will return "input" and the framework will transfer control to the
     "Logon.jsp" page.
 </p>
 
@@ -1290,10 +1290,10 @@ public void <strong>setSession(Map value)</strong> {
 <hr/>
 <h5>struts.xml exception-mapping</h5>
 <pre><code>&lt;global-exception-mappings>
-  &lt;exception-mapping
+    &lt;exception-mapping
     result="error"
     exception="java.lang.Exception"/>
-&lt;/global-exception-mappings></code></pre>
+    &lt;/global-exception-mappings></code></pre>
 <hr/>
 
 <p>
@@ -1308,34 +1308,34 @@ public void <strong>setSession(Map value)</strong> {
 <hr/>
 <h5>Error.jsp</h5>
 <pre><code>&lt;%@ page contentType="text/html; charset=UTF-8" %>
-&lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags" %>
-  &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    &lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags" %>
+    &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  &lt;head>
+    &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    &lt;head>
     &lt;title>Unexpected Error&lt;/title>
-  &lt;/head>
-  &lt;body>
+    &lt;/head>
+    &lt;body>
     &lt;h2>An unexpected error has occured&lt;/h2>
     &lt;p>
-      Please report this error to your system administrator
-      or appropriate technical support personnel.
-      Thank you for your cooperation.
+    Please report this error to your system administrator
+    or appropriate technical support personnel.
+    Thank you for your cooperation.
     &lt;/p>
     &lt;hr />
     &lt;h3>Error Message&lt;/h3>
     <strong>&lt;s:actionerror /></strong>
     &lt;p>
-      <strong>&lt;s:property value="%{exception.message}"/></strong>
+    <strong>&lt;s:property value="%{exception.message}"/></strong>
     &lt;/p>
     &lt;hr />
     &lt;h3>Technical Details&lt;/h3>
     &lt;p>
-      <strong>&lt;s:property value="%{exceptionStack}"/></strong>
+    <strong>&lt;s:property value="%{exceptionStack}"/></strong>
     &lt;/p>
     &lt;jsp:include page="Footer.jsp"/>
-  &lt;/body>
-&lt;/html></code></pre>
+    &lt;/body>
+    &lt;/html></code></pre>
 <hr/>
 
 <p>
@@ -1362,27 +1362,27 @@ public void <strong>setSession(Map value)</strong> {
 <hr/>
 <h5>mailreader2.AuthenticationInterceptor</h5>
 <pre><code>package mailreader2;
-import com.opensymphony.xwork2.interceptor.Interceptor;
-import com.opensymphony.xwork2.ActionInvocation;
-import com.opensymphony.xwork2.Action;
-import java.util.Map;
-import org.apache.struts.apps.mailreader.dao.User;
+    import com.opensymphony.xwork2.interceptor.Interceptor;
+    import com.opensymphony.xwork2.ActionInvocation;
+    import com.opensymphony.xwork2.Action;
+    import java.util.Map;
+    import org.apache.struts.apps.mailreader.dao.User;
 
-public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
-  public void destroy () {}
-  public void init() {}
-  public String <strong>intercept</strong>(ActionInvocation actionInvocation) throws Exception {
+    public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
+    public void destroy () {}
+    public void init() {}
+    public String <strong>intercept</strong>(ActionInvocation actionInvocation) throws Exception {
     Map session = actionInvocation.getInvocationContext().getSession();
     User user = (User) session.get(Constants.USER_KEY);
     boolean isAuthenticated = (null!=user) && (null!=user.getDatabase());
     if (<strong>isAuthenticated</strong>) {
-      return actionInvocation.invoke();
+    return actionInvocation.invoke();
     }
     else {
-      return Action.LOGIN;
+    return Action.LOGIN;
     }
-  }
-}</code></pre>
+    }
+    }</code></pre>
 <hr/>
 
 <p>
@@ -1402,29 +1402,29 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
 <hr/>
 <h5>struts.xml interceptors</h5>
 <pre><code>&lt;interceptors>
-  &lt;interceptor name="<strong>authentication</strong>"
-               class="mailreader2.AuthenticationInterceptor"/>
-  &lt;interceptor-stack name="<strong>user</strong>" >
-      &lt;interceptor-ref name="authentication" />
-      &lt;interceptor-ref name="defaultStack"/>
-  &lt;/interceptor-stack>
-  &lt;interceptor-stack name="<strong>user-submit</strong>" >
-      &lt;interceptor-ref name="token-session" />
-      &lt;interceptor-ref name="user"/>
-  &lt;/interceptor-stack>
-  &lt;interceptor-stack name="<strong>guest</strong>" >
-      &lt;interceptor-ref name="defaultStack"/>
-  &lt;/interceptor-stack>
-  &lt;interceptor-stack name="<strong>guest-submit</strong>" >
-      &lt;interceptor-ref name="token-session" />
-      &lt;interceptor-ref name="guest"/>
-  &lt;/interceptor-stack>
-&lt;/interceptors>
-&lt;<strong>default-interceptor-ref</strong> name="user"/></code></pre>
+    &lt;interceptor name="<strong>authentication</strong>"
+    class="mailreader2.AuthenticationInterceptor"/>
+    &lt;interceptor-stack name="<strong>user</strong>" >
+    &lt;interceptor-ref name="authentication" />
+    &lt;interceptor-ref name="defaultStack"/>
+    &lt;/interceptor-stack>
+    &lt;interceptor-stack name="<strong>user-submit</strong>" >
+    &lt;interceptor-ref name="token-session" />
+    &lt;interceptor-ref name="user"/>
+    &lt;/interceptor-stack>
+    &lt;interceptor-stack name="<strong>guest</strong>" >
+    &lt;interceptor-ref name="defaultStack"/>
+    &lt;/interceptor-stack>
+    &lt;interceptor-stack name="<strong>guest-submit</strong>" >
+    &lt;interceptor-ref name="token-session" />
+    &lt;interceptor-ref name="guest"/>
+    &lt;/interceptor-stack>
+    &lt;/interceptors>
+    &lt;<strong>default-interceptor-ref</strong> name="user"/></code></pre>
 <hr/>
 
 <p>
-    The <strong>user</strong> stacks require that the client be authenticated. 
+    The <strong>user</strong> stacks require that the client be authenticated.
     In other words, that a User object is present in the session.
     The actions using a <strong>guest</strong> stack can be accessed by any client.
     The <strong>-submit</strong> versions of each can be used with actions
@@ -1434,7 +1434,7 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
 <h5>Double Submits</h5>
 
 <p>
-    A common problem with designing web applications is that users are impatient 
+    A common problem with designing web applications is that users are impatient
     and response times can vary.
     Sometimes, people will press a submit button a second time.
     When this happens, the browser submits the request again,
@@ -1469,11 +1469,11 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
 
 <p>
     Because the default interceptor stack will now authenticate the client,
-    we need to specify the standard "defaultStack" for the three 
-    "guest actions", Welcome, Logon, and Register. 
-    Requiring authentification by default is the better practice, since it 
-    means that we won't forget to enable it when creating new actions. 
-    Meanwhile, those pesky users will ensure that we don't forget to disable 
+    we need to specify the standard "defaultStack" for the three
+    "guest actions", Welcome, Logon, and Register.
+    Requiring authentification by default is the better practice, since it
+    means that we won't forget to enable it when creating new actions.
+    Meanwhile, those pesky users will ensure that we don't forget to disable
     authentification for "guest" services.
 </p>
 
@@ -1508,30 +1508,30 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
 
 <h5>MainMenu.jsp</h5>
 <pre><code>&lt;%@ page contentType="text/html; charset=UTF-8" %>
-&lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags"  %>
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  &lt;head>
+    &lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags" %>
+    &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    &lt;head>
     &lt;title>&lt;s:text name="mainMenu.title"/>&lt;/title>
-      &lt;link href="&lt;s:url value="/css/mailreader.css"/>" rel="stylesheet"
-      type="text/css"/>
-  &lt;/head>
+    &lt;link href="&lt;s:url value="/css/mailreader.css"/>" rel="stylesheet"
+    type="text/css"/>
+    &lt;/head>
 
-  &lt;body>
-  &lt;h3>&lt;s:text name="mainMenu.heading"/> <strong>&lt;s:property
+    &lt;body>
+    &lt;h3>&lt;s:text name="mainMenu.heading"/> <strong>&lt;s:property
     value="user.fullName"/></strong>&lt;/h3>
-  &lt;ul>
+    &lt;ul>
     &lt;li>&lt;a href="&lt;s:url <strong>action="Registration!input"</strong> />">
-        &lt;s:text name="mainMenu.registration"/>
-      &lt;/a>
+    &lt;s:text name="mainMenu.registration"/>
+    &lt;/a>
     &lt;/li>
     &lt;li>&lt;a href="&lt;s:url <strong>action="Logoff"</strong> />">
-      &lt;s:text name="mainMenu.logoff"/>
-      &lt;/a>
+    &lt;s:text name="mainMenu.logoff"/>
+    &lt;/a>
     &lt;/ul>
-  &lt;/body>
-&lt;/html></code></pre>
+    &lt;/body>
+    &lt;/html></code></pre>
 <hr/>
 
 <p>
@@ -1576,19 +1576,19 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
     to make it appears as though there are two distinct pages.
 </p>
 
-<hr />
+<hr/>
 <h5>Registration.jsp - head element</h5>
 <pre><code>&lt;head>
-  &lt;s:if test="<strong>task=='Create'</strong>">
+    &lt;s:if test="<strong>task=='Create'</strong>">
     &lt;title>&lt;s:text name="registration.title.create"/>&lt;/title>
-  &lt;/s:if>
-  &lt;s:if test="<strong>task=='Edit'</strong>">
+    &lt;/s:if>
+    &lt;s:if test="<strong>task=='Edit'</strong>">
     &lt;title>&lt;s:text name="registration.title.edit"/>&lt;/title>
-  &lt;/s:if>
-  &lt;link href="&lt;s:url value="/css/mailreader.css"/>" rel="stylesheet"
+    &lt;/s:if>
+    &lt;link href="&lt;s:url value="/css/mailreader.css"/>" rel="stylesheet"
     type="text/css"/>
-&lt;/head></code></pre>
-<hr />
+    &lt;/head></code></pre>
+<hr/>
 
 <p>
     For example, if client is editing the form (task == 'Edit'),
@@ -1605,7 +1605,7 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
         The "test" tag is a convenient way to express presentation
         logic within your pages.
         Customized pages help to prevent user error,
-        and dynamic customization reduces the number of server pages your 
+        and dynamic customization reduces the number of server pages your
         application needs to maintain, among other benefits.
     </font></p>
 </blockquote>
@@ -1621,13 +1621,13 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
 <hr/>
 <h5></h5>
 <pre><code>&lt;s:if test=<strong>"task == 'Edit'"</strong>>
-  &lt;div align="center">
+    &lt;div align="center">
     &lt;h3>&lt;s:text name="heading.subscriptions"/>&lt;/h3>
-  &lt;/div>
+    &lt;/div>
     &lt;!-- ... -->
-  &lt;/s:if>
-&lt;jsp:include page="Footer.jsp"/>
-&lt;/body>&lt;/html></code></pre>
+    &lt;/s:if>
+    &lt;jsp:include page="Footer.jsp"/>
+    &lt;/body>&lt;/html></code></pre>
 <hr/>
 
 <p>
@@ -1650,136 +1650,142 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
     So to display each subscription, we have to reach into the user object,
     and loop through the members of the subscription collection.
     Using the iterator tag, you can code it the way it sounds.
- </p>
+</p>
 
 <hr/>
 <h5>Using iterator to list the Subscriptions</h5>
 <pre><code>&lt;s:iterator value="<strong>user.subscriptions</strong>">
-  &lt;tr>
+    &lt;tr>
     &lt;td align="left">
-      &lt;s:property value="<strong>host</strong>"/>
+    &lt;s:property value="<strong>host</strong>"/>
     &lt;/td>
     &lt;td align="left">
-       &lt;s:property value="<strong>username</strong>"/>
-   &lt;/td>
-  &lt;td align="center">
-      &lt;s:property value="<strong>type</strong>"/>
-  &lt;/td>
-  &lt;td align="center">
-     &lt;s:property value="<strong>autoConnect</strong>"/>
-  &lt;/td>
-  &lt;td align="center">
-    &lt;a href="&lt;s:url action="<strong>Subscription!delete</strong>">&lt;s:param name="<strong>host</strong>" value="host"/>&lt;/s:url>">
-      &lt;s:text name="registration.deleteSubscription"/>
+    &lt;s:property value="<strong>username</strong>"/>
+    &lt;/td>
+    &lt;td align="center">
+    &lt;s:property value="<strong>type</strong>"/>
+    &lt;/td>
+    &lt;td align="center">
+    &lt;s:property value="<strong>autoConnect</strong>"/>
+    &lt;/td>
+    &lt;td align="center">
+    &lt;a href="&lt;s:url action="<strong>Subscription!delete</strong>">&lt;s:param name="<strong>host</strong>"
+    value="host"/>&lt;/s:url>">
+    &lt;s:text name="registration.deleteSubscription"/>
     &lt;/a>&nbsp;
-    &lt;a href="&lt;s:url action="<strong>Subscription!edit</strong>">&lt;s:param name="<strong>host</strong>" value="host"/>&lt;/s:url>">
-      &lt;s:text name="registration.editSubscription"/>
-     &lt;/a>
-   &lt;/td>
- &lt;/tr>
-&lt;/s:iterator></code></pre>
+    &lt;a href="&lt;s:url action="<strong>Subscription!edit</strong>">&lt;s:param name="<strong>host</strong>"
+    value="host"/>&lt;/s:url>">
+    &lt;s:text name="registration.editSubscription"/>
+    &lt;/a>
+    &lt;/td>
+    &lt;/tr>
+    &lt;/s:iterator></code></pre>
 <hr/>
 
 <p>
     When the iterator renders, it generates a list of Subscriptions for the current User.
 </p>
 
-<hr />
+<hr/>
 
-    <div align="center">
-        <h3>Current Subscriptions</h3>
-    </div>
+<div align="center">
+    <h3>Current Subscriptions</h3>
+</div>
 
-    <table border="1" width="100%">
-        <tr>
-            <th align="center" width="30%">
-                Host Name
-            </th>
-            <th align="center" width="25%">
-                User Name
-            </th>
+<table border="1" width="100%">
+    <tr>
+        <th align="center" width="30%">
+            Host Name
+        </th>
+        <th align="center" width="25%">
+            User Name
+        </th>
 
-            <th align="center" width="10%">
-                Server Type
-            </th>
-            <th align="center" width="10%">
-                Auto
-            </th>
-            <th align="center" width="15%">
-                Action
-            </th>
-        </tr>
-            <tr>
-                <td align="left">
-                    mail.hotmail.com
-                </td>
-                <td align="left">
-                    user1234
-                </td>
-                <td align="center">
-                    pop3
-                </td>
+        <th align="center" width="10%">
+            Server Type
+        </th>
+        <th align="center" width="10%">
+            Auto
+        </th>
+        <th align="center" width="15%">
+            Action
+        </th>
+    </tr>
+    <tr>
+        <td align="left">
+            mail.hotmail.com
+        </td>
+        <td align="left">
+            user1234
+        </td>
+        <td align="center">
+            pop3
+        </td>
 
-                <td align="center">
-                    false
-                </td>
-                <td align="center">
-                    <a href="/struts2-mailreader/Subscription!delete.do?host=mail.hotmail.com">
-                        Delete
-                    </a>
-                    &nbsp;
-                    <a href="/struts2-mailreader/Subscription!edit.do?host=mail.hotmail.com">
-                        Edit
-                    </a>
-                </td>
-            </tr>
-            <tr>
-                <td align="left">
-                    mail.yahoo.com
-                </td>
-                <td align="left">
-                    jquser
-                </td>
-                <td align="center">
-                    imap
-                </td>
-                <td align="center">
-                    false
-                </td>
-                <td align="center">
-                    <a href="/struts2-mailreader/Subscription!delete.do?host=mail.yahoo.com">
-                        Delete
-                    </a>
-                    &nbsp;
-                    <a href="/struts2-mailreader/Subscription!edit.do?host=mail.yahoo.com">
-                        Edit
-                    </a>
-                </td>
-            </tr>
-    </table>
-    <a href="/struts2-mailreader/Subscription!input.do">Add</a>
+        <td align="center">
+            false
+        </td>
+        <td align="center">
+            <a href="/struts2-mailreader/Subscription!delete.do?host=mail.hotmail.com">
+                Delete
+            </a>
+            &nbsp;
+            <a href="/struts2-mailreader/Subscription!edit.do?host=mail.hotmail.com">
+                Edit
+            </a>
+        </td>
+    </tr>
+    <tr>
+        <td align="left">
+            mail.yahoo.com
+        </td>
+        <td align="left">
+            jquser
+        </td>
+        <td align="center">
+            imap
+        </td>
+        <td align="center">
+            false
+        </td>
+        <td align="center">
+            <a href="/struts2-mailreader/Subscription!delete.do?host=mail.yahoo.com">
+                Delete
+            </a>
+            &nbsp;
+            <a href="/struts2-mailreader/Subscription!edit.do?host=mail.yahoo.com">
+                Edit
+            </a>
+        </td>
+    </tr>
+</table>
+<a href="/struts2-mailreader/Subscription!input.do">Add</a>
 
-<hr />
+<hr/>
 
-    <p>
-        Now look back at the code used to generate this block.
-    </p>
-    <p>
-        Notice anything nifty?
-    </p>
-    <p>
-        How about that the markup between the iterator tag is
-        actually <em>simpler</em> than the markup that we would use to render one row of the table?
-    </p>
-    <p>
-        Instead of using a qualified reference  like "value=user.subscription[0].host",
-        we use the simplest possible reference: "value=host".
-        We didn't have to define a local variable, and reference that local in the loop code.
-        The reference to each item in the list is automatically resolved, no fuss, no muss.
-    </p>
-    <p>
-        Nice trick!
-    </p>
+<p>
+    Now look back at the code used to generate this block.
+</p>
+
+<p>
+    Notice anything nifty?
+</p>
+
+<p>
+    How about that the markup between the iterator tag is
+    actually <em>simpler</em> than the markup that we would use to render one row of the table?
+</p>
+
+<p>
+    Instead of using a qualified reference like "value=user.subscription[0].host",
+    we use the simplest possible reference: "value=host".
+    We didn't have to define a local variable, and reference that local in the loop code.
+    The reference to each item in the list is automatically resolved, no fuss, no muss.
+</p>
+
+<p>
+    Nice trick!
+</p>
 
 <p>
     The secret to this magic is the <strong>value stack</strong>.
@@ -1839,7 +1845,7 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
     the value for the field is pushed onto the value stack.
     As a result, if the client enters text into an Integer field,
     the framework can still redisplay whatever was entered.
-    An invalid input value is not stored in the field (even if it could be). 
+    An invalid input value is not stored in the field (even if it could be).
     The invalid input is pushed onto the stack for the scope of the request.
 </p>
 
@@ -1858,12 +1864,12 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
 </p>
 
 <pre><code>pager.legend = Displaying {current} of {count} items matching {criteria}.
-...
-&lt;s:text name="pager.legend">
+    ...
+    &lt;s:text name="pager.legend">
     &lt;s:<strong>param</strong> name="current" value="42" />
     &lt;s:<strong>param</strong> name="count" value="314" />
     &lt;s:<strong>param</strong> name="criteria" value="Life, the Universe, and Everything" />
-&lt;/s:text></code></pre>
+    &lt;/s:text></code></pre>
 
 <p>
     In the case of an "url" tag,
@@ -1872,15 +1878,15 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
 </p>
 
 <pre><code>
-  &lt;s:url action="Subscription!edit">&lt;s:param name="<strong>host" value="host</strong>"/>&lt;/s:url>">
+    &lt;s:url action="Subscription!edit">&lt;s:param name="<strong>host" value="host</strong>"/>&lt;/s:url>">
 </code></pre>
 
 <p>
-  can render a hyperlink like this:
+    can render a hyperlink like this:
 </p>
 
 <pre><code>
-  &lt;a href="/struts2-mailreader/Subscription!edit.do?<strong>host=mail.yahoo.com</strong>">Edit&lt;/a>
+    &lt;a href="/struts2-mailreader/Subscription!edit.do?<strong>host=mail.yahoo.com</strong>">Edit&lt;/a>
 </code></pre>
 
 
@@ -1888,7 +1894,7 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
 <p>
     At the foot of the Register page is a link for adding a subscription.
     Let's wind up the tour by following the Add link and then logging off.
-    Like the link for creating a Registration, Add points to an "Edit" action,
+    Like the link for creating a Support, Add points to an "Edit" action,
     namely "EditSubscription".
 </p>
 -->
@@ -1910,13 +1916,13 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
     and follow the bouncing ball from page to action to page.
 </p>
 
-<hr />
+<hr/>
 <h5>struts.xml Subscription element</h5>
-<pre><code>&lt;action name="Subscription" class="mailreader2.Subscription">
-  &lt;result name="input">/pages/Subscription.jsp&lt;/result>
-  &lt;result type="redirect-action">Registration!input&lt;/result>
-&lt;/action></code></pre>
-<hr />
+<pre><code>&lt;action name="Subscription" class="mailreader2.SubscriptionSupport">
+    &lt;result name="input">/pages/Subscription.jsp&lt;/result>
+    &lt;result type="redirect-action">Registration!input&lt;/result>
+    &lt;/action></code></pre>
+<hr/>
 
 <p>
     The Edit link specified the Subscription action,
@@ -1927,23 +1933,23 @@ public class <strong>AuthenticationInterceptor</strong> implements Interceptor {
     The "alternate" execute methods are called <strong>alias</strong> methods.
 </p>
 
-<hr />
+<hr/>
 <h5>Subscription edit alias</h5>
 <pre><code>public String <strong>edit()</strong> {
-  <strong>setTask(Constants.EDIT);</strong>>
-  return find();
-}
+    <strong>setTask(Constants.EDIT);</strong>>
+    return find();
+    }
 
-public String find() {
-  org.apache.struts.apps.mailreader.dao.Subscription
+    public String find() {
+    org.apache.struts.apps.mailreader.dao.Subscription
     sub = findSubscription();
-   if (sub == null) {
-       return ERROR;
-   }
-   <strong>setSubscription(sub);</strong>
-   return INPUT;
-}</code></pre>
-<hr />
+    if (sub == null) {
+    return ERROR;
+    }
+    <strong>setSubscription(sub);</strong>
+    return INPUT;
+    }</code></pre>
+<hr/>
 
 <p>
     The "edit" alias has two responsibilities.
@@ -1972,18 +1978,18 @@ public String find() {
     around the MailReader DAO classes.
 </p>
 
-<hr />
+<hr/>
 <h5>MailreaderSupport findSubscription()</h5>
 <pre><code>public Subscription <strong>findSubscription()</strong> {
     return findSubscription(getHost());
-}
+    }
 
-public Subscription findSubscription(String host) {
+    public Subscription findSubscription(String host) {
     Subscription subscription;
     subscription = <strong>getUser().findSubscription(host);</strong>
     return subscription;
-}</code></pre>
-<hr />
+    }</code></pre>
+<hr/>
 
 <p>
     This code is very simple
@@ -2007,17 +2013,18 @@ public Subscription findSubscription(String host) {
     to ensure that we are passed a Host parameter.
 </p>
 
-<hr />
+<hr/>
 <h5>Subscription-validation.xml</h5>
-<pre><code>&lt;!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN" "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-&lt;validators>
-  &lt;field name="<strong>host</strong>">
+<pre><code>&lt;!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
+    "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
+    &lt;validators>
+    &lt;field name="<strong>host</strong>">
     &lt;field-validator type="<strong>requiredstring</strong>">
-        &lt;message key="error.host.required"/>
+    &lt;message key="error.host.required"/>
     &lt;/field-validator>
-  &lt;/field>
-&lt;/validators></code></pre>
-<hr />
+    &lt;/field>
+    &lt;/validators></code></pre>
+<hr/>
 
 <p>
     By keeping routine sety precautions out of the Action class,
@@ -2029,75 +2036,75 @@ public Subscription findSubscription(String host) {
     the framework transfers control to the (you guessed it) Subscription page.
 </p>
 
-<hr />
+<hr/>
 <h5>Subscription.jsp</h5>
 <pre><code>&lt;%@ page contentType="text/html; charset=UTF-8" %>
-&lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags" %>
-&lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-&lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  &lt;head>
+    &lt;%@ taglib prefix="s" uri="http://struts.apache.org/tags" %>
+    &lt;!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    &lt;html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+    &lt;head>
     &lt;s:if test="task=='Create'">
-        &lt;title>&lt;s:text name="subscription.title.create"/>&lt;/title>
+    &lt;title>&lt;s:text name="subscription.title.create"/>&lt;/title>
     &lt;/s:if>
     &lt;s:if test="task=='Edit'">
-        &lt;title>&lt;s:text name="subscription.title.edit"/>&lt;/title>
+    &lt;title>&lt;s:text name="subscription.title.edit"/>&lt;/title>
     &lt;/s:if>
     &lt;s:if test="task=='Delete'">
-        &lt;title>&lt;s:text name="subscription.title.delete"/>&lt;/title>
+    &lt;title>&lt;s:text name="subscription.title.delete"/>&lt;/title>
     &lt;/s:if>
     &lt;link href="&lt;s:url value="/css/mailreader.css"/>" rel="stylesheet"
-          type="text/css"/>
-  &lt;/head>
-  &lt;body onLoad="self.focus();document.Subscription.username.focus()">
+    type="text/css"/>
+    &lt;/head>
+    &lt;body onLoad="self.focus();document.Subscription.username.focus()">
 
     &lt;s:actionerror/>
     &lt;s:form method="POST" <strong>action="SubscriptionSave"</strong> validate="false">
-      <strong>&lt;s:token /></strong>
-      <strong>&lt;s:hidden name="task"/></strong>
-      <strong>&lt;s:label label="%{getText('username')}" name="user.username"/></strong>
+    <strong>&lt;s:token /></strong>
+    <strong>&lt;s:hidden name="task"/></strong>
+    <strong>&lt;s:label label="%{getText('username')}" name="user.username"/></strong>
 
-      &lt;s:if test="task == 'Create'">
-        &lt;s:textfield label="%{getText('mailHostname')}" name="host"/>
-      &lt;/s:if>
-      &lt;s:else>
-        &lt;s:label label="%{getText('mailHostname')}" name="host"/>
-        &lt;s:hidden name="host"/>
-      &lt;/s:else>
+    &lt;s:if test="task == 'Create'">
+    &lt;s:textfield label="%{getText('mailHostname')}" name="host"/>
+    &lt;/s:if>
+    &lt;s:else>
+    &lt;s:label label="%{getText('mailHostname')}" name="host"/>
+    &lt;s:hidden name="host"/>
+    &lt;/s:else>
 
-      &lt;s:if test="task == 'Delete'">
-        &lt;s:label label="%{getText('mailUsername')}"
-                   name="subscription.username"/>
-        &lt;s:label label="%{getText('mailPassword')}"
-                   name="subscription.password"/>
-        &lt;s:label label="%{getText('mailServerType')}"
-                   name="subscription.type"/>
-        &lt;s:label label="%{getText('autoConnect')}"
-                   name="subscription.autoConnect"/>
-        &lt;s:submit value="%{getText('button.confirm')}"/>
-      &lt;/s:if>
-      &lt;s:else>
-        &lt;s:textfield label="%{getText('mailUsername')}"
-                       name="subscription.username"/>
-        &lt;s:textfield label="%{getText('mailPassword')}"
-                       name="subscription.password"/>
-        <strong>&lt;s:select label="%{getText('mailServerType')}"
-                    name="subscription.type" list="types"/></strong>
-        <strong>&lt;s:checkbox label="%{getText('autoConnect')}"
-                      name="subscription.autoConnect"/></strong>
-        &lt;s:submit value="%{getText('button.save')}"/>
-        &lt;s:reset value="%{getText('button.reset')}"/>
-      &lt;/s:else>
+    &lt;s:if test="task == 'Delete'">
+    &lt;s:label label="%{getText('mailUsername')}"
+    name="subscription.username"/>
+    &lt;s:label label="%{getText('mailPassword')}"
+    name="subscription.password"/>
+    &lt;s:label label="%{getText('mailServerType')}"
+    name="subscription.type"/>
+    &lt;s:label label="%{getText('autoConnect')}"
+    name="subscription.autoConnect"/>
+    &lt;s:submit value="%{getText('button.confirm')}"/>
+    &lt;/s:if>
+    &lt;s:else>
+    &lt;s:textfield label="%{getText('mailUsername')}"
+    name="subscription.username"/>
+    &lt;s:textfield label="%{getText('mailPassword')}"
+    name="subscription.password"/>
+    <strong>&lt;s:select label="%{getText('mailServerType')}"
+        name="subscription.type" list="types"/></strong>
+    <strong>&lt;s:checkbox label="%{getText('autoConnect')}"
+        name="subscription.autoConnect"/></strong>
+    &lt;s:submit value="%{getText('button.save')}"/>
+    &lt;s:reset value="%{getText('button.reset')}"/>
+    &lt;/s:else>
 
-      &lt;s:submit action="Registration!input"
-                value="%{getText('button.cancel')}"
-                onclick="form.onsubmit=null"/>
-  &lt;/s:form>
+    &lt;s:submit action="Registration!input"
+    value="%{getText('button.cancel')}"
+    onclick="form.onsubmit=null"/>
+    &lt;/s:form>
 
-  &lt;jsp:include page="Footer.jsp"/>
-  &lt;/body>
-&lt;/html></code></pre>
-<hr />
+    &lt;jsp:include page="Footer.jsp"/>
+    &lt;/body>
+    &lt;/html></code></pre>
+<hr/>
 
 <p>
     As before, we'll discuss the tags and attributes that are new to this page:
@@ -2121,18 +2128,18 @@ public Subscription findSubscription(String host) {
     we created a new Action class for saving a Subscription.
 </p>
 
-<hr />
+<hr/>
 <h5>Subscription-validation.xml</h5>
 <pre><code>&lt;!DOCTYPE validators PUBLIC "-//OpenSymphony Group//XWork Validator 1.0.2//EN"
     "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd">
-&lt;validators>
-  &lt;field name="<strong>host</strong>">
+    &lt;validators>
+    &lt;field name="<strong>host</strong>">
     &lt;field-validator type="<strong>requiredstring</strong>">
-        &lt;message key="error.host.required"/>
+    &lt;message key="error.host.required"/>
     &lt;/field-validator>
-  &lt;/field>
-&lt;/validators></code></pre>
-<hr />
+    &lt;/field>
+    &lt;/validators></code></pre>
+<hr/>
 
 <p>
     The validators follow the same type of inheritance path as the classes.
@@ -2174,7 +2181,7 @@ public Subscription findSubscription(String host) {
 </p>
 
 <pre><code>&lt;s:select label="%{getText('mailServerType')}"
-  name="subscription.type" <strong>list="types"</strong> />
+    name="subscription.type" <strong>list="types"</strong> />
 </code></pre>
 
 <p>
@@ -2185,46 +2192,46 @@ public Subscription findSubscription(String host) {
     and populates a Types property in a method named "prepare".
 </p>
 
-<hr />
+<hr/>
 <h5>Subscription-validation.xml</h5>
 <pre><code>public class <strong>Subscription</strong> extends MailreaderSupport
-  <strong>implements Preparable</strong> {
+    <strong>implements Preparable</strong> {
 
-  private Map types = null;
-  public Map <strong>getTypes()</strong> {
+    private Map types = null;
+    public Map <strong>getTypes()</strong> {
     return types;
-   }
+    }
 
-   public void <strong>prepare()</strong> {
-     Map m = new LinkedHashMap();
-       m.put("imap", "IMAP Protocol");
-       m.put("pop3", "POP3 Protocol");
-       types = m;
-       setHost(getSubscriptionHost());
+    public void <strong>prepare()</strong> {
+    Map m = new LinkedHashMap();
+    m.put("imap", "IMAP Protocol");
+    m.put("pop3", "POP3 Protocol");
+    types = m;
+    setHost(getSubscriptionHost());
     }
 
     // ... </code></pre>
-<hr />
+<hr/>
 
 <p>
     The default Interceptor stack includes the <strong>PrepareInterceptor</strong>,
     which observes the Preparable interface.
 </p>
 
-<hr />
+<hr/>
 <h5>PrepareInterceptor</h5>
 <pre><code>public class <strong>PrepareInterceptor</strong> extends AroundInterceptor {
 
-  protected void after(ActionInvocation dispatcher, String result) throws Exception {
-  }
+    protected void after(ActionInvocation dispatcher, String result) throws Exception {
+    }
 
-  protected void before(ActionInvocation invocation) throws Exception {
+    protected void before(ActionInvocation invocation) throws Exception {
     Object action = invocation.getAction();
-     <strong>if (action instanceof Preparable) {
+    <strong>if (action instanceof Preparable) {
         ((Preparable) action).prepare();</strong>
     }
-  }
-}</code></pre>
+    }
+    }</code></pre>
 
 <p>
     The PrepareInterceptor ensures that the "prepare" method will always be called
@@ -2251,7 +2258,7 @@ public Subscription findSubscription(String host) {
 </p>
 
 <pre><code>  &lt;s:checkbox label="%{getText('autoConnect')}"
-  name="subscription.autoConnect"/></code></pre>
+    name="subscription.autoConnect"/></code></pre>
 
 <p>
     The Subscription object has a boolean AutoConnect property,
@@ -2259,7 +2266,7 @@ public Subscription findSubscription(String host) {
     The problem is, if you clear a checkbox, the browser client will not submit <em>anything</em>.
     Nada. Zip.
     It is as if the checkbox control never existed.
-    The HTTP protocol has no way to affirm "false". 
+    The HTTP protocol has no way to affirm "false".
     If the control is missing, we need to figure out it's been unclicked.
 </p>
 
@@ -2291,21 +2298,21 @@ public Subscription findSubscription(String host) {
     If the control is submitted, then the property is set to true.
 </p>
 
-<hr />
+<hr/>
 <h5>SubscriptionSave</h5>
 <pre><code>public final class SubscriptionSave extends Subscription {
 
-  public void prepare() {
+    public void prepare() {
     super.prepare();
     // checkbox workaround
     <strong>getSubscription().setAutoConnect(false);</strong>
-  }
+    }
 
-  public String execute() throws Exception {
+    public String execute() throws Exception {
     return save();
-  }
-}</code></pre>
-<hr />
+    }
+    }</code></pre>
+<hr/>
 
 
 <p>
@@ -2315,22 +2322,22 @@ public Subscription findSubscription(String host) {
     SubscriptionSave will invoke the Subscription.save method.
 </p>
 
-<hr />
+<hr/>
 <h5>Subscription save method</h5>
 <pre><code>public String <strong>save</strong>() throws Exception {
 
-  if (Constants.DELETE.equals(getTask())) {
-   <strong>removeSubscription</strong>();
-  }
+    if (Constants.DELETE.equals(getTask())) {
+    <strong>removeSubscription</strong>();
+    }
 
-  if (Constants.CREATE.equals(getTask())) {
+    if (Constants.CREATE.equals(getTask())) {
     <strong>copySubscription(</strong>getHost());
-  }
+    }
 
-  saveUser();
-  return SUCCESS;
-}</code></pre>
-<hr />
+    saveUser();
+    return SUCCESS;
+    }</code></pre>
+<hr/>
 
 <p>
     The <strong>save</strong> method uses the Task property to handle
@@ -2343,13 +2350,13 @@ public Subscription findSubscription(String host) {
     and then updates the application state.
 </p>
 
-<hr />
+<hr/>
 <h5>removeSubscription</h5>
 <pre><code>public void <strong>removeSubscription</strong>() throws Exception {
-  getUser().removeSubscription(getSubscription());
-  getSession().remove(Constants.SUBSCRIPTION_KEY);
-}</code></pre>
-<hr />
+    getUser().removeSubscription(getSubscription());
+    getSession().remove(Constants.SUBSCRIPTION_KEY);
+    }</code></pre>
+<hr/>
 
 <p>
     The <strong>copySubscription</strong> method is a bit more interesting.
@@ -2387,17 +2394,17 @@ public Subscription findSubscription(String host) {
     and copy over the rest of the properties.
 </p>
 
-<hr />
+<hr/>
 <h5>copySubscription</h5>
 <pre><code>public void <strong>copySubscription</strong>(String host) {
-  Subscription input = getSubscription();
-  Subscription sub = createSubscription(host);
-  if (null != sub) {
+    Subscription input = getSubscription();
+    Subscription sub = createSubscription(host);
+    if (null != sub) {
     <strong>BeanUtils.setValues</strong>(sub, input, null);
     setSubscription(sub);
     setHost(sub.getHost());
-  }
-}</code></pre>
+    }
+    }</code></pre>
 
 <p>
     Of course, this is not a preferred solution,
@@ -2406,6 +2413,7 @@ public Subscription findSubscription(String host) {
 </p>
 
 <h3>Summary</h3>
+
 <p>
     At this point, we've booted the application, logged on,
     reviewed a Registration record, and edited a Subscription.
diff --git a/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java b/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java
index a2deef54f..69f2c4096 100644
--- a/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java
+++ b/apps/mailreader/src/test/java/mailreader2/BaseSqlMapTest.java
@@ -19,7 +19,7 @@ public class BaseSqlMapTest extends TestCase {
 
     protected SqlMapClient sqlMap;
 
-    protected  void initSqlMap(String configFile, Properties props) throws Exception {
+    protected void initSqlMap(String configFile, Properties props) throws Exception {
         Reader reader = Resources.getResourceAsReader(configFile);
         sqlMap = SqlMapClientBuilder.buildSqlMapClient(reader, props);
         reader.close();
diff --git a/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java b/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java
index cefcc4b6f..125e59637 100644
--- a/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java
+++ b/apps/mailreader/src/test/java/mailreader2/SqlMapTest.java
@@ -48,47 +48,47 @@ public class SqlMapTest extends BaseSqlMapTest {
 
     public void setUp() throws Exception {
         super.setUp();
-        input =  new AppData();
+        input = new AppData();
     }
 
     public void testLOCALE_LIST() throws Exception {
-        AppData output = (AppData) sqlMap.queryForObject(Constants.LOCALE_LIST,null);
+        AppData output = (AppData) sqlMap.queryForObject(Constants.LOCALE_LIST, null);
         assertNotNull(output);
     }
 
     public void testREGISTRATION_INSERT_ASSERT_fail() throws Exception {
         input.setUsername(username);
-        Object output = sqlMap.queryForObject(Constants.REGISTRATION_INSERT_ASSERT,input);
+        Object output = sqlMap.queryForObject(Constants.REGISTRATION_INSERT_ASSERT, input);
         Long count = (Long) output;
-        assertTrue("Expected user to already exist",count.intValue()>0);
+        assertTrue("Expected user to already exist", count.intValue() > 0);
     }
 
     public void testREGISTRATION_INSERT_ASSERT() throws Exception {
         input.setUsername(username2);
-        Object output = sqlMap.queryForObject(Constants.REGISTRATION_INSERT_ASSERT,input);
+        Object output = sqlMap.queryForObject(Constants.REGISTRATION_INSERT_ASSERT, input);
         Long count = (Long) output;
-        assertTrue("Did not expected user to exist",count.intValue()==0);
+        assertTrue("Did not expected user to exist", count.intValue() == 0);
     }
 
     public void testREGISTRATION_INSERT() throws Exception {
         input.setRegistration_key(registration_key2);
         input.setLocale_key(locale_key);
         input.setUsername(username2);
-        input.setPassword(password2 );
+        input.setPassword(password2);
         input.setFullname(fullname2);
         input.setEmail_from(email_from2);
         input.setEmail_replyto(email_replyto2);
-        sqlMap.insert(Constants.REGISTRATION_INSERT,input);
+        sqlMap.insert(Constants.REGISTRATION_INSERT, input);
         // Trust but verify
         input.setPassword(null);
-        AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_PASSWORD,input);
-        assertEquals(password2,output.getPassword());
+        AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_PASSWORD, input);
+        assertEquals(password2, output.getPassword());
     }
 
-    public void testREGISTRATION_PASSWORD()  throws Exception {
+    public void testREGISTRATION_PASSWORD() throws Exception {
         input.setUsername(username);
-        AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_PASSWORD,input);
-        assertEquals(password,output.getPassword());
+        AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_PASSWORD, input);
+        assertEquals(password, output.getPassword());
     }
 
     public void testREGISTRATION_FULLNAME() throws Exception {
@@ -96,13 +96,13 @@ public class SqlMapTest extends BaseSqlMapTest {
         AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_FULLNAME, input);
         assertEquals(fullname, output.getFullname());
         assertNull("Expected other fields to be null", output.getPassword());
-        assertNull("Expected other fields to be null",output.getEmail_from());
+        assertNull("Expected other fields to be null", output.getEmail_from());
     }
 
     public void testREGISTRATION_EDIT() throws Exception {
         input.setRegistration_key(registration_key);
         AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_EDIT, input);
-        assertNotNull("Registration not found!",output);
+        assertNotNull("Support not found!", output);
         assertEquals(fullname, output.getFullname());
         assertEquals(email_from, output.getEmail_from());
         assertEquals(email_replyto, output.getEmail_replyto());
@@ -111,36 +111,36 @@ public class SqlMapTest extends BaseSqlMapTest {
     public void testREGISTRATION_UPDATE() throws Exception {
         input.setRegistration_key(registration_key);
         input.setUsername(username2);
-        input.setPassword(password2 );
+        input.setPassword(password2);
         input.setFullname(fullname2);
         input.setEmail_from(email_from2);
         input.setEmail_replyto(email_replyto2);
-        sqlMap.update(Constants.REGISTRATION_UPDATE,input);
+        sqlMap.update(Constants.REGISTRATION_UPDATE, input);
         // Trust but verify
         input.setPassword(null);
-        AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_PASSWORD,input);
-        assertEquals(password2,output.getPassword());
+        AppData output = (AppData) sqlMap.queryForObject(Constants.REGISTRATION_PASSWORD, input);
+        assertEquals(password2, output.getPassword());
     }
 
     public void testREGISTRATION_UPDATE_fails() throws Exception {
         input.setRegistration_key(null);
-        sqlMap.update(Constants.REGISTRATION_UPDATE,input);
+        sqlMap.update(Constants.REGISTRATION_UPDATE, input);
     }
 
     public void testSUBSCRIPTION_INSERT_ASSERT_fail() throws Exception {
         input.setRegistration_key(registration_key);
         input.setSubscription_host(subscription_host);
-        Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT,input);
+        Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input);
         Long count = (Long) output;
-        assertTrue("Expected subscription to already exist",count.intValue()>0);
+        assertTrue("Expected subscription to already exist", count.intValue() > 0);
     }
 
     public void SUBSCRIPTION_INSERT_ASSERT() throws Exception {
         input.setSubscription_key(subscription_key2);
         input.setSubscription_host(subscription_host2);
-        Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT,input);
+        Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input);
         Long count = (Long) output;
-        assertTrue("Did not expect subscription to exist",count.intValue()==0);
+        assertTrue("Did not expect subscription to exist", count.intValue() == 0);
     }
 
     public void testSUBSCRIPTION_INSERT() throws Exception {
@@ -151,27 +151,27 @@ public class SqlMapTest extends BaseSqlMapTest {
         input.setHost_user(host_user2);
         input.setHost_pass(host_pass2);
         input.setHost_auto(host_auto2);
-        sqlMap.insert(Constants.SUBSCRIPTION_INSERT,input);
+        sqlMap.insert(Constants.SUBSCRIPTION_INSERT, input);
         // Trust but verify
-        Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT,input);
+        Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input);
         Long count = (Long) output;
-        assertTrue("Expected subscription to NOW exist",count.intValue()>0);
+        assertTrue("Expected subscription to NOW exist", count.intValue() > 0);
     }
 
-   private void assertSubscription(AppData output) throws Exception {
-       assertEquals(host_user, output.getHost_user());
-       assertEquals(host_pass, output.getHost_pass());
-       assertEquals(protocol_name, output.getProtocol_name());
-       assertEquals(host_auto,output.getHost_auto());
-       assertFalse(output.isHost_auto_checkbox());
-   }
+    private void assertSubscription(AppData output) throws Exception {
+        assertEquals(host_user, output.getHost_user());
+        assertEquals(host_pass, output.getHost_pass());
+        assertEquals(protocol_name, output.getProtocol_name());
+        assertEquals(host_auto, output.getHost_auto());
+        assertFalse(output.isHost_auto_checkbox());
+    }
 
     public void testSUBSCRIPTION_LIST() throws Exception {
         input.setRegistration_key(registration_key);
-        Object output = sqlMap.queryForList(Constants.SUBSCRIPTION_LIST,input);
-        assertNotNull("Query failed!",output);
+        Object output = sqlMap.queryForList(Constants.SUBSCRIPTION_LIST, input);
+        assertNotNull("Query failed!", output);
         List list = (List) output;
-        assertEquals(SAMPLE_SIZE,list.size());
+        assertEquals(SAMPLE_SIZE, list.size());
         AppData row1 = (AppData) list.get(0);
         assertSubscription(row1);
     }
@@ -179,7 +179,7 @@ public class SqlMapTest extends BaseSqlMapTest {
     public void testSUBSCRIPTION_EDIT() throws Exception {
         input.setSubscription_key(subscription_key);
         AppData output = (AppData) sqlMap.queryForObject(Constants.SUBSCRIPTION_EDIT, input);
-        assertNotNull("Subscription not found!",output);
+        assertNotNull("Support not found!", output);
         assertSubscription(output);
     }
 
@@ -191,11 +191,11 @@ public class SqlMapTest extends BaseSqlMapTest {
         input.setHost_user(host_user2);
         input.setHost_pass(host_pass2);
         input.setHost_auto(host_auto2);
-        sqlMap.update(Constants.SUBSCRIPTION_UPDATE,input);
+        sqlMap.update(Constants.SUBSCRIPTION_UPDATE, input);
         // Trust but verify
-        Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT,input);
+        Object output = sqlMap.queryForObject(Constants.SUBSCRIPTION_INSERT_ASSERT, input);
         Long count = (Long) output;
-        assertTrue("Expected subscription to exist",count.intValue()>0);
+        assertTrue("Expected subscription to exist", count.intValue() > 0);
     }
 
 }