Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 5779 invoked from network); 14 May 2009 08:49:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 May 2009 08:49:07 -0000 Received: (qmail 9986 invoked by uid 500); 14 May 2009 08:49:07 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 9931 invoked by uid 500); 14 May 2009 08:49:06 -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 9922 invoked by uid 99); 14 May 2009 08:49:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 May 2009 08:49:06 +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; Thu, 14 May 2009 08:49:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8AEE12388866; Thu, 14 May 2009 08:48:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r774693 - in /continuum/branches/continuum-flat-multi-module: continuum-core/src/main/java/org/apache/maven/continuum/ continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-webapp/src/main/java/org/apache/maven/cont... Date: Thu, 14 May 2009 08:48:44 -0000 To: commits@continuum.apache.org From: oching@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090514084844.8AEE12388866@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: oching Date: Thu May 14 08:48:44 2009 New Revision: 774693 URL: http://svn.apache.org/viewvc?rev=774693&view=rev Log: cleanup comments Modified: continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java Modified: continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java?rev=774693&r1=774692&r2=774693&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/DefaultContinuum.java Thu May 14 08:48:44 2009 @@ -986,8 +986,6 @@ Map projectsBuildDefinitionsMap = new HashMap(); projectsBuildDefinitionsMap.put( projectId, buildDef.getId() ); - // TODO: deng - projects under the same root project should be queued in the same checkout & build queue! - // - not sure where this should be fixed ProjectScmRoot scmRoot = getProjectScmRootByProject( projectId ); prepareBuildProjects( projectsBuildDefinitionsMap, trigger, scmRoot.getScmRootAddress(), scmRoot.getProjectGroup().getId(), scmRoot.getId() ); Modified: continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java?rev=774693&r1=774692&r2=774693&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-core/src/main/java/org/apache/maven/continuum/core/action/UpdateWorkingDirectoryFromScmContinuumAction.java Thu May 14 08:48:44 2009 @@ -102,10 +102,6 @@ catch ( Exception e ) { } - - // TODO: deng - should the update be from the scm root url? if so, then it seems that not all the projects within - // the same scm root should update! maybe only the root project? OR all projects sharing the same scm - // root must update from the scm root! (second option is more sensible) try { Modified: continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java URL: http://svn.apache.org/viewvc/continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java?rev=774693&r1=774692&r2=774693&view=diff ============================================================================== --- continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java (original) +++ continuum/branches/continuum-flat-multi-module/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/ReleaseRollbackAction.java Thu May 14 08:48:44 2009 @@ -92,9 +92,7 @@ ContinuumReleaseManagerListener listener = new DefaultReleaseManagerListener(); Project project = getContinuum().getProject( projectId ); - - // TODO: deng - this also needs to be updated! the workingDirectoryService called should be - // the one with the 3 params + releaseManager.rollback( releaseId, workingDirectoryService.getWorkingDirectory( project ).getPath(), listener ); //recurse until rollback is finished