You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jd...@apache.org on 2008/02/05 18:32:01 UTC

svn commit: r618708 - in /maven/components/trunk: maven-core/src/main/java/org/apache/maven/DefaultMaven.java maven-embedder/src/test/error-reporting-projects/duplicated-attachments/plugin/target-eclipse/

Author: jdcasey
Date: Tue Feb  5 09:31:57 2008
New Revision: 618708

URL: http://svn.apache.org/viewvc?rev=618708&view=rev
Log:
[MNG-3331] Modified module path calculation to use URI.normalize to handle relative directory references, so there is no confusion about such references causing false positives on symlink detection (where getCanonicalPath() != getAbsolutePath()).

Removed:
    maven/components/trunk/maven-embedder/src/test/error-reporting-projects/duplicated-attachments/plugin/target-eclipse/
Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=618708&r1=618707&r2=618708&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultMaven.java Tue Feb  5 09:31:57 2008
@@ -375,6 +375,8 @@
                             }
                         }
 
+                        moduleFile = new File( moduleFile.toURI().normalize() );
+
                         if ( !moduleFile.exists() )
                         {
                             throw new MissingModuleException( name, moduleFile, file );