You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/07/31 20:11:57 UTC

svn commit: r799680 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java

Author: bentmann
Date: Fri Jul 31 18:11:57 2009
New Revision: 799680

URL: http://svn.apache.org/viewvc?rev=799680&view=rev
Log:
[MNG-4269] [regression] Invocation of just installed plugin on its plugin project can fail with ComponentLookupException for mojo class

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java?rev=799680&r1=799679&r2=799680&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java Fri Jul 31 18:11:57 2009
@@ -64,28 +64,30 @@
 
                     artifact.setResolved( true );
                 }
-                else
-                {
-                    File classesDir;
-
-                    if ( isTestArtifact( artifact ) )
-                    {
-                        classesDir = new File( project.getBuild().getTestOutputDirectory() );
-                    }
-                    else
-                    {
-                        classesDir = new File( project.getBuild().getOutputDirectory() );
-                    }
-
-                    if ( classesDir.isDirectory() )
-                    {
-                        artifact.setFile( classesDir );
-
-                        artifact.setFromAuthoritativeRepository( true );
-
-                        artifact.setResolved( true );
-                    }
-                }
+// TODO: The code below supports MNG-3043 & MNG-2871 but in its current form causes MNG-4269. 
+//       We need to consider the state of the reactor before handing out directories.
+//                else
+//                {
+//                    File classesDir;
+//
+//                    if ( isTestArtifact( artifact ) )
+//                    {
+//                        classesDir = new File( project.getBuild().getTestOutputDirectory() );
+//                    }
+//                    else
+//                    {
+//                        classesDir = new File( project.getBuild().getOutputDirectory() );
+//                    }
+//
+//                    if ( classesDir.isDirectory() )
+//                    {
+//                        artifact.setFile( classesDir );
+//
+//                        artifact.setFromAuthoritativeRepository( true );
+//
+//                        artifact.setResolved( true );
+//                    }
+//                }
             }
         }