Author: jvanzyl
Date: Mon Dec 15 20:10:14 2008
New Revision: 726942
URL: http://svn.apache.org/viewvc?rev=726942&view=rev
Log:
o remove MissingRepositoryElementException from the core and just leave in
compat
o make the project builder's read from path use a file instead of a input stream
Removed:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MissingRepositoryElementException.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
Modified:
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java?rev=726942&r1=726941&r2=726942&view=diff
==============================================================================
---
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
(original)
+++
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/InvalidRepositoryException.java
Mon Dec 15 20:10:14 2008
@@ -57,7 +57,7 @@
this.repositoryId = null;
}
- protected InvalidRepositoryException( String message,
+ public InvalidRepositoryException( String message,
String repositoryId )
{
super( message );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java?rev=726942&r1=726941&r2=726942&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java
Mon Dec 15 20:10:14 2008
@@ -122,13 +122,12 @@
if ( id == null || id.trim().length() < 1 )
{
- throw new MissingRepositoryElementException( "Repository ID
must not be empty (URL is: " + url + ")." );
+ throw new InvalidRepositoryException( "Repository ID must not
be empty (URL is: " + url + ").", url );
}
- if ( url == null || url.trim().length() < 1 )
+ if ( url == null || url.trim().length() < 1 )
{
- throw new MissingRepositoryElementException( "Repository URL
must not be empty (ID is: " + id + ").",
- id );
+ throw new InvalidRepositoryException( "Repository URL must not
be empty (ID is: " + id + ").", id );
}
ArtifactRepositoryPolicy snapshots =
buildArtifactRepositoryPolicy( repo.getSnapshots() );
@@ -169,7 +168,7 @@
}
// From MavenExecutionRequestPopulator
-
+
public ArtifactRepository createLocalRepository( String url, String
repositoryId )
throws IOException
{
@@ -371,4 +370,30 @@
{
this.logger = logger;
}
+
+ /**
+ * Resolves the specified artifact
+ *
+ * @param artifact the artifact to resolve
+ * @throws IOException if there is a problem resolving the artifact
+ */
+ public void resolve( Artifact artifact, ArtifactRepository
localRepository, List<ArtifactRepository> remoteRepositories )
+ throws IOException
+ {
+ File artifactFile = new File( localRepository.getBasedir(),
localRepository.pathOf( artifact ) );
+ artifact.setFile( artifactFile );
+
+ try
+ {
+ artifactResolver.resolve( artifact, remoteRepositories,
localRepository );
+ }
+ catch ( ArtifactResolutionException e )
+ {
+ throw new IOException( e.getMessage() );
+ }
+ catch ( ArtifactNotFoundException e )
+ {
+ throw new IOException( e.getMessage() );
+ }
+ }
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java?rev=726942&r1=726941&r2=726942&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java
Mon Dec 15 20:10:14 2008
@@ -37,10 +37,6 @@
*/
public interface MavenTools
{
- //
----------------------------------------------------------------------------
- // Methods taken from ProjectUtils
- //
----------------------------------------------------------------------------
-
List<ArtifactRepository> buildArtifactRepositories( List<Repository>
repositories )
throws InvalidRepositoryException;
@@ -66,7 +62,11 @@
void findModelFromRepository( Artifact artifact, List
remoteArtifactRepositories, ArtifactRepository localRepository )
throws ProjectBuildingException;
- List buildArtifactRepositories( Model model )
+ List<ArtifactRepository> buildArtifactRepositories( Model model )
throws ProjectBuildingException;
+ // PomArtifactResolver
+
+ void resolve( Artifact artifact, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories )
+ throws IOException;
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=726942&r1=726941&r2=726942&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Mon Dec 15 20:10:14 2008
@@ -20,7 +20,6 @@
*/
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
@@ -551,7 +550,7 @@
try
{
- mavenProject = projectBuilder.buildFromLocalPath( new
FileInputStream( projectDescriptor ),
+ mavenProject = projectBuilder.buildFromLocalPath(
projectDescriptor,
Arrays.asList(
getSuperProject( config, projectDescriptor, true ).getModel() ),
null,
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java?rev=726942&r1=726941&r2=726942&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
Mon Dec 15 20:10:14 2008
@@ -19,6 +19,21 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Stack;
+
import org.apache.maven.MavenTools;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
@@ -61,21 +76,6 @@
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
-
/**
* The concern of the project is provide runtime values based on the model.
<p/>
* The values in the model remain untouched but during the process of building
a
@@ -195,14 +195,13 @@
setModel( model );
}
- public MavenProject( Model model, ArtifactFactory artifactFactory,
MavenTools mavenTools, MavenProjectBuilder mavenProjectBuilder,
- ProjectBuilderConfiguration
projectBuilderConfiguration )
+ public MavenProject( Model model, ArtifactFactory artifactFactory,
MavenTools mavenTools, MavenProjectBuilder mavenProjectBuilder,
ProjectBuilderConfiguration projectBuilderConfiguration )
throws InvalidRepositoryException
{
setModel( model );
- this.artifactFactory = artifactFactory;
this.mavenProjectBuilder = mavenProjectBuilder;
this.projectBuilderConfiguration = projectBuilderConfiguration;
+ this.artifactFactory = artifactFactory;
originalModel = model;
DistributionManagement dm = model.getDistributionManagement();
@@ -354,16 +353,6 @@
e.printStackTrace();
}
}
- /*
- else
- {
- try {
- parent =
mavenProjectBuilder.buildStandaloneSuperProject(projectBuilderConfiguration);
- } catch (ProjectBuildingException e) {
- e.printStackTrace();
- }
- }
- */
}
return parent;
}
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java?rev=726942&r1=726941&r2=726942&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/ProjectBuilder.java
Mon Dec 15 20:10:14 2008
@@ -50,7 +50,7 @@
* @return a maven project for the specified input stream
* @throws IOException if there is a problem in the construction of the
maven project
*/
- MavenProject buildFromLocalPath( InputStream pom, List<Model>
inheritedModels, Collection<ImportModel> importModels,
+ MavenProject buildFromLocalPath( File pom, List<Model> inheritedModels,
Collection<ImportModel> importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
PomArtifactResolver resolver, File
baseDirectory,
ProjectBuilderConfiguration
projectBuilderConfiguration )
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=726942&r1=726941&r2=726942&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
Mon Dec 15 20:10:14 2008
@@ -83,7 +83,7 @@
/**
* @see ProjectBuilder#buildFromLocalPath(java.io.InputStream,
java.util.List, java.util.Collection, java.util.Collection,
org.apache.maven.project.builder.PomArtifactResolver, java.io.File,
org.apache.maven.project.ProjectBuilderConfiguration)
*/
- public MavenProject buildFromLocalPath( InputStream pom, List<Model>
inheritedModels,
+ public MavenProject buildFromLocalPath( File pom, List<Model>
inheritedModels,
Collection<ImportModel>
importModels,
Collection<InterpolatorProperty>
interpolatorProperties,
PomArtifactResolver resolver, File
projectDirectory,
