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/10/13 19:28:37 UTC
svn commit: r320817 - in /maven/continuum/trunk: continuum-core-it/
continuum-core/
continuum-core/src/main/java/org/apache/maven/continuum/core/action/
continuum-core/src/main/java/org/apache/maven/continuum/scm/
continuum-plexus-application/ continuu...
Author: evenisse
Date: Thu Oct 13 10:28:35 2005
New Revision: 320817
URL: http://svn.apache.org/viewcvs?rev=320817&view=rev
Log:
Revert
Modified:
maven/continuum/trunk/continuum-core-it/pom.xml
maven/continuum/trunk/continuum-core/pom.xml
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
maven/continuum/trunk/continuum-plexus-application/pom.xml
maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
Modified: maven/continuum/trunk/continuum-core-it/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core-it/pom.xml?rev=320817&r1=320816&r2=320817&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core-it/pom.xml (original)
+++ maven/continuum/trunk/continuum-core-it/pom.xml Thu Oct 13 10:28:35 2005
@@ -28,7 +28,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Modified: maven/continuum/trunk/continuum-core/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/pom.xml?rev=320817&r1=320816&r2=320817&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/pom.xml (original)
+++ maven/continuum/trunk/continuum-core/pom.xml Thu Oct 13 10:28:35 2005
@@ -145,7 +145,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=320817&r1=320816&r2=320817&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Thu Oct 13 10:28:35 2005
@@ -28,7 +28,6 @@
import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.store.ContinuumStore;
import org.apache.maven.continuum.utils.ContinuumUtils;
-import org.codehaus.plexus.util.FileUtils;
import java.io.File;
import java.util.Date;
@@ -116,24 +115,15 @@
try
{
- File buildOutputFile = configurationService.getBuildOutputFile( build.getId(), project.getId() );
+ notifier.runningGoals( project, build );
- if ( !scmResult.isSuccess() )
- {
- notifier.runningGoals( project, build );
+ File buildOutputFile = configurationService.getBuildOutputFile( build.getId(), project.getId() );
- ContinuumBuildExecutionResult result = buildExecutor.build( project, buildDefinition, buildOutputFile );
+ ContinuumBuildExecutionResult result = buildExecutor.build( project, buildDefinition, buildOutputFile );
- build.setState( result.getExitCode() == 0 ? ContinuumProjectState.OK : ContinuumProjectState.FAILED );
+ build.setState( result.getExitCode() == 0 ? ContinuumProjectState.OK : ContinuumProjectState.FAILED );
- build.setExitCode( result.getExitCode() );
- }
- else
- {
- build.setState( ContinuumProjectState.ERROR );
-
- FileUtils.fileWrite( buildOutputFile.getAbsolutePath(), "" );
- }
+ build.setExitCode( result.getExitCode() );
}
catch ( Throwable e )
{
@@ -166,8 +156,6 @@
// ----------------------------------------------------------------------
store.updateBuildResult( build );
-
- project.setState( build.getState() );
store.updateProject( project );
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=320817&r1=320816&r2=320817&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java Thu Oct 13 10:28:35 2005
@@ -223,7 +223,6 @@
// TODO: is this valid? Does it ever return a changeset itself?
ChangeSet changeSet = convertScmFileSetToChangeSet( scmResult.getCheckedOutFiles() );
-
result.addChange( changeSet );
return result;
Modified: maven/continuum/trunk/continuum-plexus-application/pom.xml
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/pom.xml?rev=320817&r1=320816&r2=320817&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-plexus-application/pom.xml (original)
+++ maven/continuum/trunk/continuum-plexus-application/pom.xml Thu Oct 13 10:28:35 2005
@@ -150,7 +150,7 @@
<version>1.0-beta-2-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
+ <groupId>plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
Modified: maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java?rev=320817&r1=320816&r2=320817&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java (original)
+++ maven/continuum/trunk/continuum-store/src/main/java/org/apache/maven/continuum/store/JdoContinuumStore.java Thu Oct 13 10:28:35 2005
@@ -197,7 +197,7 @@
// TODO: these are in the wrong spot - set them on success (though currently some depend on latest build being the one in progress)
project.setLatestBuildId( build.getId() );
- //project.setBuildNumber( project.getBuildNumber() + 1 );
+ project.setBuildNumber( project.getBuildNumber() + 1 );
project.setState( build.getState() );