Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 14941 invoked from network); 18 Oct 2005 20:55:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 18 Oct 2005 20:55:55 -0000 Received: (qmail 73798 invoked by uid 500); 18 Oct 2005 20:55:54 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 73771 invoked by uid 500); 18 Oct 2005 20:55:54 -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 73760 invoked by uid 99); 18 Oct 2005 20:55:53 -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; Tue, 18 Oct 2005 13:55:53 -0700 Received: (qmail 14481 invoked by uid 65534); 18 Oct 2005 20:55:21 -0000 Message-ID: <20051018205521.14480.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r326234 - in /maven/continuum/trunk: continuum-core/src/main/java/org/apache/maven/continuum/buildcontroller/ continuum-core/src/main/java/org/apache/maven/continuum/core/action/ continuum-core/src/main/java/org/apache/maven/continuum/scm/ ... Date: Tue, 18 Oct 2005 20:55:19 -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: Tue Oct 18 13:55:07 2005 New Revision: 326234 URL: http://svn.apache.org/viewcvs?rev=326234&view=rev Log: [CONTINUUM-357] Fix "ERROR: Unknown build state 0" message Modified: 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/ExecuteBuilderContinuumAction.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/Summary.vm 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=326234&r1=326233&r2=326234&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 Tue Oct 18 13:55:07 2005 @@ -142,15 +142,17 @@ if ( scmResult == null || !scmResult.isSuccess() ) { - build = makeBuildResult( scmResult, startTime, trigger ); + build = makeAndStoreBuildResult( project, scmResult, startTime, trigger ); String error = convertScmResultToError( scmResult ); build.setError( error ); - store.addBuildResult( project, build ); + store.updateBuildResult( build ); + + build = store.getBuildResult( build.getId() ); - project.setState( ContinuumProjectState.ERROR ); + project.setState( build.getState() ); store.updateProject( project ); @@ -166,6 +168,7 @@ actionManager.lookup( "execute-builder" ).execute( actionContext ); String s = (String) actionContext.get( AbstractContinuumAction.KEY_BUILD_ID ); + if ( s != null ) { build = store.getBuildResult( Integer.valueOf( s ).intValue() ); @@ -176,13 +179,14 @@ getLogger().error( "Error while building project.", e ); String s = (String) actionContext.get( AbstractContinuumAction.KEY_BUILD_ID ); + if ( s != null ) { build = store.getBuildResult( Integer.valueOf( s ).intValue() ); } else { - build = makeBuildResult( scmResult, startTime, trigger ); + build = makeAndStoreBuildResult( project, scmResult, startTime, trigger ); } // This can happen if the "update project from scm" action fails @@ -208,16 +212,11 @@ build.setError( error ); - if ( s != null ) - { - store.updateBuildResult( build ); - } - else - { - store.addBuildResult( project, build ); - } + store.updateBuildResult( build ); + + build = store.getBuildResult( build.getId() ); - project.setState( ContinuumProjectState.ERROR ); + project.setState( build.getState() ); store.updateProject( project ); } @@ -281,7 +280,8 @@ // // ---------------------------------------------------------------------- - private BuildResult makeBuildResult( ScmResult scmResult, long startTime, int trigger ) + private BuildResult makeAndStoreBuildResult( Project project, ScmResult scmResult, long startTime, int trigger ) + throws ContinuumStoreException { BuildResult build = new BuildResult(); @@ -295,6 +295,8 @@ build.setScmResult( scmResult ); - return build; + store.addBuildResult( project, build ); + + return store.getBuildResult( build.getId() ); } } Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java?rev=326234&r1=326233&r2=326234&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/ExecuteBuilderContinuumAction.java Tue Oct 18 13:55:07 2005 @@ -157,6 +157,8 @@ store.updateBuildResult( build ); + build = store.getBuildResult( build.getId() ); + store.updateProject( project ); notifier.goalsCompleted( project, build ); Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java?rev=326234&r1=326233&r2=326234&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java Tue Oct 18 13:55:07 2005 @@ -111,8 +111,6 @@ getLogger().warn( "Command output: " + result.getCommandOutput() ); getLogger().warn( "Provider message: " + result.getProviderMessage() ); - - throw new ContinuumScmException( "Error while checking out the project.", result ); } ChangeSet changeSet = (ChangeSet) result.getChanges().get( 0 ); @@ -187,8 +185,6 @@ getLogger().warn( "Command output: " + result.getCommandOutput() ); getLogger().warn( "Provider message: " + result.getProviderMessage() ); - - throw new ContinuumScmException( "Error while updating the project.", result ); } // TODO: total the number of files in the changesets Modified: maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java?rev=326234&r1=326233&r2=326234&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java (original) +++ maven/continuum/trunk/continuum-core/src/test/java/org/apache/maven/continuum/notification/ContinuumNotificationDispatcherTest.java Tue Oct 18 13:55:07 2005 @@ -40,8 +40,11 @@ Project project = addProject( store, "Notification Dispatcher Test Project" ); BuildResult build = new BuildResult(); + build.setStartTime( System.currentTimeMillis() ); + build.setState( ContinuumProjectState.BUILDING ); + build.setTrigger( ContinuumProjectState.TRIGGER_UNKNOWN ); store.addBuildResult( project, build ); 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=326234&r1=326233&r2=326234&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 Tue Oct 18 13:55:07 2005 @@ -86,6 +86,8 @@ #if ( $item.state == 1 || $item.state == 2 || $item.state == 3 || $item.state == 4 || $item.state == 6 ) Working Copy + #else + Working Copy #end #if ( $continuum.security.isAuthorized( $c1user, "deleteProject" ) )