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/08/29 15:33:40 UTC
svn commit: r264138 - in /maven/continuum/trunk:
continuum-core/src/main/java/org/apache/maven/continuum/
continuum-web/src/main/resources/forms/
continuum-web/src/main/resources/localization/
continuum-web/src/main/resources/templates/screens/
Author: evenisse
Date: Mon Aug 29 06:33:31 2005
New Revision: 264138
URL: http://svn.apache.org/viewcvs?rev=264138&view=rev
Log:
[CONTINUUM-299] "Add/Delete" build definitions
Modified:
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml
maven/continuum/trunk/continuum-web/src/main/resources/localization/Continuum.properties
maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm
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=264138&r1=264137&r2=264138&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 Mon Aug 29 06:33:31 2005
@@ -681,11 +681,17 @@
public void removeBuildDefinition( int projectId, int buildDefinitionId )
throws ContinuumException
{
+ Project project = getProjectWithAllDetails( projectId );
+
BuildDefinition buildDefinition = getBuildDefinition( projectId, buildDefinitionId );
if ( buildDefinition != null )
{
- removeBuildDefinition( buildDefinition );
+ project.removeBuildDefinition( buildDefinition );
+
+ updateProject( project );
+
+ // removeBuildDefinition( buildDefinition );
}
}
Modified: maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml?rev=264138&r1=264137&r2=264138&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/forms/buildDefinition.xml Mon Aug 29 06:33:31 2005
@@ -4,16 +4,16 @@
<lookup-expression>getBuildDefinition(#id,#buildDefinitionId)</lookup-expression>
<elements>
<element>
- <id>pomFilename</id>
+ <id>buildFile</id>
<validators>
<validator>
<id>required</id>
- <error-message-key>project.pomFilename.error</error-message-key>
+ <error-message-key>project.buildFile.error</error-message-key>
</validator>
</validators>
<type>text</type>
- <label-key>buildDefinition.pomFilename.label</label-key>
- <message-key>buildDefinition.pomFilename.message</message-key>
+ <label-key>buildDefinition.buildFile.label</label-key>
+ <message-key>buildDefinition.buildFile.message</message-key>
</element>
<element>
<id>goals</id>
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=264138&r1=264137&r2=264138&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 Mon Aug 29 06:33:31 2005
@@ -148,8 +148,8 @@
project.title.buildDefinition.add = Add Build Definition
project.title.buildDefinition.update = Edit Build Definition
-buildDefinition.pomFilename.label = POM filename
-buildDefinition.pomFilename.message = Relative path of the POM file
+buildDefinition.buildFile.label = POM filename
+buildDefinition.buildFile.message = Relative path of the POM file
buildDefinition.goals.label = Goals
buildDefinition.goals.message = Enter one or more goals - leave empty to use the default
buildDefinition.arguments.label = Arguments
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=264138&r1=264137&r2=264138&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 Mon Aug 29 06:33:31 2005
@@ -82,7 +82,9 @@
<td>Project</td>
<td>
#set ( $buildDefinitionLink = $link.setPage('BuildDefinition.vm').addPathInfo('view','BuildDefinition').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id) )
- <a href="$buildDefinitionLink">Edit</a><!-- | <a href="#">Delete</a> -->
+ <a href="$buildDefinitionLink">Edit</a> |
+ #set ( $deleteBuildDefinitionLink = $link.setPage('Summary.vm').addPathInfo('action','cam').addPathInfo('cid','deleteBuildDefinition').addPathInfo('buildDefinitionId', $buildDefinition.id).addPathInfo('id', $item.id) )
+ <a href="$deleteBuildDefinitionLink">Delete</a>
</td>
</tr>
#end