continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
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 GMT
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() );



Mime
View raw message