Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 28554 invoked from network); 4 Aug 2009 02:04:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Aug 2009 02:04:10 -0000 Received: (qmail 43627 invoked by uid 500); 4 Aug 2009 02:04:15 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 43598 invoked by uid 500); 4 Aug 2009 02:04:15 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 43589 invoked by uid 99); 4 Aug 2009 02:04:15 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 02:04:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 02:04:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 370632388852; Tue, 4 Aug 2009 02:03:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r800656 - in /continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action: CheckoutProjectContinuumAction.java UpdateWorkingDirectoryFromScmContinuumAction.java Date: Tue, 04 Aug 2009 02:03:52 -0000 To: commits@continuum.apache.org From: ctan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090804020353.370632388852@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ctan Date: Tue Aug 4 02:03:52 2009 New Revision: 800656 URL: http://svn.apache.org/viewvc?rev=800656&view=rev Log: [CONTINUUM-2208] set state of projects to 'updating' or 'checking out' during prepare build merge -r 800654:800655 from 1.3.x branch Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java?rev=800656&r1=800655&r2=800656&view=diff ============================================================================== --- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java (original) +++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckoutProjectContinuumAction.java Tue Aug 4 02:03:52 2009 @@ -79,7 +79,7 @@ public void execute( Map context ) throws ContinuumStoreException - { + { Project project = projectDao.getProject( getProject( context ).getId() ); BuildDefinition buildDefinition = getBuildDefinition( context ); @@ -89,6 +89,8 @@ buildDefinition = buildDefinitionDao.getBuildDefinition( buildDefinition.getId() ); } + int originalState = project.getState(); + project.setState( ContinuumProjectState.CHECKING_OUT ); projectDao.updateProject( project ); @@ -192,7 +194,14 @@ project = projectDao.getProject( project.getId() ); - project.setState( ContinuumProjectState.CHECKEDOUT ); + if ( originalState == ContinuumProjectState.NEW ) + { + project.setState( ContinuumProjectState.CHECKEDOUT ); + } + else + { + project.setState( originalState ); + } projectDao.updateProject( project ); Modified: continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java?rev=800656&r1=800655&r2=800656&view=diff ============================================================================== --- continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java (original) +++ continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java Tue Aug 4 02:03:52 2009 @@ -37,6 +37,7 @@ import org.apache.maven.continuum.model.scm.ChangeSet; 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.store.ContinuumObjectNotFoundException; import org.apache.maven.continuum.store.ContinuumStoreException; import org.apache.maven.continuum.utils.WorkingDirectoryService; @@ -95,6 +96,12 @@ Date latestUpdateDate = null; + int originalState = project.getState(); + + project.setState( ContinuumProjectState.UPDATING ); + + projectDao.updateProject( project ); + try { BuildResult buildResult = buildResultDao.getLatestBuildResultForProject( project.getId() ); @@ -170,20 +177,19 @@ finally { // set back to the original state - // TODO: transient states! - //try - //{ - // project = projectDao.getProject( project.getId() ); - - // project.setState( state ); - - // projectDao.updateProject( project ); - //} - //catch ( Exception e ) - //{ + try + { + project = projectDao.getProject( project.getId() ); + + project.setState( originalState ); + + projectDao.updateProject( project ); + } + catch ( Exception e ) + { // nasty nasty, but we're in finally, so just sacrifice the state to keep the original exception - // getLogger().error( e.getMessage(), e ); - //} + getLogger().error( e.getMessage(), e ); + } notifier.checkoutComplete( project, buildDefinition ); }