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 2005/12/07 16:28:52 UTC
svn commit: r354769 - in
/maven/continuum/trunk/continuum-web/src/main/resources:
localization/Continuum.properties templates/screens/AddBuildDefinition.vm
templates/screens/BuildDefinition.vm templates/screens/View.vm
Author: evenisse
Date: Wed Dec 7 07:28:46 2005
New Revision: 354769
URL: http://svn.apache.org/viewcvs?rev=354769&view=rev
Log:
PR: CONTINUUM-484
Submitted by: Nick Gonzalez
Create specific build definition screens for ant and shell projects
Modified:
maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm
Modified: maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties?rev=354769&r1=354768&r2=354769&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties Wed Dec 7 07:28:46 2005
@@ -159,8 +159,14 @@
project.title.buildDefinition.update = Edit Build Definition
buildDefinition.buildFile.label = POM filename
buildDefinition.buildFile.message = Relative path of the POM file
+buildDefinition.antBuildXmlFile.label = Ant build filename
+buildDefinition.antBuildXmlFile.message = Relative path of the ant build file
+buildDefinition.shellExecutableFile.label = Shell executable
+buildDefinition.shellExecutableFile.message = Relative path of the shell executable
buildDefinition.goals.label = Goals
buildDefinition.goals.message = Enter one or more goals - leave empty to use the default
+buildDefinition.targets.label = Targets
+buildDefinition.targets.message = Enter one or more targets - leave empty to use the default
buildDefinition.arguments.label = Arguments
buildDefinition.arguments.message = Enter one or more command line arguments
buildDefinition.default.label = Is it default?
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm?rev=354769&r1=354768&r2=354769&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/AddBuildDefinition.vm Wed Dec 7 07:28:46 2005
@@ -14,6 +14,38 @@
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
#foreach ( $element in $form.elements )
+ #if($executorId == "ant" && $element.id == "buildFile")
+ <tr>
+ <th>$i18n.getString( "buildDefinition.antBuildXmlFile.label" )</th>
+ <td>
+ <input type="text" name="buildFile" value="" size="100"/>
+ <p>
+ $i18n.getString( "buildDefinition.antBuildXmlFile.message" ) <font color="red"><b></b></font>
+ </p>
+ </td>
+ </tr>
+ #elseif($executorId == "shell" && $element.id == "buildFile")
+ <tr>
+ <th>$i18n.getString( "buildDefinition.shellExecutableFile.label" )</th>
+ <td>
+ <input type="text" name="buildFile" value="" size="100"/>
+ <p>
+ $i18n.getString( "buildDefinition.shellExecutableFile.message" ) <font color="red"><b></b></font>
+ </p>
+ </td>
+ </tr>
+ #elseif($executorId == "ant" && $element.id == "goals")
+ <tr>
+ <th>$i18n.getString( "buildDefinition.targets.label" )</th>
+ <td>
+ <input type="text" name="goals" value="" size="100"/>
+ <p>
+ $i18n.getString( "buildDefinition.targets.message" ) <font color="red"><b></b></font>
+ </p>
+ </td>
+ </tr>
+ #elseif($executorId == "shell" && $element.id == "goals")
+ #else
#if ( !$element.immutable )
<tr>
#field( $i18n $data $element $item $formtool )
@@ -23,6 +55,7 @@
#hidden ( $element.id $element.defaultValue )
#end
#end
+ #end
#end
<tr>
<th>$i18n.getString( "buildDefinition.schedule.label" )</th>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm?rev=354769&r1=354768&r2=354769&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/BuildDefinition.vm Wed Dec 7 07:28:46 2005
@@ -12,28 +12,63 @@
#hidden ( "buildDefinitionId" $buildDefinition.id )
<div class="axial">
<table border="1" cellspacing="2" cellpadding="3" width="100%">
+ #if (${project.executorId} == "ant" )
+ <tr>
+ <th>$i18n.getString( "buildDefinition.antBuildXmlFile.label" )</th>
+ <td>
+ <input type="text" name="buildFile" value="$!buildDefinition.buildFile" size="100"/>
+ <p>
+ $i18n.getString( "buildDefinition.antBuildXmlFile.message" ) <font color="red"><b></b></font>
+ </p>
+ </td>
+ </tr>
+ #elseif (${project.executorId} == "shell" )
+ <tr>
+ <th>$i18n.getString( "buildDefinition.shellExecutableFile.label" )</th>
+ <td>
+ <input type="text" name="buildFile" value="$!buildDefinition.buildFile" size="100"/>
+ <p>
+ $i18n.getString( "buildDefinition.shellExecutableFile.message" ) <font color="red"><b></b></font>
+ </p>
+ </td>
+ </tr>
+ #else
<tr>
<th>$i18n.getString( "buildDefinition.buildFile.label" )</th>
<td>
- <input type="text" name="buildFile" value="$buildDefinition.buildFile" size="100"/>
+ <input type="text" name="buildFile" value="$!buildDefinition.buildFile" size="100"/>
<p>
$i18n.getString( "buildDefinition.buildFile.message" ) <font color="red"><b></b></font>
</p>
</td>
</tr>
+ #end
+ #if (${project.executorId} == "ant" )
+ <tr>
+ <th>$i18n.getString( "buildDefinition.targets.label" )</th>
+ <td>
+ <input type="text" name="goals" value="$!buildDefinition.goals" size="100"/>
+ <p>
+ $i18n.getString( "buildDefinition.targets.message" ) <font color="red"><b></b></font>
+ </p>
+ </td>
+ </tr>
+ #elseif (${project.executorId} == "shell" )
+ #else
<tr>
<th>$i18n.getString( "buildDefinition.goals.label" )</th>
<td>
- <input type="text" name="goals" value="$buildDefinition.goals" size="100"/>
+ <input type="text" name="goals" value="$!buildDefinition.goals" size="100"/>
<p>
$i18n.getString( "buildDefinition.goals.message" ) <font color="red"><b></b></font>
</p>
</td>
</tr>
+ #end
<tr>
<th>$i18n.getString( "buildDefinition.arguments.label" )</th>
<td>
- <input type="text" name="arguments" value="$buildDefinition.arguments" size="100"/>
+ <input type="text" name="arguments" value="$!buildDefinition.arguments" size="100"/>
<p>
$i18n.getString( "buildDefinition.arguments.message" ) <font color="red"><b></b></font>
</p>
Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm?rev=354769&r1=354768&r2=354769&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm Wed Dec 7 07:28:46 2005
@@ -71,9 +71,9 @@
</tr>
#foreach ( $buildDefinition in $project.buildDefinitions )
<tr class="$css.nextClass">
- <td>$buildDefinition.goals</td>
- <td>$buildDefinition.arguments</td>
- <td>$buildDefinition.buildFile</td>
+ <td>$!buildDefinition.goals</td>
+ <td>$!buildDefinition.arguments</td>
+ <td>$!buildDefinition.buildFile</td>
<td>
#if ( $buildDefinition.profile )
$buildDefinition.profile.name