Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 39563 invoked from network); 14 Nov 2005 18:33:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Nov 2005 18:33:00 -0000 Received: (qmail 66553 invoked by uid 500); 14 Nov 2005 18:33:00 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 66515 invoked by uid 500); 14 Nov 2005 18:33:00 -0000 Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: continuum-dev@maven.apache.org Delivered-To: mailing list continuum-commits@maven.apache.org Received: (qmail 66504 invoked by uid 99); 14 Nov 2005 18:32:59 -0000 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 14 Nov 2005 10:32:59 -0800 Received: (qmail 39426 invoked by uid 65534); 14 Nov 2005 18:32:39 -0000 Message-ID: <20051114183239.39420.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r344177 - in /maven/continuum/trunk: continuum-api/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/resources/META-INF/plexus/ continuum-web/src/main/resources/templa... Date: Mon, 14 Nov 2005 18:32:36 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Mon Nov 14 10:32:23 2005 New Revision: 344177 URL: http://svn.apache.org/viewcvs?rev=344177&view=rev Log: Don't add link 'Build Now' if project is in checkout queue. Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm Modified: maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=344177&r1=344176&r2=344177&view=diff ============================================================================== --- maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original) +++ maven/continuum/trunk/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Mon Nov 14 10:32:23 2005 @@ -73,6 +73,8 @@ boolean isInBuildingQueue( int projectId ) throws ContinuumException; + boolean isInCheckoutQueue( int projectId ) + throws ContinuumException; // ---------------------------------------------------------------------- // Building // ---------------------------------------------------------------------- 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=344177&r1=344176&r2=344177&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 Nov 14 10:32:23 2005 @@ -41,6 +41,7 @@ import org.apache.maven.continuum.project.builder.ContinuumProjectBuildingResult; import org.apache.maven.continuum.project.builder.maven.MavenOneContinuumProjectBuilder; import org.apache.maven.continuum.project.builder.maven.MavenTwoContinuumProjectBuilder; +import org.apache.maven.continuum.scm.queue.CheckOutTask; import org.apache.maven.continuum.security.ContinuumSecurity; import org.apache.maven.continuum.store.ContinuumObjectNotFoundException; import org.apache.maven.continuum.store.ContinuumStore; @@ -123,6 +124,11 @@ private TaskQueue buildQueue; /** + * @plexus.requirement + */ + private TaskQueue checkoutQueue; + + /** * @plexus.configuration */ private String workingDirectory; @@ -203,12 +209,39 @@ } catch ( TaskQueueException e ) { - throw new ContinuumException( "Error while getting the queue snapshot.", e ); + throw new ContinuumException( "Error while getting the building queue.", e ); } for ( Iterator it = queue.iterator(); it.hasNext(); ) { BuildProjectTask task = (BuildProjectTask) it.next(); + + if ( task.getProjectId() == projectId ) + { + return true; + } + } + + return false; + } + + public boolean isInCheckoutQueue( int projectId ) + throws ContinuumException + { + List queue; + + try + { + queue = checkoutQueue.getQueueSnapshot(); + } + catch ( TaskQueueException e ) + { + throw new ContinuumException( "Error while getting the checkout queue.", e ); + } + + for ( Iterator it = queue.iterator(); it.hasNext(); ) + { + CheckOutTask task = (CheckOutTask) it.next(); if ( task.getProjectId() == projectId ) { Modified: maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml?rev=344177&r1=344176&r2=344177&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/continuum/trunk/continuum-core/src/main/resources/META-INF/plexus/components.xml Mon Nov 14 10:32:23 2005 @@ -29,6 +29,11 @@ buildQueue + org.codehaus.plexus.taskqueue.TaskQueue + check-out-project + checkoutQueue + + org.apache.maven.continuum.utils.WorkingDirectoryService Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm?rev=344177&r1=344176&r2=344177&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm Mon Nov 14 10:32:23 2005 @@ -62,7 +62,7 @@ $!item.name $!item.version - #if ( $continuum.isInBuildingQueue( $item.id ) ) + #if ( $continuum.isInBuildingQueue( $item.id ) || $continuum.isInCheckoutQueue( $item.id ) ) In queue #elseif ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 ) #if ( $item.buildNumber != 0 ) @@ -80,7 +80,7 @@ ## Operations #if ( $continuum.security.isAuthorized( $c1user, "buildProject" ) ) - #if ( $continuum.isInBuildingQueue( $item.id ) ) + #if ( $continuum.isInBuildingQueue( $item.id ) || $continuum.isInCheckoutQueue( $item.id ) ) Build #elseif ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 ) Build Now