Index: src/test/java/org/apache/maven/continuum/web/action/TestAction.java
===================================================================
--- src/test/java/org/apache/maven/continuum/web/action/TestAction.java	(revision 422763)
+++ src/test/java/org/apache/maven/continuum/web/action/TestAction.java	(working copy)
@@ -1,5 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
 /*
  * Copyright 2001-2006 The Apache Software Foundation.
  *
@@ -24,10 +26,10 @@
  * @version: $ID$
  */
 public class TestAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     private String testString;
-   
+
     public String execute()
         throws Exception
     {
Index: src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java	(working copy)
@@ -19,6 +19,7 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -29,7 +30,7 @@
  *   role-hint="projectView"
  */
 public class ProjectViewAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java	(working copy)
@@ -18,6 +18,7 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -28,7 +29,7 @@
  *   role-hint="deleteNotification"
  */
 public class DeleteNotifierAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java	(working copy)
@@ -19,6 +19,7 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Schedule;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author Nik Gonzalez
@@ -28,7 +29,7 @@
  *   role-hint="editSchedule"
  */
 public class EditScheduleAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
 
     /**
Index: src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java	(working copy)
@@ -17,6 +17,7 @@
  */
 
 import org.apache.maven.continuum.Continuum;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -27,7 +28,7 @@
  *   role-hint="checkConfiguration"
  */
 public class CheckConfigurationAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java	(working copy)
@@ -19,6 +19,7 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Schedule;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author Nik Gonzalez
@@ -28,7 +29,7 @@
  *   role-hint="addSchedule"
  */
 public class AddScheduleAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/AbstractContinuumAction.java	(working copy)
@@ -1,71 +0,0 @@
-package org.apache.maven.continuum.web.action;
-
-/*
- * Copyright 2001-2006 The 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.
- */
-
-import org.codehaus.plexus.logging.LogEnabled;
-import org.codehaus.plexus.logging.Logger;
-import com.opensymphony.xwork.ActionSupport;
-
-/**
- * AbstractContinuumAction:
- *
- * @author: jesse
- * @date: Jul 13, 2006
- * @version: $ID$
- */
-public abstract class AbstractContinuumAction
-    extends ActionSupport
-    implements LogEnabled
-{
-    private Logger logger;
-
-    public void enableLogging( Logger logger )
-    {
-        this.logger = logger;
-    }
-
-    protected Logger getLogger()
-    {
-        return logger;
-    }
-
-    protected void setupLogger( Object component )
-    {
-        setupLogger( component, logger );
-    }
-
-    protected void setupLogger( Object component, String subCategory )
-    {
-        if ( subCategory == null )
-        {
-            throw new IllegalStateException( "Logging category must be defined." );
-        }
-
-        Logger logger = this.logger.getChildLogger( subCategory );
-
-        setupLogger( component, logger );
-    }
-
-    protected void setupLogger( Object component, Logger logger )
-    {
-        if ( component instanceof LogEnabled )
-        {
-            ( (LogEnabled) component ).enableLogging( logger );
-        }
-    }
-
-}
Index: src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java	(working copy)
@@ -19,6 +19,7 @@
 import com.opensymphony.xwork.Preparable;
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.configuration.ConfigurationStoringException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.io.File;
 
@@ -31,7 +32,7 @@
  *   role-hint="configuration"
  */
 public class ConfigurationAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
     implements Preparable
 {
     /**
Index: src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java	(working copy)
@@ -20,6 +20,7 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -33,7 +34,7 @@
  *   role-hint="addMavenOneProject"
  */
 public class AddMavenOneProjectAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/LoginAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/LoginAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/LoginAction.java	(working copy)
@@ -1,5 +1,7 @@
 package org.apache.maven.continuum.web.action;
 
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
+
 /*
  * Copyright 2004-2005 The Apache Software Foundation.
  *
@@ -25,7 +27,7 @@
  *   role-hint="login"
  */
 public class LoginAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     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 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java	(working copy)
@@ -19,6 +19,7 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.ProjectNotifier;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.Map;
 
@@ -27,7 +28,7 @@
  * @version $Id$
  */
 public abstract class AbstractNotifierEditAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     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 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java	(working copy)
@@ -19,10 +19,10 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.web.util.WorkingCopyContentGenerator;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import com.opensymphony.webwork.ServletActionContext;
 import com.opensymphony.webwork.views.util.UrlHelper;
-import com.opensymphony.xwork.ActionSupport;
 
 import java.util.HashMap;
 import java.util.List;
@@ -36,7 +36,7 @@
  *   role-hint="workingCopy"
  */
 public class WorkingCopyAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java	(working copy)
@@ -19,6 +19,7 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -29,7 +30,7 @@
  *   role-hint="projectEdit"
  */
 public class ProjectEditAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java	(working copy)
@@ -18,6 +18,7 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.Collection;
 
@@ -30,7 +31,7 @@
  *   role-hint="buildResultsList"
  */
 public class BuildResultsListAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java	(working copy)
@@ -16,12 +16,12 @@
  * 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;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.Schedule;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -37,7 +37,7 @@
  *   role-hint="buildDefinitionEdit"
  */
 public class BuildDefinitionEditAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java	(working copy)
@@ -19,6 +19,7 @@
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author Nick Gonzalez
@@ -29,7 +30,7 @@
  *   role-hint="addProject"
  */
 public class AddProjectAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java	(working copy)
@@ -20,6 +20,7 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.model.project.Schedule;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -35,7 +36,7 @@
  *   role-hint="addBuildDefinition"
  */
 public class AddBuildDefinitionAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java	(working copy)
@@ -18,6 +18,7 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -28,7 +29,7 @@
  *   role-hint="buildProject"
  */
 public class BuildProjectAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java	(working copy)
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-import com.opensymphony.xwork.ActionSupport;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -25,7 +25,7 @@
  * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addNotifierAction"
  */
 public class AddNotifierAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     private int projectId;
 
Index: src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java	(working copy)
@@ -18,9 +18,8 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
-import com.opensymphony.xwork.ActionSupport;
-
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @version $Id$
@@ -30,7 +29,7 @@
  *   role-hint="deleteProject"
  */
 public class DeleteProjectAction
-    extends ActionSupport
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java	(working copy)
@@ -18,6 +18,7 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 /**
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
@@ -28,7 +29,7 @@
  *   role-hint="deleteBuildDefinition"
  */
 public class DeleteBuildDefinitionAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java	(working copy)
@@ -18,6 +18,7 @@
 
 import org.apache.maven.continuum.Continuum;
 import org.apache.maven.continuum.ContinuumException;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.Collection;
 
@@ -29,7 +30,7 @@
  *   role-hint="schedule"
  */
 public class ScheduleAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java	(working copy)
@@ -20,6 +20,7 @@
 import org.apache.maven.continuum.model.project.BuildResult;
 import org.apache.maven.continuum.model.project.Project;
 import org.apache.maven.continuum.web.model.SummaryProjectModel;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,7 +37,7 @@
  *   role-hint="summary"
  */
 public class SummaryAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement
Index: src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java	(working copy)
@@ -16,10 +16,10 @@
  * 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 org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@
  *   role-hint="buildResult"
  */
 public class BuildResultAction
-    extends ActionSupport
+    extends PlexusActionSupport
 {
 
     /**
Index: src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java
===================================================================
--- src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java	(revision 422763)
+++ src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java	(working copy)
@@ -20,6 +20,7 @@
 import org.apache.maven.continuum.ContinuumException;
 import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.xwork.action.PlexusActionSupport;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -33,7 +34,7 @@
  *   role-hint="addMavenTwoProject"
  */
 public class AddMavenTwoProjectAction
-    extends AbstractContinuumAction
+    extends PlexusActionSupport
 {
     /**
      * @plexus.requirement