Author: brett Date: Tue May 10 22:58:03 2005 New Revision: 169591 URL: http://svn.apache.org/viewcvs?rev=169591&view=rev Log: PR: MNG-344 correctly render exceptions for initial project retrieval failure
Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Modified: maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java?rev=169591&r1=169590&r2=169591&view=diff ============================================================================== --- maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java (original) +++ maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/ArtifactResolutionException.java Tue May 10 22:58:03 2005 @@ -80,28 +80,26 @@ } } - // TODO: don't show this section for metadata - sb.append( LS ); - sb.append( LS ); - sb.append( "Try downloading the file manually" ); - if ( downloadUrl != null ) + if ( downloadUrl != null && !type.equals( "pom" ) ) { - sb.append( " from " ); + sb.append( LS ); + sb.append( LS ); + sb.append( "Try downloading the file manually from" ); sb.append( LS ); sb.append( " " + downloadUrl ); + sb.append( LS ); + sb.append( "and install it using the command: " ); + sb.append( LS ); + sb.append( " m2 install:install-file -DgroupId=" ); + sb.append( groupId ); + sb.append( " -DartifactId=" ); + sb.append( artifactId ); + sb.append( " -Dversion=" ); + sb.append( version ); + sb.append( " -Dpackaging=" ); + sb.append( type ); + sb.append( " -Dfile=/path/to/file" ); } - sb.append( LS ); - sb.append( "and install it using the command: " ); - sb.append( LS ); - sb.append( " m2 install:install-file -DgroupId=" ); - sb.append( groupId ); - sb.append( " -DartifactId=" ); - sb.append( artifactId ); - sb.append( " -Dversion=" ); - sb.append( version ); - sb.append( " -Dpackaging=" ); - sb.append( type ); - sb.append( " -Dfile=/path/to/file" ); return sb.toString(); } Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=169591&r1=169590&r2=169591&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Tue May 10 22:58:03 2005 @@ -58,6 +58,7 @@ /** * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl </a> * @version $Id$ + * @todo unify error reporting. We should return one response, always - and let the CLI decide how to render it. The reactor response should contain individual project responses */ public class DefaultMaven extends AbstractLogEnabled @@ -120,17 +121,33 @@ { throw new ReactorException( "Error processing projects for the reactor: ", e ); } - catch ( ProjectBuildingException e ) - { - throw new ReactorException( "Error processing projects for the reactor: ", e ); - } catch ( CycleDetectedException e ) { throw new ReactorException( "Error processing projects for the reactor: ", e ); } catch ( ArtifactResolutionException e ) { - throw new ReactorException( "Error processing projects for the reactor: ", e ); + dispatcher.dispatchError( event, request.getBaseDirectory(), e ); + + MavenExecutionResponse response = new MavenExecutionResponse(); + response.setStart( new Date() ); + response.setFinish( new Date() ); + response.setException( e ); + logFailure( response, e, null ); + + return response; + } + catch ( ProjectBuildingException e ) + { + dispatcher.dispatchError( event, request.getBaseDirectory(), e ); + + MavenExecutionResponse response = new MavenExecutionResponse(); + response.setStart( new Date() ); + response.setFinish( new Date() ); + response.setException( e ); + logFailure( response, e, null ); + + return response; } try @@ -150,6 +167,8 @@ MavenExecutionResponse response = processProject( request, project, dispatcher ); if ( response.isExecutionFailure() ) { + dispatcher.dispatchError( event, request.getBaseDirectory(), response.getException() ); + return response; } } @@ -414,6 +433,7 @@ line(); } + // TODO: needs to honour -e if ( getLogger().isDebugEnabled() ) { getLogger().debug( "Trace", e ); Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java?rev=169591&r1=169590&r2=169591&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/Maven.java Tue May 10 22:58:03 2005 @@ -19,6 +19,8 @@ import org.apache.maven.execution.MavenExecutionRequest; import org.apache.maven.execution.MavenExecutionResponse; import org.apache.maven.reactor.ReactorException; +import org.apache.maven.project.ProjectBuildingException; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; /** * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl </a> Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java?rev=169591&r1=169590&r2=169591&view=diff ============================================================================== --- maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java (original) +++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java Tue May 10 22:58:03 2005 @@ -272,7 +272,7 @@ } else { - System.err.println( "For more information, run with the -X flag" ); + System.err.println( "For more information, run with the -e flag" ); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]