Index: src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (working copy) @@ -16,10 +16,8 @@ * limitations under the License. */ -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 Emmanuel Venisse @@ -30,12 +28,8 @@ * role-hint="projectView" */ public class ProjectViewAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/DeleteNotifierAction.java (working copy) @@ -18,7 +18,7 @@ import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; +import org.apache.maven.continuum.web.action.ContinuumActionSupport; /** * @author Emmanuel Venisse @@ -29,12 +29,8 @@ * role-hint="deleteNotifier" */ public class DeleteNotifierAction - extends PlexusActionSupport -{ - /** - * @plexus.requirement - */ - private Continuum continuum; + extends ContinuumActionSupport +{ 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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/EditScheduleAction.java (working copy) @@ -19,7 +19,6 @@ 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 @@ -29,14 +28,9 @@ * role-hint="editSchedule" */ public class EditScheduleAction - extends PlexusActionSupport -{ + extends ContinuumActionSupport +{ - /** - * @plexus.requirement - */ - private Continuum continuum; - private Schedule schedule; private int id; Index: src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/CheckConfigurationAction.java (working copy) @@ -16,9 +16,6 @@ * limitations under the License. */ -import org.apache.maven.continuum.Continuum; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; - /** * @author Emmanuel Venisse * @version $Id$ @@ -28,12 +25,8 @@ * role-hint="checkConfiguration" */ public class CheckConfigurationAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/AddScheduleAction.java (working copy) @@ -19,7 +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; +import org.apache.maven.continuum.web.action.ContinuumActionSupport; /** * @author Nik Gonzalez @@ -29,12 +29,8 @@ * role-hint="addSchedule" */ public class AddScheduleAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/ConfigurationAction.java (working copy) @@ -90,7 +90,8 @@ try { - continuum.getConfiguration().store(); + continuum.getConfiguration().setInitialized( true ); + continuum.getConfiguration().store(); } catch ( ConfigurationStoringException e ) { Index: src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/AddMavenOneProjectAction.java (working copy) @@ -20,7 +20,6 @@ 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; @@ -34,12 +33,8 @@ * role-hint="addMavenOneProject" */ public class AddMavenOneProjectAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/LoginAction.java (working copy) @@ -1,7 +1,5 @@ package org.apache.maven.continuum.web.action; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; - /* * Copyright 2004-2005 The Apache Software Foundation. * @@ -27,7 +25,7 @@ * role-hint="login" */ public class LoginAction - extends PlexusActionSupport + extends ContinuumActionSupport { 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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/AbstractNotifierEditAction.java (working copy) @@ -19,7 +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 org.apache.maven.continuum.web.action.ContinuumActionSupport; import java.util.Map; @@ -28,7 +28,7 @@ * @version $Id$ */ public abstract class AbstractNotifierEditAction - extends PlexusActionSupport + extends ContinuumActionSupport { private Continuum continuum; Index: src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/GroupSummaryAction.java (working copy) @@ -1,18 +1,16 @@ package org.apache.maven.continuum.web.action; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; -import org.apache.maven.continuum.Continuum; -import org.apache.maven.continuum.web.model.ProjectSummary; -import org.apache.maven.continuum.web.model.GroupSummary; -import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.project.BuildResult; +import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.model.project.ProjectGroup; +import org.apache.maven.continuum.web.model.GroupSummary; +import org.apache.maven.continuum.web.model.ProjectSummary; -import java.util.List; -import java.util.Collection; -import java.util.Map; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; +import java.util.List; +import java.util.Map; /* * Copyright 2005 The Codehaus. * @@ -32,136 +30,119 @@ /** * @author Emmanuel Venisse * @version $Id$ - * - * @plexus.component - * role="com.opensymphony.xwork.Action" - * role-hint="groupSummary" + * @plexus.component role="com.opensymphony.xwork.Action" + * role-hint="groupSummary" */ public class GroupSummaryAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @plexus.requirement - */ - private Continuum continuum; - - private List groups; public String execute() throws Exception { - try + groups = new ArrayList(); + + Collection projectGroups = continuum.getAllProjectGroupsWithProjects(); + + for ( Iterator j = projectGroups.iterator(); j.hasNext(); ) { - groups = new ArrayList(); + ProjectGroup projectGroup = (ProjectGroup) j.next(); - Collection projectGroups = continuum.getAllProjectGroupsWithProjects(); + getLogger().info( "GroupSummaryAction: building group " + projectGroup.getName() ); - for ( Iterator j = projectGroups.iterator(); j.hasNext(); ) - { - ProjectGroup projectGroup = (ProjectGroup) j.next(); + GroupSummary groupModel = new GroupSummary(); + groupModel.setId( projectGroup.getId() ); + groupModel.setGroupId( projectGroup.getGroupId() ); + groupModel.setName( projectGroup.getName() ); + groupModel.setDescription( projectGroup.getDescription() ); - getLogger().info("GroupSummaryAction: building group " + projectGroup.getName() ); + //TODO: Create a summary jpox request so code will be more simple and performance will be better + Collection projects = projectGroup.getProjects(); - GroupSummary groupModel = new GroupSummary(); - groupModel.setId( projectGroup.getId() ); - groupModel.setGroupId( projectGroup.getGroupId() ); - groupModel.setName( projectGroup.getName() ); - groupModel.setDescription( projectGroup.getDescription() ); + Map buildResults = continuum.getLatestBuildResults(); - //TODO: Create a summary jpox request so code will be more simple and performance will be better - Collection projects = projectGroup.getProjects(); + Map buildResultsInSuccess = continuum.getBuildResultsInSuccess(); - Map buildResults = continuum.getLatestBuildResults(); + List projectModels = new ArrayList(); + int numSuccesses = 0; + int numFailures = 0; + int numErrors = 0; - Map buildResultsInSuccess = continuum.getBuildResultsInSuccess(); + for ( Iterator i = projects.iterator(); i.hasNext(); ) + { + Project project = (Project) i.next(); - List projectModels = new ArrayList(); - int numSuccesses = 0; - int numFailures = 0; - int numErrors = 0; + ProjectSummary model = new ProjectSummary(); - for ( Iterator i = projects.iterator(); i.hasNext(); ) - { - Project project = (Project) i.next(); + getLogger().info( "GroupSummaryAction: building project model " + project.getName() ); - ProjectSummary model = new ProjectSummary(); + model.setId( project.getId() ); - getLogger().info("GroupSummaryAction: building project model " + project.getName() ); + model.setName( project.getName() ); - model.setId( project.getId() ); + model.setVersion( project.getVersion() ); - model.setName( project.getName() ); + model.setProjectGroupName( project.getProjectGroup().getName() ); - model.setVersion( project.getVersion() ); + if ( continuum.isInBuildingQueue( project.getId() ) || continuum.isInCheckoutQueue( project.getId() ) ) + { + model.setInQueue( true ); + } + else + { + model.setInQueue( false ); + } - model.setProjectGroupName( project.getProjectGroup().getName() ); + model.setState( project.getState() ); - if ( continuum.isInBuildingQueue( project.getId() ) || - continuum.isInCheckoutQueue( project.getId() ) ) - { - model.setInQueue( true ); - } - else - { - model.setInQueue( false ); - } + if ( project.getState() == 2 ) + { + numSuccesses++; + } + else if ( project.getState() == 3 ) + { + numFailures++; + } + else if ( project.getState() == 4 ) + { + numErrors++; + } - model.setState( project.getState() ); + model.setBuildNumber( project.getBuildNumber() ); - if ( project.getState() == 2 ) + if ( buildResultsInSuccess != null ) + { + BuildResult buildInSuccess = + (BuildResult) buildResultsInSuccess.get( new Integer( project.getId() ) ); + + if ( buildInSuccess != null ) { - numSuccesses++; + model.setBuildInSuccessId( buildInSuccess.getId() ); } - else if ( project.getState() == 3 ) - { - numFailures++; - } - else if ( project.getState() == 4 ) - { - numErrors++; - } + } - model.setBuildNumber( project.getBuildNumber() ); + if ( buildResults != null ) + { + BuildResult latestBuild = (BuildResult) buildResults.get( new Integer( project.getId() ) ); - if ( buildResultsInSuccess != null ) + if ( latestBuild != null ) { - BuildResult buildInSuccess = - (BuildResult) buildResultsInSuccess.get( new Integer( project.getId() ) ); - - if ( buildInSuccess != null ) - { - model.setBuildInSuccessId( buildInSuccess.getId() ); - } + model.setLatestBuildId( latestBuild.getId() ); } - - if ( buildResults != null ) - { - BuildResult latestBuild = (BuildResult) buildResults.get( new Integer( project.getId() ) ); - - if ( latestBuild != null ) - { - model.setLatestBuildId( latestBuild.getId() ); - } - } - getLogger().info( "GroupSummaryAction: adding model to group " + model.getName() ); - projectModels.add( model ); } - - groupModel.setNumSuccesses( numSuccesses ); - groupModel.setNumFailures( numFailures ); - groupModel.setNumErrors( numErrors ); - groupModel.setProjects( projectModels ); - getLogger().info( "GroupSummaryAction: adding group to groups list " + groupModel.getName() ); - groups.add( groupModel ); + getLogger().info( "GroupSummaryAction: adding model to group " + model.getName() ); + projectModels.add( model ); } + groupModel.setNumSuccesses( numSuccesses ); + groupModel.setNumFailures( numFailures ); + groupModel.setNumErrors( numErrors ); + groupModel.setProjects( projectModels ); + getLogger().info( "GroupSummaryAction: adding group to groups list " + groupModel.getName() ); + groups.add( groupModel ); } - catch ( Exception e ) - { - e.printStackTrace(); - } return SUCCESS; } Index: src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/WorkingCopyAction.java (working copy) @@ -19,7 +19,7 @@ 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 org.apache.maven.continuum.web.action.ContinuumActionSupport; import com.opensymphony.webwork.ServletActionContext; import com.opensymphony.webwork.views.util.UrlHelper; @@ -36,16 +36,11 @@ * role-hint="workingCopy" */ public class WorkingCopyAction - extends PlexusActionSupport + extends ContinuumActionSupport { /** * @plexus.requirement */ - private Continuum continuum; - - /** - * @plexus.requirement - */ private WorkingCopyContentGenerator generator; private int projectId; Index: src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (working copy) @@ -16,10 +16,8 @@ * limitations under the License. */ -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 Emmanuel Venisse @@ -30,12 +28,8 @@ * role-hint="projectEdit" */ public class ProjectEditAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/BuildResultsListAction.java (working copy) @@ -16,9 +16,7 @@ * limitations under the License. */ -import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; import java.util.Collection; @@ -31,13 +29,8 @@ * role-hint="buildResults" */ public class BuildResultsListAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @plexus.requirement - */ - private Continuum continuum; - private Collection buildResults; private int projectId; Index: src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (revision 0) +++ src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java (revision 0) @@ -0,0 +1,60 @@ +package org.apache.maven.continuum.web.action; + +import org.codehaus.plexus.xwork.action.PlexusActionSupport; +import org.apache.maven.continuum.Continuum; +import org.apache.maven.continuum.initialization.ContinuumInitializationException; +import com.opensymphony.xwork.Preparable; +/* + * Copyright 2005 The Codehaus. + * + * 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. + */ + +/** + * ContinuumActionSupport: + * + * @author: Jesse McConnell + * @version: $ID:$ + */ +public class ContinuumActionSupport + extends PlexusActionSupport + implements Preparable +{ + + /** + * @plexus.requirement + */ + protected Continuum continuum; + + public void prepare() + throws Exception + { + getLogger().info("checking the continuum configuration"); + + if ( !continuum.getConfiguration().isInitialized() ) + { + throw new ContinuumInitializationException( "continuum not initialized" ); + } + + } + + public Continuum getContinuum() + { + return continuum; + } + + public void setContinuum( Continuum continuum ) + { + this.continuum = continuum; + } +} Property changes on: src/main/java/org/apache/maven/continuum/web/action/ContinuumActionSupport.java ___________________________________________________________________ Name: svn:eol-style + native Index: src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java (working copy) @@ -21,7 +21,6 @@ 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,12 +36,8 @@ * role-hint="buildDefinitionEdit" */ public class BuildDefinitionEditAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (working copy) @@ -16,10 +16,8 @@ * limitations under the License. */ -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 @@ -30,12 +28,8 @@ * role-hint="addProject" */ public class AddProjectAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java (working copy) @@ -16,11 +16,9 @@ * limitations under the License. */ -import org.apache.maven.continuum.Continuum; 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; @@ -36,12 +34,8 @@ * role-hint="addBuildDefinition" */ public class AddBuildDefinitionAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @plexus.requirement - */ - private Continuum continuum; private Project project; Index: src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/BuildProjectAction.java (working copy) @@ -16,9 +16,7 @@ * limitations under the License. */ -import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; /** * @author Emmanuel Venisse @@ -29,12 +27,8 @@ * role-hint="buildProject" */ public class BuildProjectAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @plexus.requirement - */ - private Continuum continuum; private int projectId; Index: src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/AddNotifierAction.java (working copy) @@ -16,8 +16,6 @@ * limitations under the License. */ -import org.codehaus.plexus.xwork.action.PlexusActionSupport; - /** * @author Emmanuel Venisse * @version $Id$ @@ -25,7 +23,7 @@ * @plexus.component role="com.opensymphony.xwork.Action" role-hint="addNotifier" */ public class AddNotifierAction - extends PlexusActionSupport + extends ContinuumActionSupport { 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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/DeleteProjectAction.java (working copy) @@ -16,9 +16,7 @@ * limitations under the License. */ -import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; /** * @author Emmanuel Venisse @@ -29,13 +27,8 @@ * role-hint="deleteProject" */ public class DeleteProjectAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @plexus.requirement - */ - private Continuum continuum; - private int projectId; private String projectName; Index: src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java (working copy) @@ -16,9 +16,7 @@ * limitations under the License. */ -import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; /** * @author Emmanuel Venisse @@ -29,13 +27,8 @@ * role-hint="deleteBuildDefinition" */ public class DeleteBuildDefinitionAction - extends PlexusActionSupport -{ - /** - * @plexus.requirement - */ - private Continuum continuum; - + extends ContinuumActionSupport +{ private int projectId; private int buildDefinitionId; Index: src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java =================================================================== --- src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (revision 430139) +++ src/main/java/org/apache/maven/continuum/web/action/ScheduleAction.java (working copy) @@ -16,9 +16,7 @@ * limitations under the License. */ -import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.ContinuumException; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; import java.util.Collection; @@ -30,12 +28,8 @@ * role-hint="schedules" */ public class ScheduleAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/SummaryAction.java (working copy) @@ -16,11 +16,9 @@ * limitations under the License. */ -import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.model.project.BuildResult; import org.apache.maven.continuum.model.project.Project; import org.apache.maven.continuum.web.model.ProjectSummary; -import org.codehaus.plexus.xwork.action.PlexusActionSupport; import java.util.ArrayList; import java.util.Collection; @@ -37,13 +35,8 @@ * role-hint="summary" */ public class SummaryAction - extends PlexusActionSupport -{ - /** - * @plexus.requirement - */ - private Continuum continuum; - + extends ContinuumActionSupport +{ private int projectGroupId = -1; 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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/BuildResultAction.java (working copy) @@ -16,10 +16,8 @@ * limitations under the License. */ -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,13 +30,9 @@ * role-hint="buildResult" */ public class BuildResultAction - extends PlexusActionSupport + extends ContinuumActionSupport { - /** - * @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 430139) +++ src/main/java/org/apache/maven/continuum/web/action/AddMavenTwoProjectAction.java (working copy) @@ -16,11 +16,9 @@ * limitations under the License. */ -import org.apache.maven.continuum.Continuum; 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; @@ -34,12 +32,8 @@ * role-hint="addMavenTwoProject" */ public class AddMavenTwoProjectAction - extends PlexusActionSupport -{ - /** - * @plexus.requirement - */ - private Continuum continuum; + extends ContinuumActionSupport +{ private String m2PomUrl; Index: src/main/resources/xwork.xml =================================================================== --- src/main/resources/xwork.xml (revision 430139) +++ src/main/resources/xwork.xml (working copy) @@ -1,4 +1,4 @@ - + @@ -23,9 +24,15 @@ - error.jsp + error.jsp + /configuration!input.action + + + + + /redirectToContinuumInitialization.jsp