Index: src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java	(working copy)
@@ -20,15 +20,20 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="projectView"
  */
 public class ProjectViewAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private Project project;
Index: src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java	(working copy)
@@ -19,15 +19,20 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="deleteNotification"
  */
 public class DeleteNotifierAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private int projectId;
Index: src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java	(working copy)
@@ -20,15 +20,20 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Schedule;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author Nik Gonzalez
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="editSchedule"
  */
 public class EditScheduleAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
 
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private Schedule schedule;
Index: src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/MsnNotifierEditAction.java	(working copy)
@@ -24,6 +24,10 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="msnNotifierEdit"
  */
 public class MsnNotifierEditAction
     extends AbstractNotifierEditAction
Index: src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java	(working copy)
@@ -18,15 +18,20 @@
 
 import org.apache.maven.continuum.Continuum;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="checkConfiguration"
  */
 public class CheckConfigurationAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     public String execute()
Index: src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java	(working copy)
@@ -20,14 +20,19 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Schedule;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author Nik Gonzalez
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="addSchedule"
  */
 public class AddScheduleAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private boolean active = true;
Index: src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java	(working copy)
@@ -16,22 +16,27 @@
  * limitations under the License.
  */
 
+import com.opensymphony.xwork.Preparable;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.configuration.ConfigurationStoringException;
 
 import java.io.File;
 
-import com.opensymphony.xwork.ActionSupport;
-import com.opensymphony.xwork.Preparable;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="configuration"
  */
 public class ConfigurationAction
-    extends ActionSupport
+    extends AbstractContinuumAction
     implements Preparable
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private boolean guestAccountEnabled;
Index: src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java	(working copy)
@@ -24,15 +24,20 @@
 import java.io.File;
 import java.net.MalformedURLException;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author Nick Gonzalez
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="addMavenOneProject"
  */
 public class AddMavenOneProjectAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private String m1PomUrl;
Index: src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/LoginAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/LoginAction.java	(working copy)
@@ -16,20 +16,16 @@
  * limitations under the License.
  */
 
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import com.opensymphony.webwork.ServletActionContext;
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="login"
  */
 public class LoginAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
     private String username = "";
 
Index: src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java	(working copy)
@@ -22,14 +22,12 @@
 
 import java.util.Map;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
  */
 public abstract class AbstractNotifierEditAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
     private Continuum continuum;
 
Index: src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java	(working copy)
@@ -30,12 +30,22 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="workingCopy"
  */
 public class WorkingCopyAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
+    /**
+     * @plexus.requirement
+     */
     private WorkingCopyContentGenerator generator;
 
     private int projectId;
@@ -137,4 +147,4 @@
     {
         return currentFileContent;
     }
-}
\ No newline at end of file
+}
Index: src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java	(working copy)
@@ -20,15 +20,20 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="projectEdit"
  */
 public class ProjectEditAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private Project project;
Index: src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java	(working copy)
@@ -19,17 +19,22 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 
-import com.opensymphony.xwork.ActionSupport;
-
 import java.util.Collection;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="buildResultsList"
  */
 public class BuildResultsListAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private Collection buildResults;
@@ -80,4 +85,4 @@
     {
         return buildResults;
     }
-}
\ No newline at end of file
+}
Index: src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java	(working copy)
@@ -16,6 +16,7 @@
  * limitations under the License.
  */
 
+import com.opensymphony.xwork.ActionSupport;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.BuildDefinition;
@@ -27,15 +28,20 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="buildDefinitionEdit"
  */
 public class BuildDefinitionEditAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private BuildDefinition bd;
Index: src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java	(working copy)
@@ -20,15 +20,20 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author Nick Gonzalez
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="addProject"
  */
 public class AddProjectAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private String projectName;
Index: src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java	(working copy)
@@ -26,15 +26,20 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="addBuildDefinition"
  */
 public class AddBuildDefinitionAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private Project project;
Index: src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/IrcNotifierEditAction.java	(working copy)
@@ -24,6 +24,10 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="ircNotifierEdit"
  */
 public class IrcNotifierEditAction
     extends AbstractNotifierEditAction
Index: src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java	(working copy)
@@ -19,15 +19,20 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="buildProject"
  */
 public class BuildProjectAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private int projectId;
@@ -66,4 +71,4 @@
     {
         return projectId;
     }
-}
\ No newline at end of file
+}
Index: src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java	(working copy)
@@ -21,9 +21,11 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addNotifierAction"
  */
 public class AddNotifierAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
     private int projectId;
 
Index: src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/MailNotifierEditAction.java	(working copy)
@@ -24,6 +24,10 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="MailNotifierEdit"
  */
 public class MailNotifierEditAction
     extends AbstractNotifierEditAction
Index: src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java	(working copy)
@@ -24,10 +24,17 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="deleteProject"
  */
 public class DeleteProjectAction
     extends ActionSupport
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private int projectId;
@@ -76,4 +83,4 @@
     {
         return projectName;
     }
