Return-Path: Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org Received: (qmail 68666 invoked from network); 31 Oct 2005 14:26:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 31 Oct 2005 14:26:34 -0000 Received: (qmail 37771 invoked by uid 500); 31 Oct 2005 14:26:34 -0000 Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org Received: (qmail 37755 invoked by uid 500); 31 Oct 2005 14:26:34 -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 37744 invoked by uid 99); 31 Oct 2005 14:26:34 -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; Mon, 31 Oct 2005 06:26:33 -0800 Received: (qmail 25335 invoked by uid 65534); 31 Oct 2005 08:59:32 -0000 Message-ID: <20051031085932.25334.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r329775 - in /maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum: buildcontroller/DefaultBuildController.java core/action/CreateProjectsFromMetadata.java scm/DefaultContinuumScm.java Date: Mon, 31 Oct 2005 08:59:31 -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: Mon Oct 31 00:59:25 2005 New Revision: 329775 URL: http://svn.apache.org/viewcvs?rev=329775&view=rev Log: [CONTINUUM-400] Show scm error messages in build result page 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/CreateProjectsFromMetadata.java maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/scm/DefaultContinuumScm.java 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=329775&r1=329774&r2=329775&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 Mon Oct 31 00:59:25 2005 @@ -144,9 +144,10 @@ if ( scmResult == null || !scmResult.isSuccess() ) { - build = makeAndStoreBuildResult( project, scmResult, startTime, trigger ); - + // scmResult must be converted before sotring it because jpox modify value of all fields to null String error = convertScmResultToError( scmResult ); + + build = makeAndStoreBuildResult( project, scmResult, startTime, trigger ); build.setError( error ); Modified: maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java?rev=329775&r1=329774&r2=329775&view=diff ============================================================================== --- maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java (original) +++ maven/continuum/trunk/continuum-core/src/main/java/org/apache/maven/continuum/core/action/CreateProjectsFromMetadata.java Mon Oct 31 00:59:25 2005 @@ -41,6 +41,7 @@ URL url; ContinuumProjectBuilder projectBuilder = projectBuilderManager.getProjectBuilder( projectBuilderId ); + ContinuumProjectBuildingResult result = null; try @@ -48,14 +49,17 @@ if ( !u.startsWith( "http" ) ) { url = new URL( u ); + result = projectBuilder.buildProjectsFromMetadata( url, null, null ); } else { MungedHttpsURL mungedURL = new MungedHttpsURL( u ); + if ( mungedURL.isValid() ) { url = mungedURL.getURL(); + result = projectBuilder.buildProjectsFromMetadata( url, mungedURL.getUsername(), mungedURL .getPassword() ); } 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=329775&r1=329774&r2=329775&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 Mon Oct 31 00:59:25 2005 @@ -315,6 +315,8 @@ { ScmResult result = new ScmResult(); + result.setCommandLine( scmResult.getCommandLine() ); + result.setSuccess( scmResult.isSuccess() ); result.setCommandOutput( scmResult.getCommandOutput() );