You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ev...@apache.org on 2007/01/12 12:02:15 UTC
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/
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 <jm...@apache.org>
* @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 @@
<type>String</type>
</field>
<field>
+ <name>isBuildFresh</name>
+ <version>1.0.0</version>
+ <description>if the build is to be smoked and checked back out from the scm each build</description>
+ <type>boolean</type>
+ </field>
+ <field>
<name>isDefault</name>
<version>1.0.0</version>
<description>if the build definition is used in default cases</description>
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 @@
</ww:else>
<ww:textfield label="%{getText('buildDefinition.arguments.label')}" name="arguments"/>
- <ww:checkbox label="Build Fresh" name="buildFresh" value="buildFresh" fieldValue="true"/>
+ <ww:checkbox label="%{getText('buildDefinition.buildFresh.label')}" name="buildFresh" value="buildFresh" fieldValue="true"/>
<ww:if test="defaultBuildDefinition == true">
<ww:label label="%{getText('buildDefinition.defaultForProject.label')}" value="true"/>
</ww:if>
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 @@
<!-- ec:column property="profile" title="projectView.buildDefinition.profile"/ -->
<ec:column property="scheduleName" title="schedule"/>
<ec:column property="from" title="projectView.buildDefinition.from"/>
+ <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
<ec:column property="isDefault" title="projectView.buildDefinition.default"/>
<ec:column property="buildAction" title=" " width="1%">
<pss:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">
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 @@
<ec:column property="profile" title="projectView.buildDefinition.profile"/>
<ec:column property="scheduleName" title="schedule"/>
<ec:column property="from" title="projectView.buildDefinition.from"/>
+ <ec:column property="isBuildFresh" title="projectView.buildDefinition.buildFresh"/>
<ec:column property="isDefault" title="projectView.buildDefinition.default"/>
<ec:column property="buildAction" title=" " width="1%">
<pss:ifAuthorized permission="continuum-build-group" resource="${projectGroupName}">