-}
\ No newline at end of file
+}
Index: src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java	(working copy)
@@ -19,15 +19,20 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="deleteBuildDefinition"
  */
 public class DeleteBuildDefinitionAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private int projectId;
@@ -76,4 +81,4 @@
     {
         return buildDefinitionId;
     }
-}
\ No newline at end of file
+}
Index: src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/JabberNotifierEditAction.java	(working copy)
@@ -24,6 +24,10 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="jabberNotifierEdit"
  */
 public class JabberNotifierEditAction
     extends AbstractNotifierEditAction
Index: src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java	(working copy)
@@ -16,20 +16,24 @@
  * limitations under the License.
  */
 
-import java.util.Collection;
-
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 
-import com.opensymphony.xwork.ActionSupport;
+import java.util.Collection;
 
 /**
  * @author Nik Gonzalez
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="schedule"
  */
 public class ScheduleAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
-
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private Collection schedules;
Index: src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java	(working copy)
@@ -21,8 +21,6 @@
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.web.model.SummaryProjectModel;
 
-import com.opensymphony.xwork.ActionSupport;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -32,10 +30,17 @@
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="summary"
  */
 public class SummaryAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private int nbSuccesses;
Index: src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java	(working copy)
@@ -16,21 +16,28 @@
  * limitations under the License.
  */
 
