Author: jvanzyl Date: Fri Feb 20 18:03:46 2009 New Revision: 746311 URL: http://svn.apache.org/viewvc?rev=746311&view=rev Log: o remove legacy artifact component references from the embedder
Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.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/pom.xml Modified: maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java?rev=746311&r1=746310&r2=746311&view=diff ============================================================================== --- maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java (original) +++ maven/components/trunk/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedder.java Fri Feb 20 18:03:46 2009 @@ -31,14 +31,11 @@ import java.util.List; import org.apache.maven.Maven; +import org.apache.maven.MavenTools; import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.factory.ArtifactFactory; -import org.apache.maven.artifact.handler.ArtifactHandler; -import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; -import org.apache.maven.artifact.resolver.ArtifactResolver; import org.apache.maven.embedder.execution.MavenExecutionRequestPopulator; import org.apache.maven.errors.CoreErrorReporter; import org.apache.maven.errors.CoreReporterManager; @@ -140,12 +137,8 @@ private MavenXpp3Writer modelWriter; - private ArtifactFactory artifactFactory; - - private ArtifactResolver artifactResolver; - - private ArtifactHandlerManager artifactHandlerManager; - + private MavenTools repositoryTools; + private Maven maven; private MavenExecutionRequestPopulator populator; @@ -474,7 +467,7 @@ String scope, String type ) { - return artifactFactory.createArtifact( groupId, artifactId, version, scope, type ); + return repositoryTools.createArtifact( groupId, artifactId, version, scope, type ); } public Artifact createArtifactWithClassifier( String groupId, @@ -483,7 +476,7 @@ String type, String classifier ) { - return artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier ); + return repositoryTools.createArtifactWithClassifier( groupId, artifactId, version, type, classifier ); } public void resolve( Artifact artifact, @@ -491,12 +484,7 @@ ArtifactRepository localRepository ) throws ArtifactResolutionException, ArtifactNotFoundException { - artifactResolver.resolve( artifact, remoteRepositories, localRepository ); - } - - public ArtifactHandler getArtifactHandler( Artifact artifact ) - { - return artifactHandlerManager.getArtifactHandler( artifact.getType() ); + repositoryTools.resolve( artifact, localRepository, remoteRepositories ); } // ---------------------------------------------------------------------- @@ -665,22 +653,14 @@ mavenProjectBuilder = container.lookup( MavenProjectBuilder.class ); - // ---------------------------------------------------------------------- - // Artifact related components - // ---------------------------------------------------------------------- - - artifactFactory = container.lookup( ArtifactFactory.class ); - - artifactResolver = container.lookup( ArtifactResolver.class ); - populator = container.lookup( MavenExecutionRequestPopulator.class ); buildPlanner = container.lookup( BuildPlanner.class ); - artifactHandlerManager = container.lookup( ArtifactHandlerManager.class ); - pluginRepository = container.lookup( PluginRepository.class ); + repositoryTools = container.lookup( MavenTools.class ); + // This is temporary as we can probably cache a single request and use it for default values and // simply cascade values in from requests used for individual executions. request = new DefaultMavenExecutionRequest(); 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=746311&r1=746310&r2=746311&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 Fri Feb 20 18:03:46 2009 @@ -86,6 +86,18 @@ private static HashMap<String, Artifact> cache = new HashMap<String, Artifact>(); + // Artifact Creation + + public Artifact createArtifact(String groupId, String artifactId, String version, String scope, String type) + { + return artifactFactory.createArtifact(groupId, artifactId, version, scope, type); + } + + public Artifact createArtifactWithClassifier(String groupId, String artifactId, String version, String type, String classifier) + { + return artifactFactory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier); + } + // ---------------------------------------------------------------------------- // Code snagged from ProjectUtils: this will have to be moved somewhere else // but just trying to collect it all in one place right now. @@ -391,23 +403,11 @@ * @throws IOException if there is a problem resolving the artifact */ public void resolve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories ) - throws IOException + throws ArtifactResolutionException, ArtifactNotFoundException { 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() ); - } + artifactResolver.resolve( artifact, remoteRepositories, localRepository ); } // ------------------------------------------------------------------------ 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=746311&r1=746310&r2=746311&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 Fri Feb 20 18:03:46 2009 @@ -26,6 +26,8 @@ import org.apache.maven.artifact.InvalidRepositoryException; import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; +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.Repository; @@ -68,8 +70,12 @@ // PomArtifactResolver void resolve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories ) - throws IOException; + throws ArtifactResolutionException, ArtifactNotFoundException; + Artifact createArtifact(String groupId, String artifactId, String version, String scope, String type); + + Artifact createArtifactWithClassifier(String groupId, String artifactId, String version, String type, String classifier); + // WagonManager ArtifactRepository getMirrorRepository( ArtifactRepository repository ); Modified: maven/components/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/components/trunk/pom.xml?rev=746311&r1=746310&r2=746311&view=diff ============================================================================== --- maven/components/trunk/pom.xml (original) +++ maven/components/trunk/pom.xml Fri Feb 20 18:03:46 2009 @@ -59,7 +59,7 @@ <mercuryMp3Version>1.0-alpha-1</mercuryMp3Version> <securityDispatcherVersion>1.0</securityDispatcherVersion> <woodstoxVersion>3.2.6</woodstoxVersion> - <modelloVersion>1.0</modelloVersion> + <modelloVersion>1.0.1-SNAPSHOT</modelloVersion> <jxpathVersion>1.3</jxpathVersion> </properties> <issueManagement>