svn commit: r987610 - in /maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project: DefaultProjectBuilder.java MavenProject.java

[be...@apache.org]

Author: bentmann
Date: Fri Aug 20 19:28:22 2010
New Revision: 987610

URL: http://svn.apache.org/viewvc?rev=987610&view=rev
Log:
[MNG-4773] Stack trace printed from MavenProject.getParent

Modified:
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
    maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=987610&r1=987609&r2=987610&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Fri Aug 20 19:28:22 2010
@@ -49,6 +49,7 @@ import org.apache.maven.project.artifact
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.component.annotations.Requirement;
+import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.Os;
 import org.codehaus.plexus.util.StringUtils;
 
@@ -61,6 +62,9 @@ public class DefaultProjectBuilder
 {
 
     @Requirement
+    private Logger logger;
+
+    @Requirement
     private ModelBuilder modelBuilder;
 
     @Requirement
@@ -106,7 +110,7 @@ public class DefaultProjectBuilder
             {
                 ModelBuildingRequest request = getModelBuildingRequest( configuration, null );
 
-                project = new MavenProject( repositorySystem, this, configuration );
+                project = new MavenProject( repositorySystem, this, configuration, logger );
 
                 DefaultModelBuildingListener listener =
                     new DefaultModelBuildingListener( project, projectBuildingHelper, configuration );
@@ -313,7 +317,7 @@ public class DefaultProjectBuilder
         {
             ModelBuildingRequest request = getModelBuildingRequest( config, reactorModelPool );
 
-            MavenProject project = new MavenProject( repositorySystem, this, config );
+            MavenProject project = new MavenProject( repositorySystem, this, config, logger );
 
             request.setPomFile( pomFile );
             request.setTwoPhaseBuilding( true );

Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=987610&r1=987609&r2=987610&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java Fri Aug 20 19:28:22 2010
@@ -72,6 +72,7 @@ import org.apache.maven.project.artifact
 import org.apache.maven.project.artifact.MavenMetadataSource;
 import org.apache.maven.repository.RepositorySystem;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
+import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
@@ -181,6 +182,8 @@ public class MavenProject
 
     private final Set<String> lifecyclePhases = Collections.synchronizedSet( new LinkedHashSet<String>() );
 
+    private Logger logger;
+
     public MavenProject()
     {
         Model model = new Model();
@@ -232,7 +235,7 @@ public class MavenProject
      * @throws InvalidRepositoryException
      */
     MavenProject( RepositorySystem repositorySystem, ProjectBuilder mavenProjectBuilder,
-                  ProjectBuildingRequest projectBuilderConfiguration )
+                  ProjectBuildingRequest projectBuilderConfiguration, Logger logger )
     {
         if ( repositorySystem == null )
         {
@@ -242,6 +245,7 @@ public class MavenProject
         this.mavenProjectBuilder = mavenProjectBuilder;
         this.projectBuilderConfiguration = projectBuilderConfiguration;
         this.repositorySystem = repositorySystem;
+        this.logger = logger;
     }
 
     @Deprecated
@@ -345,8 +349,10 @@ public class MavenProject
                 }
                 catch ( ProjectBuildingException e )
                 {
-                    //TODO: awful
-                    e.printStackTrace();
+                    if ( logger != null )
+                    {
+                        logger.debug( "Failed to build parent project for " + getId(), e );
+                    }
                 }
             }
             else if ( model.getParent() != null )
@@ -357,8 +363,10 @@ public class MavenProject
                 }
                 catch ( ProjectBuildingException e )
                 {
-                    // TODO: awful
-                    e.printStackTrace();
+                    if ( logger != null )
+                    {
+                        logger.debug( "Failed to build parent project for " + getId(), e );
+                    }
                 }
             }
         }
@@ -1423,8 +1431,10 @@ public class MavenProject
 
         if ( attachedArtifacts.contains( artifact ) )
         {
-            //should add logger to this class:
-            System.out.println( "[Warning] Duplicate artifact: " + artifact.toString() );
+            if ( logger != null )
+            {
+                logger.warn( "Artifact " + artifact + " already attached to project, ignoring duplicate" );
+            }
             return;
             //throw new DuplicateArtifactAttachmentException( this, artifact );
         }