From continuum-commits-return-387-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org Sun Jul 03 17:35:02 2005 Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 85382 invoked from network); 3 Jul 2005 17:35:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 Jul 2005 17:35:01 -0000 Received: (qmail 15124 invoked by uid 500); 3 Jul 2005 17:35:01 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 15107 invoked by uid 500); 3 Jul 2005 17:35:01 -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 15094 invoked by uid 99); 3 Jul 2005 17:35:01 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=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; Sun, 03 Jul 2005 10:35:01 -0700 Received: (qmail 85364 invoked by uid 65534); 3 Jul 2005 17:34:58 -0000 Message-ID: <20050703173458.85363.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r208961 - 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/java/org/apache/maven/continuum/buildcontroller/ continuum-core/sr... Date: Sun, 03 Jul 2005 17:34:57 -0000 To: continuum-commits@maven.apache.org From: trygvis@apache.org X-Mailer: svnmailer-1.0.2 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trygvis Date: Sun Jul 3 10:34:56 2005 New Revision: 208961 URL: http://svn.apache.org/viewcvs?rev=208961&view=rev Log: o Adding a 'checkout' button. 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/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckOutProjectContinuumAction.java maven/continuum/trunk/continuum-plexus-application/pom.xml maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.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=208961&r1=208960&r2=208961&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 Sun Jul 3 10:34:56 2005 @@ -36,9 +36,19 @@ { String ROLE = Continuum.class.getName(); + // ---------------------------------------------------------------------- + // Project + // ---------------------------------------------------------------------- + void removeProject( String projectId ) throws ContinuumException; + boolean isBuilding( String id ) + throws ContinuumException; + + void checkoutProject( String id ) + throws ContinuumException; + ContinuumProject getProject( String projectId ) throws ContinuumException; @@ -48,10 +58,6 @@ CheckOutScmResult getCheckOutScmResultForProject( String projectId ) throws ContinuumException; - // ---------------------------------------------------------------------- - // Projects - // ---------------------------------------------------------------------- - Collection getProjects() throws ContinuumException; @@ -62,9 +68,6 @@ throws ContinuumException; ContinuumBuild getLatestBuildForProject( String id ) - throws ContinuumException; - - boolean isBuilding( String id ) throws ContinuumException; // ---------------------------------------------------------------------- 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=208961&r1=208960&r2=208961&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 Sun Jul 3 10:34:56 2005 @@ -27,6 +27,7 @@ import org.apache.maven.continuum.core.action.AbstractContinuumAction; import org.apache.maven.continuum.core.action.CreateProjectsFromMetadata; import org.apache.maven.continuum.core.action.StoreProjectAction; +import org.apache.maven.continuum.core.action.AddProjectToCheckOutQueueAction; import org.apache.maven.continuum.project.AntProject; import org.apache.maven.continuum.project.ContinuumBuild; import org.apache.maven.continuum.project.ContinuumProject; @@ -120,12 +121,6 @@ return core.getLatestBuildForProject( id ); } - public boolean isBuilding( String id ) - throws ContinuumException - { - return core.isBuilding( id ); - } - // ---------------------------------------------------------------------- // // ---------------------------------------------------------------------- @@ -134,6 +129,29 @@ throws ContinuumException { core.removeProject( projectId ); + } + + public boolean isBuilding( String id ) + throws ContinuumException + { + return core.isBuilding( id ); + } + + public void checkoutProject( String id ) + throws ContinuumException + { + Map context = new HashMap(); + + context.put( AddProjectToCheckOutQueueAction.KEY_PROJECT_ID, id ); + + try + { + actionManager.lookup( "add-project-to-checkout-queue" ).execute( context ); + } + catch ( Exception e ) + { + throw new ContinuumException( "Error while adding the project to the check out queue.", e ); + } } public ContinuumProject getProject( String projectId ) Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/DefaultBuildController.java Sun Jul 3 10:34:56 2005 @@ -22,14 +22,11 @@ import java.util.HashMap; import java.util.Map; -import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.core.action.AbstractContinuumAction; -import org.apache.maven.continuum.execution.manager.BuildExecutorManager; import org.apache.maven.continuum.notification.ContinuumNotificationDispatcher; import org.apache.maven.continuum.project.ContinuumBuild; import org.apache.maven.continuum.project.ContinuumProject; import org.apache.maven.continuum.project.ContinuumProjectState; -import org.apache.maven.continuum.scm.ContinuumScm; import org.apache.maven.continuum.scm.UpdateScmResult; import org.apache.maven.continuum.store.ContinuumStore; import org.apache.maven.continuum.store.ContinuumStoreException; Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/AbstractContinuumAction.java Sun Jul 3 10:34:56 2005 @@ -30,6 +30,7 @@ import org.codehaus.plexus.action.Action; import org.codehaus.plexus.logging.AbstractLogEnabled; import org.codehaus.plexus.taskqueue.TaskQueue; +import org.codehaus.plexus.util.StringUtils; import java.io.File; import java.util.Map; @@ -74,6 +75,19 @@ */ private ContinuumNotificationDispatcher notificationDispatcher; + // ---------------------------------------------------------------------- + // Utils + // ---------------------------------------------------------------------- + + protected String nullIfEmpty( String string ) + { + if ( StringUtils.isEmpty( string ) ) + { + return null; + } + + return string; + } // ---------------------------------------------------------------------- // Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckOutProjectContinuumAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckOutProjectContinuumAction.java?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckOutProjectContinuumAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CheckOutProjectContinuumAction.java Sun Jul 3 10:34:56 2005 @@ -88,9 +88,9 @@ project.setCheckOutScmResult( result ); - project.setCheckOutErrorMessage( errorMessage ); + project.setCheckOutErrorMessage( nullIfEmpty( errorMessage ) ); - project.setCheckOutErrorException( AbstractContinuumStore.throwableToString( exception ) ); + project.setCheckOutErrorException( nullIfEmpty( AbstractContinuumStore.throwableToString( exception ) ) ); getStore().updateProject( project ); } Modified: maven/continuum/trunk/continuum-plexus-application/pom.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-plexus-application/pom.xml?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-plexus-application/pom.xml (original) +++ maven/continuum/trunk/continuum-plexus-application/pom.xml Sun Jul 3 10:34:56 2005 @@ -105,6 +105,12 @@ 1.0-alpha-1 runtime + + org.apache.maven.scm + maven-scm-provider-local + 1.0-alpha-1 + runtime + Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java (original) +++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/pipeline/valve/FormicaValve.java Sun Jul 3 10:34:56 2005 @@ -81,7 +81,7 @@ } catch ( FormToolException e ) { - throw new ValveInvocationException( "Error populating context: ", e ); + throw new ValveInvocationException( "Error populating context.", e ); } } } Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java (original) +++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/FormicaTool.java Sun Jul 3 10:34:56 2005 @@ -276,7 +276,7 @@ } catch ( ComponentLookupException e ) { - throw new FormToolException( "Cannot lookup source component: ", e ); + throw new FormToolException( "Cannot lookup source component.", e ); } Map map = new HashMap(); Modified: maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/META-INF/plexus/components.xml Sun Jul 3 10:34:56 2005 @@ -270,6 +270,10 @@ buildAllProjects buildProjects() + + checkoutProject + checkoutProject(#id) + Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/CommonMacros.vm Sun Jul 3 10:34:56 2005 @@ -32,7 +32,11 @@ ## ---------------------------------------------------------------------------- #macro ( text $element $elementData ) +#if ( $element && $element.attributes && $element.attributes.size > 0 ) +#else + +#end #end #macro ( textarea $element $elementData ) Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm Sun Jul 3 10:34:56 2005 @@ -1,10 +1,14 @@ $page.setTitle( "Continuum - ${project.name} Builds" )
- #if ( $project.checkOutErrorException ) + #if ( !$project.checkOutScmResult.success )

Checkout Exception

+ There was a error while checking out the project: $project.checkOutErrorMessage + + #if ( $project.checkOutErrorException && $project.checkOutErrorException != "" ) 

$project.checkOutErrorException
+ #end

#end

Build results for $project.name

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm?rev=208961&r1=208960&r2=208961&view=diff ============================================================================== --- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm (original) +++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/View.vm Sun Jul 3 10:34:56 2005 @@ -13,8 +13,20 @@ #end #end + +
+ + + +
+
+ #hidden ( "action" "cam" ) + #hidden ( "cid" "checkoutProject" ) + #hidden ( "id" "$item.id" ) + +
+
- #bar()