From continuum-commits-return-2900-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Fri Jan 12 11:03:21 2007 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 4919 invoked from network); 12 Jan 2007 11:03:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jan 2007 11:03:19 -0000 Received: (qmail 9866 invoked by uid 500); 12 Jan 2007 11:03:25 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 9839 invoked by uid 500); 12 Jan 2007 11:03:25 -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 9826 invoked by uid 99); 12 Jan 2007 11:03:25 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jan 2007 03:03:25 -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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jan 2007 03:03:17 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id F35251A981A; Fri, 12 Jan 2007 03:02:15 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r495551 - in /maven/continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/component/ mdo/ resources/localization/ webapp/WEB-INF/jsp/ webapp/WEB-INF/jsp/components/ Date: Fri, 12 Jan 2007 11:02:15 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070112110215.F35251A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: evenisse Date: Fri Jan 12 03:02:14 2007 New Revision: 495551 URL: http://svn.apache.org/viewvc?view=rev&rev=495551 Log: Add build fresh value in build definitions summaries Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Modified: maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?view=diff&rev=495551&r1=495550&r2=495551 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original) +++ maven/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Fri Jan 12 03:02:14 2007 @@ -35,8 +35,7 @@ * * @author Jesse McConnell * @version $Id$ - * @plexus.component role="com.opensymphony.xwork.Action" - * role-hint="buildDefinitionSummary" + * @plexus.component role="com.opensymphony.xwork.Action" role-hint="buildDefinitionSummary" */ public class BuildDefinitionSummaryAction extends ContinuumActionSupport @@ -46,7 +45,7 @@ private String projectGroupName; private int projectId; - + private ProjectGroup projectGroup; private List projectBuildDefinitionSummaries = new ArrayList(); @@ -85,9 +84,9 @@ projectGroup = getContinuum().getProjectGroup( projectGroupId ); - for (Iterator i = projectGroup.getProjects().iterator(); i.hasNext(); ) + for ( Iterator i = projectGroup.getProjects().iterator(); i.hasNext(); ) { - Project project = (Project)i.next(); + Project project = (Project) i.next(); projectBuildDefinitionSummaries.addAll( gatherProjectBuildDefinitionSummaries( project.getId() ) ); } @@ -95,16 +94,16 @@ allBuildDefinitionSummaries.addAll( groupBuildDefinitionSummaries ); allBuildDefinitionSummaries.addAll( projectBuildDefinitionSummaries ); } - catch (ContinuumException e) + catch ( ContinuumException e ) { - getLogger().info( "unable to build summary" ); - return ERROR; + getLogger().info( "unable to build summary" ); + return ERROR; } return SUCCESS; } - private List gatherProjectBuildDefinitionSummaries( int projectId) + private List gatherProjectBuildDefinitionSummaries( int projectId ) throws ContinuumException { List summaryList = new ArrayList(); @@ -153,6 +152,7 @@ bds.setBuildFile( bd.getBuildFile() ); bds.setScheduleName( bd.getSchedule().getName() ); bds.setIsDefault( bd.isDefaultForProject() ); + bds.setIsBuildFresh( bd.isBuildFresh() ); return bds; } Modified: maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo?view=diff&rev=495551&r1=495550&r2=495551 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo (original) +++ maven/continuum/trunk/continuum-webapp/src/main/mdo/view-models.mdo Fri Jan 12 03:02:14 2007 @@ -289,6 +289,12 @@ String + isBuildFresh + 1.0.0 + if the build is to be smoked and checked back out from the scm each build + boolean + + isDefault 1.0.0 if the build definition is used in default cases Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?view=diff&rev=495551&r1=495550&r2=495551 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original) +++ maven/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Fri Jan 12 03:02:14 2007 @@ -285,6 +285,7 @@ projectView.buildDefinition.schedule = Schedule projectView.buildDefinition.from = From projectView.buildDefinition.default = Default +projectView.buildDefinition.buildFresh = Build Fresh projectView.notifiers = Notifiers projectView.notifier.type = Type projectView.notifier.recipient = Recipient @@ -329,6 +330,7 @@ buildDefinition.goals.ant.label = Targets buildDefinition.goals.maven.label = Goals buildDefinition.arguments.label = Arguments +buildDefinition.buildFresh.label = Build Fresh buildDefinition.defaultForProject.label = Is it default? buildDefinition.schedule.label = Schedule buildDefinition.noname.save.error.message = There was an error saving the schedule, no schedule name was supplied. Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp?view=diff&rev=495551&r1=495550&r2=495551 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/buildDefinitionEdit.jsp Fri Jan 12 03:02:14 2007 @@ -65,7 +65,7 @@ - + Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp?view=diff&rev=495551&r1=495550&r2=495551 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionGroupSummaryComponent.jsp Fri Jan 12 03:02:14 2007 @@ -41,6 +41,7 @@ + Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?view=diff&rev=495551&r1=495550&r2=495551 ============================================================================== --- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original) +++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Fri Jan 12 03:02:14 2007 @@ -38,6 +38,7 @@ +