svn commit: r567966 - /maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

[brett]

Author: brett
Date: Mon Aug 20 22:54:51 2007
New Revision: 567966

URL: http://svn.apache.org/viewvc?rev=567966&view=rev
Log:
[MNG-3141] only canonicalize paths on Windows (to prevent path length issues, 
but not obliterate symlinks on unix)
Merged from: r567954 on trunk

Modified:
    
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java

Modified: 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java?rev=567966&r1=567965&r2=567966&view=diff
==============================================================================
--- 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 (original)
+++ 
maven/components/branches/maven-2.0.x/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
 Mon Aug 20 22:54:51 2007
@@ -58,6 +58,7 @@
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.Os;
 import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.dag.CycleDetectedException;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
@@ -503,13 +504,18 @@
                         moduleFile = new File( basedir, name + "/" + 
Maven.POMv4 );
                     }
 
-                    try
+                    if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
                     {
-                        moduleFile = moduleFile.getCanonicalFile();
-                    }
-                    catch ( IOException e )
-                    {
-                        throw new MavenExecutionException( "Unable to 
canonicalize file name " + moduleFile, e );
+                        // we don't canonicalize on unix to avoid interfering 
with symlinks
+
+                        try
+                        {
+                            moduleFile = moduleFile.getCanonicalFile();
+                        }
+                        catch ( IOException e )
+                        {
+                            throw new MavenExecutionException( "Unable to 
canonicalize file name " + moduleFile, e );
+                        }
                     }
 
                     moduleFiles.add( moduleFile );