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/21 18:33:06 UTC
svn commit: r327217 - in
/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum:
./ buildcontroller/ core/action/
Author: evenisse
Date: Fri Oct 21 09:32:50 2005
New Revision: 327217
URL: http://svn.apache.org/viewcvs?rev=327217&view=rev
Log:
revert, it's incorrect
Modified:
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java
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=327217&r1=327216&r2=327217&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 Fri Oct 21 09:32:50 2005
@@ -344,10 +344,6 @@
getLogger().info( "Enqueuing '" + project.getName() + "' (Build definition id=" + buildDefinitionId + "." );
buildQueue.put( new BuildProjectTask( projectId, buildDefinitionId, trigger ) );
-
- project.setState( ContinuumProjectState.BUILDING );
-
- store.updateProject( project );
}
catch ( ContinuumStoreException e )
{
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=327217&r1=327216&r2=327217&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Fri Oct 21 09:32:50 2005
@@ -232,20 +232,6 @@
}
finally
{
- try
- {
- project = store.getProject( project.getId() );
-
- if ( ContinuumProjectState.BUILDING == project.getState() )
- {
- project.setState( ContinuumProjectState.ERROR );
- }
- }
- catch ( ContinuumStoreException e )
- {
- getLogger().error( "Can't store the project state for project " + project.getName() );
- }
-
notifierDispatcher.buildComplete( project, build );
}
}
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java?rev=327217&r1=327216&r2=327217&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java Fri Oct 21 09:32:50 2005
@@ -18,7 +18,6 @@
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.scm.ScmResult;
-import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.scm.ContinuumScm;
import org.apache.maven.continuum.scm.ContinuumScmException;
import org.apache.maven.continuum.store.ContinuumStore;
@@ -43,10 +42,6 @@
throws Exception
{
Project project = store.getProject( getProjectId( context ) );
-
- project.setState( ContinuumProjectState.CHECKING_OUT );
-
- store.updateProject( project );
File workingDirectory = getWorkingDirectory( context );
Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java?rev=327217&r1=327216&r2=327217&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java (original)
+++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java Fri Oct 21 09:32:50 2005
@@ -19,7 +19,6 @@
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.scm.ScmResult;
import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher;
-import org.apache.maven.continuum.project.ContinuumProjectState;
import org.apache.maven.continuum.scm.ContinuumScm;
import org.apache.maven.continuum.store.ContinuumStore;
@@ -42,10 +41,6 @@
throws Exception
{
Project project = store.getProject( getProjectId( context ) );
-
- project.setState( ContinuumProjectState.UPDATING );
-
- store.updateProject( project );
ScmResult scmResult;