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

[si...@apache.org]

Author: sisbell
Date: Tue Jul 15 03:47:33 2008
New Revision: 676864

URL: http://svn.apache.org/viewvc?rev=676864&view=rev
Log:
Now checks for artifact on local path before attempting to resolve from repo.

Modified:
    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/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=676864&r1=676863&r2=676864&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 Tue Jul 15 03:47:33 2008
@@ -92,13 +92,13 @@
         Artifact artifact = artifactFactory.createProjectArtifact(model.getGroupId(), model.getArtifactId(),
                 model.getVersion());
         if (mavenProject.getBuild() != null && mavenProject.getBuild().getOutputDirectory() != null
-                &&  mavenProject.getBuild().getFinalName() != null) {
+                && mavenProject.getBuild().getFinalName() != null) {
             File artifactFile = new File(mavenProject.getBuild().getOutputDirectory(), mavenProject.getBuild().getFinalName());
             if (!artifactFile.exists()) {
                 throw new IOException("Artifact does not exist: File = " + artifactFile.getAbsolutePath());
             }
             artifact.setFile(artifactFile);
-        }  else {
+        } else {
             logger.warn("Build section of pom is null");
         }
 
@@ -124,33 +124,26 @@
         Artifact artifactParent =
                 artifactFactory.createParentArtifact(parent.getGroupId(), parent.getArtifactId(), parent.getVersion());
 
-        try {
-            artifactResolver.resolve(artifactParent);
-        } catch (IOException e) {
-            // throw new IOException("getDomainModelFromRepository");
-        }
-
-        if (!artifactParent.getFile().exists()) {
-            logger.info("Parent pom does not exist in repository: File = " + artifactParent.getFile().getAbsolutePath());
-            Model model = domainModel.getModel();
-
-            File parentFile = new File(projectDirectory, model.getParent().getRelativePath()).getCanonicalFile();
-            if (parentFile.isDirectory()) {
-                parentFile = new File(parentFile, "pom.xml");
-            }
+        Model model = domainModel.getModel();
 
-            //logger.info("Project Directory = " + projectDirectory.getAbsolutePath()) ;
-            //logger.info("Relative PATH = " + model.getParent().getRelativePath());
-            //logger.info("File:" + new File(projectDirectory, model.getParent().getRelativePath()).getAbsolutePath());
-            //logger.info("Canonical Parent File: = " + parentFile.getAbsolutePath());
+        File parentFile = new File(projectDirectory, model.getParent().getRelativePath()).getCanonicalFile();
+        if (parentFile.isDirectory()) {
+            parentFile = new File(parentFile, "pom.xml");
+        }
 
-            if (!parentFile.exists()) {
-                logger.warn("Parent pom does not exist on local path: File = " + parentFile.getAbsolutePath());
+        //logger.info("Project Directory = " + projectDirectory.getAbsolutePath()) ;
+        //logger.info("Relative PATH = " + model.getParent().getRelativePath());
+        //logger.info("File:" + new File(projectDirectory, model.getParent().getRelativePath()).getAbsolutePath());
+        //logger.info("Canonical Parent File: = " + parentFile.getAbsolutePath());
+        artifactParent.setFile(parentFile);
+        if (!parentFile.exists()) {
+            logger.info("Parent pom does not exist on local path: File = " + parentFile.getAbsolutePath());
+            artifactResolver.resolve(artifactParent);
 //                  throw new IOException("Parent pom does not exist: File = " + artifactParent.getFile() + ", Child Id = " +
-                //                         model.getGroupId() + ":" + model.getArtifactId() + ":" + model.getVersion());
-            }
-            artifactParent.setFile(parentFile);
+            //                         model.getGroupId() + ":" + model.getArtifactId() + ":" + model.getVersion());
         }
+
+
         PomClassicDomainModel parentDomainModel = new PomClassicDomainModel(new FileInputStream(artifactParent.getFile()));
         if (!parentDomainModel.matchesParent(domainModel.getModel().getParent())) {
             logger.warn("Parent pom ids do not match: File = " + artifactParent.getFile().getAbsolutePath());