+import com.opensymphony.xwork.ActionSupport;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.BuildResult;
 
 import java.util.List;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="buildResult"
  */
 public class BuildResultAction
     extends ActionSupport
 {
+
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private BuildResult buildResult;
Index: src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java	(revision 422576)
+++ src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java	(working copy)
@@ -24,15 +24,20 @@
 import java.io.File;
 import java.net.MalformedURLException;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author Nick Gonzalez
  * @version $Id$
+ *
+ * @plexus.component
+ *   role="com.opensymphony.xwork.Action"
+ *   role-hint="addMavenTwoProject"
  */
 public class AddMavenTwoProjectAction
-    extends ActionSupport
+    extends AbstractContinuumAction
 {
+    /**
+     * @plexus.requirement
+     */
     private Continuum continuum;
 
     private String m2PomUrl;
Index: src/main/resources/plexus-request.xml
===================================================================
--- src/main/resources/plexus-request.xml	(revision 422576)
+++ src/main/resources/plexus-request.xml	(working copy)
@@ -256,5 +256,35 @@
         </requirement>
       </requirements>
     </component>
+    <component>
+      <role>com.opensymphony.xwork.Action</role>
+      <role-hint>users</role-hint>
+      <implementation>org.apache.maven.continuum.web.action.UsersAction</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.Continuum</role>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>com.opensymphony.xwork.Action</role>
+      <role-hint>editUser</role-hint>
+      <implementation>org.apache.maven.continuum.web.action.EditUserAction</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.Continuum</role>
+        </requirement>
+      </requirements>
+    </component>
+    <component>
+      <role>com.opensymphony.xwork.Action</role>
+      <role-hint>deleteUser</role-hint>
+      <implementation>org.apache.maven.continuum.web.action.DeleteUserAction</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.continuum.Continuum</role>
+        </requirement>
+      </requirements>
+    </component>
   </components>
 </plexus>
\ No newline at end of file
Index: src/main/resources/xwork.xml
===================================================================
--- src/main/resources/xwork.xml	(revision 422576)
+++ src/main/resources/xwork.xml	(working copy)
@@ -26,25 +26,25 @@
       <result name="error">error.jsp</result>
     </global-results>
 
-    <action name="checkConfiguration" class="checkConfigurationAction">
+    <action name="checkConfiguration" class="checkConfiguration">
       <result name="input">/redirectToContinuumInitialization.jsp</result>
     </action>
 
-    <action name="configuration" class="configurationAction">
+    <action name="configuration" class="configuration">
       <result name="input">configurationEdit.jsp</result>
       <result name="success">configuration.jsp</result>
     </action>
 
-    <action name="companyInfo" class="configurationAction">
+    <action name="companyInfo" class="configuration">
       <result name="success">/components/companyLogo.jsp</result>
     </action>
 
-    <action name="login" class="loginAction">
+    <action name="login" class="login">
       <result name="input">login.jsp</result>
       <result name="success" type="redirect">summary.action</result>
     </action>
 
-    <action name="summary" class="summaryAction">
+    <action name="summary" class="summary">
       <result name="success">summary.jsp</result>
     </action>
 
@@ -184,5 +184,19 @@
       <result name="success" type="chain">schedules</result>
     </action>
 
+    <action name="users" class="users">
+      <result name="success">users.jsp</result>
+    </action>
+
+    <action name="editUser" class="editUser">
+      <result name="input">editUser.jsp</result>
+      <result name="success" type="chain">users</result>
+    </action>
+
+    <action name="deleteUser" class="deleteUser">
+      <result name="delete">deleteUser.jsp</result>
+      <result name="success" type="chain">users</result>
+    </action>
+
   </package>
 </xwork>
Index: src/main/webapp/editUser.jsp
===================================================================
--- src/main/webapp/editUser.jsp	(revision 422576)
+++ src/main/webapp/editUser.jsp	(working copy)
@@ -3,7 +3,7 @@
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="editUser.page.title"/></title>
+      <title><ww:text name="editUser.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
@@ -13,9 +13,10 @@
           <ww:form action="editUser.action" method="post">
             <table>
               <tbody>
-                <ww:hidden name="userId"/>
+                <ww:hidden name="addMode"/>
+                <ww:hidden name="accountId"/>
                 <ww:textfield label="%{getText('user.username')}" name="username" required="true"/>
-                <ww:textfield label="%{getText('user.password')}" name="password" required="true"/>
+                <ww:password label="%{getText('user.password')}" name="password" required="true"/>
                 <ww:textfield label="%{getText('user.email')}" name="email" required="true"/>
               </tbody>
             </table>
Index: src/main/webapp/users.jsp
===================================================================
--- src/main/webapp/users.jsp	(revision 422576)
+++ src/main/webapp/users.jsp	(working copy)
@@ -3,7 +3,7 @@
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="users.page.title"/></title>
+      <title><ww:text name="users.page.title"/></title>
     </head>
     <body>
       <div id="h3">
@@ -15,19 +15,19 @@
                   showPagination="false"
                   showStatusBar="false"
                   filterable="false">
-         <ec:row>
+          <ec:row>
             <ec:column property="username" title="user.username"/>
             <ec:column property="email" title="user.email"/>
             <ec:column property="actions" title="&nbsp;">
-                <a href="${pageContext.request.contextPath}/editUser!edit.action?id=${pageScope.user.id}"><ww:text name="edit"/></a>
-                &nbsp;
-                <ww:text name="delete"/>
+              <a href="${pageContext.request.contextPath}/editUser!doEdit.action?accountId=${pageScope.user.accountId}"><ww:text name="edit"/></a>
+              &nbsp;
+              <a href="${pageContext.request.contextPath}/deleteUser!doDelete.action?accountId=${pageScope.user.accountId}&username=${pageScope.user.username}"><ww:text name="delete"/></a>
             </ec:column>
           </ec:row>
         </ec:table>
       </div>
       <div class="functnbar3">
-        <ww:form action="addUser!default.action" method="post">
+        <ww:form action="editUser!doAdd.action" method="post">
           <ww:submit value="%{getText('add')}"/>
         </ww:form>
     </div>
Index: src/main/webapp/deleteUser.jsp
===================================================================
--- src/main/webapp/deleteUser.jsp	(revision 422576)
+++ src/main/webapp/deleteUser.jsp	(working copy)
@@ -3,7 +3,7 @@
 <html>
   <ww:i18n name="localization.Continuum">
     <head>
-        <title><ww:text name="deleteUser.page.title"/></title>
+      <title><ww:text name="deleteUser.page.title"/></title>
     </head>
     <body>
       <div id="axial" class="h3">
@@ -12,15 +12,15 @@
         <div class="warningmessage">
           <p>
             <strong>
-                <ww:text name="deleteUser.confirmation.message">
-                    <ww:param><ww:property value="username"/></ww:param>
-                </ww:text>
+              <ww:text name="deleteUser.confirmation.message">
+                <ww:param><ww:property value="username"/></ww:param>
+              </ww:text>
             </strong>
           </p>
         </div>
         <div class="functnbar3">
           <ww:form action="deleteUser.action" method="post">
-            <ww:hidden name="userId"/>
+            <ww:hidden name="accountId"/>
             <c1:submitcancel value="%{getText('delete')}" cancel="%{getText('cancel')}"/>
           </ww:form>
         </div>
Index: pom.xml
===================================================================
--- pom.xml	(revision 422576)
+++ pom.xml	(working copy)
@@ -1,7 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project>
   <parent>
     <artifactId>continuum-parent</artifactId>
     <groupId>org.apache.maven.continuum</groupId>
@@ -12,6 +9,13 @@
   <name>Continuum Web APP</name>
   <version>1.1-SNAPSHOT</version>
   <packaging>war</packaging>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>mortbay-repo</id>
+      <name>mortbay-repo</name>
+      <url>http://www.mortbay.org/maven2/snapshot</url>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <filters>
       <filter>src/main/filters/filter.properties</filter>
@@ -32,6 +36,31 @@
         </excludes>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-maven-plugin</artifactId>
+        <configuration>
+          <fileName>plexus-request.xml</fileName>
+          <containerDescriptor>true</containerDescriptor>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>descriptor</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty6-plugin</artifactId>
+        <configuration>
+          <scanIntervalSeconds>10</scanIntervalSeconds>
+          <contextPath>/</contextPath>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
   <dependencies>
     <dependency>
@@ -152,9 +181,5 @@
       <artifactId>wagon-ssh</artifactId>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.continuum</groupId>
-      <artifactId>continuum-security-acegi</artifactId>
-    </dependency>
   </dependencies>
 </project>