Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 80670 invoked from network); 25 Jan 2007 19:07:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Jan 2007 19:07:29 -0000 Received: (qmail 3617 invoked by uid 500); 25 Jan 2007 19:07:35 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 3584 invoked by uid 500); 25 Jan 2007 19:07:35 -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 3571 invoked by uid 99); 25 Jan 2007 19:07:35 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jan 2007 11:07:35 -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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jan 2007 11:07:28 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 10A2F1A981A; Thu, 25 Jan 2007 11:07:07 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r499916 - /maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Date: Thu, 25 Jan 2007 19:07:06 -0000 To: continuum-commits@maven.apache.org From: rinku@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070125190707.10A2F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rinku Date: Thu Jan 25 11:07:05 2007 New Revision: 499916 URL: http://svn.apache.org/viewvc?view=rev&rev=499916 Log: o updates to service methods and intValue -> longValue Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Modified: maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewvc/maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?view=diff&rev=499916&r1=499915&r2=499916 ============================================================================== --- maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ maven/continuum/branches/id-refactor/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Thu Jan 25 11:07:05 2007 @@ -622,7 +622,7 @@ " doens't have a default build definition, this should be impossible, parent should have default definition set." ); } - buildProject( project, buildDefId.intValue(), trigger ); + buildProject( project, buildDefId.longValue(), trigger ); } } @@ -784,10 +784,10 @@ { Long buildDefId = (Long) buildDefinitionIterator.next(); - if ( buildDefId != null && !isInBuildingQueue( project.getId(), buildDefId.intValue() ) && + if ( buildDefId != null && !isInBuildingQueue( project.getId(), buildDefId.longValue() ) && !isInCheckoutQueue( project.getId() ) ) { - buildProject( project, buildDefId.intValue(), ContinuumProjectState.TRIGGER_SCHEDULED, false ); + buildProject( project, buildDefId.longValue(), ContinuumProjectState.TRIGGER_SCHEDULED, false ); } } } @@ -805,10 +805,10 @@ { Long buildDefId = (Long) buildDefinitionIterator.next(); - if ( buildDefId != null && !isInBuildingQueue( project.getId(), buildDefId.intValue() ) && + if ( buildDefId != null && !isInBuildingQueue( project.getId(), buildDefId.longValue() ) && !isInCheckoutQueue( project.getId() ) ) { - buildProject( project, buildDefId.intValue(), ContinuumProjectState.TRIGGER_SCHEDULED, false ); + buildProject( project, buildDefId.longValue(), ContinuumProjectState.TRIGGER_SCHEDULED, false ); } } } @@ -1116,13 +1116,13 @@ // Shell projects // ---------------------------------------------------------------------- - public int addProject( Project project, String executorId ) + public long addProject( Project project, String executorId ) throws ContinuumException { return addProject( project, executorId, getDefaultProjectGroup().getId() ); } - public int addProject( Project project, String executorId, long groupId ) + public long addProject( Project project, String executorId, long groupId ) throws ContinuumException { project.setExecutorId( executorId ); @@ -1160,7 +1160,7 @@ // Activities. These should end up as workflows in werkflow // ---------------------------------------------------------------------- - private int executeAddProjectFromScmActivity( Project project, long groupId ) + private long executeAddProjectFromScmActivity( Project project, long groupId ) throws ContinuumException { ProjectGroup projectGroup = getProjectGroupWithBuildDetails( groupId ); @@ -1183,7 +1183,7 @@ executeAction( "add-project-to-checkout-queue", context ); - return ( (Long) context.get( AbstractContinuumAction.KEY_PROJECT_ID ) ).intValue(); + return ( (Long) context.get( AbstractContinuumAction.KEY_PROJECT_ID ) ).longValue(); } /**