svn commit: r675372 - in /maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder: PomArtifactResolver.java impl/DefaultProjectBuilder.java

[sisbell]

Author: sisbell
Date: Wed Jul  9 15:51:30 2008
New Revision: 675372

URL: http://svn.apache.org/viewvc?rev=675372&view=rev
Log:
Fixed resolving of parent artifact bug.

Modified:
    
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
    
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java?rev=675372&r1=675371&r2=675372&view=diff
==============================================================================
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/PomArtifactResolver.java
 Wed Jul  9 15:51:30 2008
@@ -7,9 +7,11 @@
 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.artifact.resolver.ArtifactResolutionRequest;
 
 import java.util.List;
 import java.util.Date;
+import java.util.HashSet;
 import java.io.IOException;
 import java.io.File;
 
@@ -36,6 +38,27 @@
         File artifactFile = new File(localRepository.getBasedir(), 
localRepository.pathOf(artifact));
         artifact.setFile(artifactFile);
 
+        for(ArtifactRepository ar: remoteRepositories) {
+            System.out.println("repository: " + ar.getUrl());
+        }
+
+        try {
+            resolver.resolve( artifact, remoteRepositories, localRepository );
+        } catch (ArtifactResolutionException e) {
+            throw new IOException(e.getMessage());
+        } catch (ArtifactNotFoundException e) {
+            throw new IOException(e.getMessage());
+        }
+        /*
+        ArtifactResolutionRequest request = new ArtifactResolutionRequest()
+                .setArtifact(artifact)
+                .setLocalRepository(localRepository)
+                .setArtifactDependencies(new HashSet<Artifact>())
+                .setRemoteRepostories(remoteRepositories);
+        resolver.resolve(request);
+        */
+
+        /*
         if (!artifact.isSnapshot() && 
(ArtifactStatus.NONE.compareTo(ArtifactStatus.DEPLOYED) < 0)) {
             ArtifactRepositoryPolicy policy = new ArtifactRepositoryPolicy();
             
policy.setUpdatePolicy(ArtifactRepositoryPolicy.UPDATE_POLICY_NEVER);
@@ -52,5 +75,6 @@
                 throw new IOException("Parent pom not found: File = " + 
artifactFile.getAbsolutePath());
             }
         }
+        */
     }
 }

Modified: 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java?rev=675372&r1=675371&r2=675372&view=diff
==============================================================================
--- 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
 (original)
+++ 
maven/sandbox/branches/SI_MAVEN_2_1/maven-project/src/main/java/org/apache/maven/project/builder/impl/DefaultProjectBuilder.java
 Wed Jul  9 15:51:30 2008
@@ -9,6 +9,7 @@
 import org.apache.maven.project.builder.*;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
@@ -95,6 +96,7 @@
 
         Artifact artifactParent =
                 artifactFactory.createParentArtifact(parent.getGroupId(), 
parent.getArtifactId(), parent.getVersion());
+
         try {
             artifactResolver.resolve(artifactParent);
         } catch (IOException e) {