You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2008/09/30 01:02:15 UTC
svn commit: r700300 - in /maven/components/trunk:
maven-core/src/main/java/org/apache/maven/errors/
maven-project/src/main/java/org/apache/maven/project/
Author: sisbell
Date: Mon Sep 29 16:02:15 2008
New Revision: 700300
URL: http://svn.apache.org/viewvc?rev=700300&view=rev
Log:
Removed unneeded class/methods related to extension scanner.
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelAndFile.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java?rev=700300&r1=700299&r2=700300&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/DefaultProjectErrorReporter.java Mon Sep 29 16:02:15 2008
@@ -20,7 +20,6 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.ModelAndFile;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -551,50 +550,6 @@
registerBuildError( cause, writer.toString() );
}
- public void reportErrorParsingParentProjectModel( ModelAndFile childInfo,
- File parentPomFile,
- XmlPullParserException cause )
- {
- StringWriter writer = new StringWriter();
-
- writer.write( NEWLINE );
- if ( parentPomFile == null )
- {
- writer.write( "Error parsing built-in super POM!" );
- }
- else
- {
- writer.write( "Error parsing parent-POM." );
- }
-
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( cause.getMessage() );
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( "Line: " );
- writer.write( "" + cause.getLineNumber() );
- writer.write( NEWLINE );
- writer.write( "Column: " );
- writer.write( "" + cause.getColumnNumber() );
- writer.write( NEWLINE );
-
- String projectId = childInfo.getModel().getParent().getId();
- String childId = childInfo.getModel().getId();
-
- addStandardInfo( projectId, parentPomFile, writer );
-
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( "Child-Project Id: " );
- writer.write( childId );
-
- addTips( ProjectErrorTips.getTipsForPomParsingError( projectId, parentPomFile, cause ),
- writer );
-
- registerBuildError( cause, writer.toString() );
- }
-
public void reportErrorParsingProjectModel( String projectId,
File pomFile,
IOException cause )
@@ -623,43 +578,6 @@
registerBuildError( cause, writer.toString() );
}
- public void reportErrorParsingParentProjectModel( ModelAndFile childInfo,
- File parentPomFile,
- IOException cause )
- {
- StringWriter writer = new StringWriter();
-
- writer.write( NEWLINE );
- if ( parentPomFile == null )
- {
- writer.write( "Error reading built-in super POM!" );
- }
- else
- {
- writer.write( "Error reading parent-POM." );
- }
-
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( cause.getMessage() );
- writer.write( NEWLINE );
-
- String projectId = childInfo.getModel().getParent().getId();
- String childId = childInfo.getModel().getId();
-
- addStandardInfo( projectId, parentPomFile, writer );
-
- writer.write( NEWLINE );
- writer.write( NEWLINE );
- writer.write( "Child-Project Id: " );
- writer.write( childId );
-
- addTips( ProjectErrorTips.getTipsForPomParsingError( projectId, parentPomFile, cause ),
- writer );
-
- registerBuildError( cause, writer.toString() );
- }
-
public void reportParentPomArtifactNotFound( Parent parentRef,
ProjectBuilderConfiguration config,
List remoteRepos,
Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java?rev=700300&r1=700299&r2=700300&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/errors/ProjectErrorReporter.java Mon Sep 29 16:02:15 2008
@@ -1,11 +1,8 @@
package org.apache.maven.errors;
import org.apache.maven.artifact.InvalidRepositoryException;
-import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.model.DeploymentRepository;
import org.apache.maven.model.Model;
-import org.apache.maven.model.Parent;
import org.apache.maven.model.Profile;
import org.apache.maven.model.Repository;
import org.apache.maven.profiles.activation.ProfileActivationContext;
@@ -15,9 +12,7 @@
import org.apache.maven.project.InvalidProjectModelException;
import org.apache.maven.project.InvalidProjectVersionException;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuilderConfiguration;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
-import org.apache.maven.project.ModelAndFile;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
@@ -275,21 +270,6 @@
* <br/>
* <pre>
* ...
- * --> DefaultModelLineageBuilder.buildModelLineage(..)
- * --> DefaultModelLineageBuilder.readModel(..) (private)
- * --> thrown XmlPullParserException
- * <------ ProjectBuildingException
- * </pre>
- */
- void reportErrorParsingParentProjectModel( ModelAndFile childInfo,
- File parentPomFile,
- XmlPullParserException cause );
-
- /**
- * <b>Call Stack:</b>
- * <br/>
- * <pre>
- * ...
* --> DefaultMavenProjectBuilder.buildFromRepository(..)
* --> DefaultMavenProjectBuilder.findModelFromRepository(..) (private)
* DefaultMavenProjectBuilder.build(..)
@@ -307,59 +287,6 @@
* <b>Call Stack:</b>
* <br/>
* <pre>
- * ...
- * --> DefaultModelLineageBuilder.buildModelLineage(..)
- * --> DefaultModelLineageBuilder.readModel(..) (private)
- * --> thrown IOException
- * <------ ProjectBuildingException
- * </pre>
- */
- void reportErrorParsingParentProjectModel( ModelAndFile childInfo,
- File parentPomFile,
- IOException cause );
-
- /**
- * <b>Call Stack:</b>
- * <br/>
- * <pre>
- * ...
- * --> DefaultModelLineageBuilder.buildModelLineage(..)
- * --> DefaultModelLineageBuilder.resolveParentPom(..) (private)
- * --> DefaultModelLineageBuilder.resolveParentFromRepository(..) (private)
- * --> thrown ArtifactNotFoundException
- * <---------- ProjectBuildingException
- * </pre>
- */
- void reportParentPomArtifactNotFound( Parent parentRef,
- ProjectBuilderConfiguration config,
- List remoteRepos,
- String childId,
- File childPomFile,
- ArtifactNotFoundException cause );
-
- /**
- * <b>Call Stack:</b>
- * <br/>
- * <pre>
- * ...
- * --> DefaultModelLineageBuilder.buildModelLineage(..)
- * --> DefaultModelLineageBuilder.resolveParentPom(..) (private)
- * --> DefaultModelLineageBuilder.resolveParentFromRepository(..) (private)
- * --> thrown ArtifactResolutionException
- * <---------- ProjectBuildingException
- * </pre>
- */
- void reportParentPomArtifactUnresolvable( Parent parentRef,
- ProjectBuilderConfiguration config,
- List remoteRepos,
- String childId,
- File childPomFile,
- ArtifactResolutionException cause );
-
- /**
- * <b>Call Stack:</b>
- * <br/>
- * <pre>
* MavenEmbedder.execute(MavenExecutionRequest)
* MavenEmbedder.readProjectWithDependencies(MavenExecutionRequest)
* --> DefaultMaven.execute(MavenExecutionRequest)