From continuum-commits-return-1541-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Tue Feb 14 14:03:33 2006 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 5805 invoked from network); 14 Feb 2006 14:03:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 14 Feb 2006 14:03:07 -0000 Received: (qmail 75350 invoked by uid 500); 14 Feb 2006 14:03:04 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 75337 invoked by uid 500); 14 Feb 2006 14:03:03 -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 75326 invoked by uid 99); 14 Feb 2006 14:03:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2006 06:03:03 -0800 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; Tue, 14 Feb 2006 06:03:02 -0800 Received: (qmail 5460 invoked by uid 65534); 14 Feb 2006 14:02:42 -0000 Message-ID: <20060214140242.5459.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r377730 - in /maven/continuum/branches/continuum-1.0.x: continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Date: Tue, 14 Feb 2006 14:02:41 -0000 To: continuum-commits@maven.apache.org From: evenisse@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: evenisse Date: Tue Feb 14 06:02:40 2006 New Revision: 377730 URL: http://svn.apache.org/viewcvs?rev=377730&view=rev Log: Check build queue for couple project/buildDefinition instead of only project so a user can allow 2 build definitions on a project on the same scheduler Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Modified: maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java?rev=377730&r1=377729&r2=377730&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-api/src/main/java/org/apache/maven/continuum/Continuum.java Tue Feb 14 06:02:40 2006 @@ -76,6 +76,9 @@ boolean isInBuildingQueue( int projectId ) throws ContinuumException; + boolean isInBuildingQueue( int projectId, int buildDefinitionId ) + throws ContinuumException; + boolean isInCheckoutQueue( int projectId ) throws ContinuumException; // ---------------------------------------------------------------------- Modified: maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewcvs/maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=377730&r1=377729&r2=377730&view=diff ============================================================================== --- maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/branches/continuum-1.0.x/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Tue Feb 14 06:02:40 2006 @@ -199,6 +199,12 @@ public boolean isInBuildingQueue( int projectId ) throws ContinuumException { + return isInBuildingQueue( projectId, -1 ); + } + + public boolean isInBuildingQueue( int projectId, int buildDefinitionId ) + throws ContinuumException + { List queue; try @@ -214,9 +220,19 @@ { BuildProjectTask task = (BuildProjectTask) it.next(); - if ( task.getProjectId() == projectId ) + if ( buildDefinitionId < 0 ) { - return true; + if ( task.getProjectId() == projectId ) + { + return true; + } + } + else + { + if ( task.getProjectId() == projectId && task.getBuildDefinitionId() == buildDefinitionId ) + { + return true; + } } } @@ -387,7 +403,8 @@ Integer buildDefId = ( (Integer) projectsMap.get( new Integer( p.getId() ) ) ); - if ( buildDefId != null && !isInBuildingQueue( p.getId() ) && !isInCheckoutQueue( p.getId() ) ) + if ( buildDefId != null && !isInBuildingQueue( p.getId(), buildDefId.intValue() ) && + !isInCheckoutQueue( p.getId() ) ) { buildProject( p.getId(), buildDefId.intValue(), ContinuumProjectState.TRIGGER_SCHEDULED, false ); } @@ -429,7 +446,7 @@ { if ( checkQueues ) { - if ( isInBuildingQueue( projectId ) || isInCheckoutQueue( projectId ) ) + if ( isInBuildingQueue( projectId, buildDefinitionId ) || isInCheckoutQueue( projectId ) ) { return; } @@ -447,7 +464,7 @@ if ( executor.isBuilding( project ) ) { // project is building - getLogger().info( "Project '" + project.getName() + "' always running."); + getLogger().info( "Project '" + project.getName() + "' always running." ); return; } else