Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 71540 invoked from network); 23 Dec 2005 15:46:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 23 Dec 2005 15:46:59 -0000 Received: (qmail 40864 invoked by uid 500); 23 Dec 2005 15:46:58 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 40843 invoked by uid 500); 23 Dec 2005 15:46:58 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 40826 invoked by uid 99); 23 Dec 2005 15:46:58 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Dec 2005 07:46:57 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 23 Dec 2005 07:46:56 -0800 Received: (qmail 71383 invoked by uid 65534); 23 Dec 2005 15:46:35 -0000 Message-ID: <20051223154635.71372.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r358819 - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ continuum-webapp/src... Date: Fri, 23 Dec 2005 15:46:33 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Fri Dec 23 07:46:15 2005 New Revision: 358819 URL: http://svn.apache.org/viewcvs?rev=358819&view=rev Log: Add add/edit/delete build definition Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java (with props) maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java (with props) maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java (with props) maven/continuum/trunk/continuum-webapp/src/main/webapp/buildDefinitionEdit.jsp (with props) maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteBuildDefinition.jsp (with props) Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties maven/continuum/trunk/continuum-webapp/src/main/resources/xwork.xml maven/continuum/trunk/continuum-webapp/src/main/webapp/deleteProject.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/projectEdit.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/projectView.jsp Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=358819&r1=358818&r2=358819&view=diff ============================================================================== --- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original) +++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Fri Dec 23 07:46:15 2005 @@ -176,7 +176,13 @@ BuildDefinition getBuildDefinition( int projectId, int buildDefinitionId ) throws ContinuumException; + void updateBuildDefinition( BuildDefinition buildDefinition, int projectId ) + throws ContinuumException; + void updateBuildDefinition( int projectId, int buildDefinitionId, Map configuration ) + throws ContinuumException; + + void addBuildDefinition( int projectId, BuildDefinition buildDefinition ) throws ContinuumException; void addBuildDefinition( int projectId, Map configuration ) Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=358819&r1=358818&r2=358819&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Fri Dec 23 07:46:15 2005 @@ -965,36 +965,56 @@ return buildDefinition; } - public void updateBuildDefinition( int projectId, int buildDefinitionId, Map configuration ) + public void updateBuildDefinition( BuildDefinition buildDefinition, int projectId ) throws ContinuumException { - BuildDefinition buildDefinition = getBuildDefinition( projectId, buildDefinitionId ); + BuildDefinition bd = getBuildDefinition( projectId, buildDefinition.getId() ); - buildDefinition.setBuildFile( (String) configuration.get( "buildFile" ) ); + bd.setBuildFile( buildDefinition.getBuildFile() ); - buildDefinition.setGoals( (String) configuration.get( "goals" ) ); + bd.setGoals( buildDefinition.getGoals() ); - buildDefinition.setArguments( (String) configuration.get( "arguments" ) ); + bd.setArguments( buildDefinition.getArguments() ); - Schedule schedule = getSchedule( new Integer( (String) configuration.get( "schedule" ) ).intValue() ); + Schedule schedule = getSchedule( buildDefinition.getSchedule().getId() ); - buildDefinition.setSchedule( schedule ); + bd.setSchedule( schedule ); - if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) && !buildDefinition.isDefaultForProject() ) + if ( buildDefinition.isDefaultForProject() && !bd.isDefaultForProject() ) { - buildDefinition.setDefaultForProject( true ); + bd.setDefaultForProject( true ); - BuildDefinition bd = getDefaultBuildDefinition( projectId ); + BuildDefinition defaultBd = getDefaultBuildDefinition( projectId ); - if ( bd != null ) + if ( defaultBd != null ) { - bd.setDefaultForProject( false ); + defaultBd.setDefaultForProject( false ); - storeBuildDefinition( bd ); + storeBuildDefinition( defaultBd ); } } - storeBuildDefinition( buildDefinition ); + storeBuildDefinition( bd ); + } + + public void updateBuildDefinition( int projectId, int buildDefinitionId, Map configuration ) + throws ContinuumException + { + BuildDefinition buildDefinition = getBuildDefinition( projectId, buildDefinitionId ); + + buildDefinition.setBuildFile( (String) configuration.get( "buildFile" ) ); + + buildDefinition.setGoals( (String) configuration.get( "goals" ) ); + + buildDefinition.setArguments( (String) configuration.get( "arguments" ) ); + + Schedule schedule = getSchedule( new Integer( (String) configuration.get( "schedule" ) ).intValue() ); + + buildDefinition.setSchedule( schedule ); + + buildDefinition.setDefaultForProject( true ); + + updateBuildDefinition( buildDefinition, projectId ); } public BuildDefinition storeBuildDefinition( BuildDefinition buildDefinition ) @@ -1010,23 +1030,11 @@ } } - public void addBuildDefinition( int projectId, Map configuration ) + public void addBuildDefinition( int projectId, BuildDefinition buildDefinition ) throws ContinuumException { - BuildDefinition buildDefinition = new BuildDefinition(); - - buildDefinition.setBuildFile( (String) configuration.get( "buildFile" ) ); - - buildDefinition.setGoals( (String) configuration.get( "goals" ) ); - - buildDefinition.setArguments( (String) configuration.get( "arguments" ) ); - - Schedule schedule = getSchedule( new Integer( (String) configuration.get( "schedule" ) ).intValue() ); - - if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) ) + if ( buildDefinition.isDefaultForProject() ) { - buildDefinition.setDefaultForProject( true ); - BuildDefinition bd = getDefaultBuildDefinition( projectId ); if ( bd != null ) @@ -1037,13 +1045,34 @@ } } - buildDefinition.setSchedule( schedule ); - Project project = getProjectWithAllDetails( projectId ); project.addBuildDefinition( buildDefinition ); updateProject( project ); + } + + public void addBuildDefinition( int projectId, Map configuration ) + throws ContinuumException + { + BuildDefinition buildDefinition = new BuildDefinition(); + + buildDefinition.setBuildFile( (String) configuration.get( "buildFile" ) ); + + buildDefinition.setGoals( (String) configuration.get( "goals" ) ); + + buildDefinition.setArguments( (String) configuration.get( "arguments" ) ); + + Schedule schedule = getSchedule( new Integer( (String) configuration.get( "schedule" ) ).intValue() ); + + buildDefinition.setSchedule( schedule ); + + if ( convertBoolean( (String) configuration.get( "defaultForProject" ) ) ) + { + buildDefinition.setDefaultForProject( true ); + } + + addBuildDefinition( projectId, buildDefinition ); } public void removeBuildDefinition( int projectId, int buildDefinitionId ) Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java?rev=358819&view=auto ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java (added) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java Fri Dec 23 07:46:15 2005 @@ -0,0 +1,250 @@ +package org.apache.maven.continuum.web.action; + +/* + * Copyright 2004-2005 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.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.Profile; +import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.project.Schedule; + +import com.opensymphony.xwork.ActionSupport; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +/** + * @author Emmanuel Venisse + * @version $Id$ + */ +public class AddBuildDefinitionAction + extends ActionSupport +{ + private Continuum continuum; + + private Project project; + + private int projectId; + + private int buildDefinitionId; + + private boolean defaultForProject; + + private String goals; + + private String arguments; + + private String buildFile; + + private int scheduleId; + + private String scheduleName; + + private Map schedulesMap; + +// private Profile profile; + + public String execute() + { + try + { + BuildDefinition bd = new BuildDefinition(); + + bd.setGoals( goals ); + + bd.setBuildFile( buildFile ); + + bd.setArguments( arguments ); + + bd.setDefaultForProject( defaultForProject ); + + Schedule schedule = continuum.getSchedule( scheduleId ); + + bd.setSchedule( schedule ); + + continuum.addBuildDefinition( projectId, bd ); + } + catch ( ContinuumException e ) + { + addActionMessage( "Can't update build definition (id=" + buildDefinitionId + ") for project " + projectId + " : " + e.getMessage() ); + + e.printStackTrace(); + + return ERROR; + } + + return SUCCESS; + } + + public String doDefault() + { + try + { + project = continuum.getProject( projectId ); + } + catch ( ContinuumException e ) + { + addActionMessage( "Can't get project informations for project " + projectId + " : " + e.getMessage() ); + + e.printStackTrace(); + + return ERROR; + } + + try + { + initSchedulesMap(); + } + catch ( ContinuumException e ) + { + addActionMessage( "Can't get schedules list : " + e.getMessage() ); + + e.printStackTrace(); + + return ERROR; + } + + return INPUT; + } + + private void initSchedulesMap() + throws ContinuumException + { + Collection schedules = continuum.getSchedules(); + + for ( Iterator i = schedules.iterator(); i.hasNext(); ) + { + Schedule schedule = (Schedule) i.next(); + + if ( schedulesMap == null ) + { + schedulesMap = new HashMap(); + } + + schedulesMap.put( new Integer( schedule.getId() ), schedule.getName() ); + } + } + + private BuildDefinition getBuildDefinition() + throws ContinuumException + { + return continuum.getBuildDefinition( projectId, buildDefinitionId ); + } + + public Project getProject() + { + return project; + } + + public int getProjectId() + { + return projectId; + } + + public void setProjectId( int projectId ) + { + this.projectId = projectId; + } + + public int getBuildDefinitionId() + { + return buildDefinitionId; + } + + public void setBuildDefinitionId( int buildDefinitionId ) + { + this.buildDefinitionId = buildDefinitionId; + } + + public boolean isDefaultForProject() + { + return defaultForProject; + } + + public void setDefaultForProject( boolean defaultForProject ) + { + this.defaultForProject = defaultForProject; + } + + public String getGoals() + { + return goals; + } + + public void setGoals( String goals ) + { + this.goals = goals; + } + + public String getArguments() + { + return arguments; + } + + public void setArguments( String arguments ) + { + this.arguments = arguments; + } + + public String getBuildFile() + { + return buildFile; + } + + public void setBuildFile( String buildFile ) + { + this.buildFile = buildFile; + } + + public int getScheduleId() + { + return scheduleId; + } + + public void setScheduleId( int scheduleId ) + { + this.scheduleId = scheduleId; + } + + public String getScheduleName() + { + return scheduleName; + } + + public void setScheduleName( String scheduleName ) + { + this.scheduleName = scheduleName; + } + + public Map getSchedulesMap() + { + if ( schedulesMap == null ) + { + try + { + initSchedulesMap(); + } + catch( ContinuumException e ) + { + } + } + return schedulesMap; + } +} Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddBuildDefinitionAction.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java?rev=358819&view=auto ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java (added) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java Fri Dec 23 07:46:15 2005 @@ -0,0 +1,268 @@ +package org.apache.maven.continuum.web.action; + +/* + * Copyright 2004-2005 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.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.Profile; +import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.project.Schedule; + +import com.opensymphony.xwork.ActionSupport; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +/** + * @author Emmanuel Venisse + * @version $Id$ + */ +public class BuildDefinitionEditAction + extends ActionSupport +{ + private Continuum continuum; + + private BuildDefinition bd; + + private Project project; + + private int projectId; + + private int buildDefinitionId; + + private boolean defaultForProject; + + private String goals; + + private String arguments; + + private String buildFile; + + private int scheduleId; + + private String scheduleName; + + private Map schedulesMap; + +// private Profile profile; + + public String execute() + { + try + { + bd = getBuildDefinition(); + + bd.setGoals( goals ); + + bd.setBuildFile( buildFile ); + + bd.setArguments( arguments ); + + bd.setDefaultForProject( defaultForProject ); + + Schedule schedule = continuum.getSchedule( scheduleId ); + + bd.setSchedule( schedule ); + + continuum.updateBuildDefinition( bd, projectId ); + } + catch ( ContinuumException e ) + { + addActionMessage( "Can't update build definition (id=" + buildDefinitionId + ") for project " + projectId + " : " + e.getMessage() ); + + e.printStackTrace(); + + return ERROR; + } + + return SUCCESS; + } + + public String doDefault() + { + try + { + project = continuum.getProject( projectId ); + + bd = getBuildDefinition(); + } + catch ( ContinuumException e ) + { + addActionMessage( "Can't get build definition informations (id=" + buildDefinitionId + ") for project " + projectId + " : " + e.getMessage() ); + + e.printStackTrace(); + + return ERROR; + } + + defaultForProject = bd.isDefaultForProject(); + + goals = bd.getGoals(); + + arguments = bd.getArguments(); + + buildFile = bd.getBuildFile(); + + scheduleId = bd.getSchedule().getId(); + + scheduleName = bd.getSchedule().getName(); + + try + { + initSchedulesMap(); + } + catch ( ContinuumException e ) + { + addActionMessage( "Can't get schedules list : " + e.getMessage() ); + + e.printStackTrace(); + + return ERROR; + } + +// profile = bd.getProfile(); + + return INPUT; + } + + private void initSchedulesMap() + throws ContinuumException + { + Collection schedules = continuum.getSchedules(); + + for ( Iterator i = schedules.iterator(); i.hasNext(); ) + { + Schedule schedule = (Schedule) i.next(); + + if ( schedulesMap == null ) + { + schedulesMap = new HashMap(); + } + + schedulesMap.put( new Integer( schedule.getId() ), schedule.getName() ); + } + } + + private BuildDefinition getBuildDefinition() + throws ContinuumException + { + return continuum.getBuildDefinition( projectId, buildDefinitionId ); + } + + public Project getProject() + { + return project; + } + + public int getProjectId() + { + return projectId; + } + + public void setProjectId( int projectId ) + { + this.projectId = projectId; + } + + public int getBuildDefinitionId() + { + return buildDefinitionId; + } + + public void setBuildDefinitionId( int buildDefinitionId ) + { + this.buildDefinitionId = buildDefinitionId; + } + + public boolean isDefaultForProject() + { + return defaultForProject; + } + + public void setDefaultForProject( boolean defaultForProject ) + { + this.defaultForProject = defaultForProject; + } + + public String getGoals() + { + return goals; + } + + public void setGoals( String goals ) + { + this.goals = goals; + } + + public String getArguments() + { + return arguments; + } + + public void setArguments( String arguments ) + { + this.arguments = arguments; + } + + public String getBuildFile() + { + return buildFile; + } + + public void setBuildFile( String buildFile ) + { + this.buildFile = buildFile; + } + + public int getScheduleId() + { + return scheduleId; + } + + public void setScheduleId( int scheduleId ) + { + this.scheduleId = scheduleId; + } + + public String getScheduleName() + { + return scheduleName; + } + + public void setScheduleName( String scheduleName ) + { + this.scheduleName = scheduleName; + } + + public Map getSchedulesMap() + { + if ( schedulesMap == null ) + { + try + { + initSchedulesMap(); + } + catch( ContinuumException e ) + { + } + } + return schedulesMap; + } +} Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/BuildDefinitionEditAction.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Added: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java?rev=358819&view=auto ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java (added) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java Fri Dec 23 07:46:15 2005 @@ -0,0 +1,79 @@ +package org.apache.maven.continuum.web.action; + +/* + * Copyright 2004-2005 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.apache.maven.continuum.Continuum; +import org.apache.maven.continuum.ContinuumException; + +import com.opensymphony.xwork.ActionSupport; + +/** + * @author Emmanuel Venisse + * @version $Id$ + */ +public class DeleteBuildDefinitionAction + extends ActionSupport +{ + private Continuum continuum; + + private int projectId; + + private int buildDefinitionId; + + public String execute() + { + try + { + continuum.removeBuildDefinition( projectId, buildDefinitionId ); + } + catch ( ContinuumException e ) + { + addActionMessage( "Can't delete build definition (id=" + projectId + ") for project " + projectId + " : " + e.getMessage() ); + + e.printStackTrace(); + + return ERROR; + } + + return SUCCESS; + } + + public String doDefault() + { + return "delete"; + } + + public void setProjectId( int projectId ) + { + this.projectId = projectId; + } + + public int getProjectId() + { + return projectId; + } + + public void setBuildDefinitionId( int buildDefinitionId ) + { + this.buildDefinitionId = buildDefinitionId; + } + + public int getBuildDefinitionId() + { + return buildDefinitionId; + } +} \ No newline at end of file Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/DeleteBuildDefinitionAction.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java?rev=358819&r1=358818&r2=358819&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectEditAction.java Fri Dec 23 07:46:15 2005 @@ -21,7 +21,6 @@ import org.apache.maven.continuum.model.project.Project; import com.opensymphony.xwork.ActionSupport; -import com.opensymphony.webwork.ServletActionContext; /** * @author Emmanuel Venisse Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java?rev=358819&r1=358818&r2=358819&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ProjectViewAction.java Fri Dec 23 07:46:15 2005 @@ -21,7 +21,6 @@ import org.apache.maven.continuum.model.project.Project; import com.opensymphony.xwork.ActionSupport; -import com.opensymphony.webwork.ServletActionContext; /** * @author Emmanuel Venisse Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml?rev=358819&r1=358818&r2=358819&view=diff ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/continuum/trunk/continuum-webapp/src/main/resources/META-INF/plexus/components.xml Fri Dec 23 07:46:15 2005 @@ -122,6 +122,39 @@ + + com.opensymphony.xwork.Action + buildDefinitionEdit + org.apache.maven.continuum.web.action.BuildDefinitionEditAction + per-lookup + + + org.apache.maven.continuum.Continuum + + + + + com.opensymphony.xwork.Action + deleteBuildDefinition + org.apache.maven.continuum.web.action.DeleteBuildDefinitionAction + per-lookup + + + org.apache.maven.continuum.Continuum + + + + + com.opensymphony.xwork.Action + addBuildDefinition + org.apache.maven.continuum.web.action.AddBuildDefinitionAction + per-lookup + + + org.apache.maven.continuum.Continuum + + +