svn commit: r805061 - in /maven/components/trunk: maven-compat/src/main/java/org/apache/maven/artifact/repository/ maven-compat/src/test/java/org/apache/maven/repository/ maven-core/src/test/java/org/apache/maven/repository/

[bentmann]

Author: bentmann
Date: Mon Aug 17 17:30:33 2009
New Revision: 805061

URL: http://svn.apache.org/viewvc?rev=805061&view=rev
Log:
[MNG-4305] [regression] ${localRepository.basedir} is not a proper path

Modified:
    
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
    
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
    
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java

Modified: 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java?rev=805061&r1=805060&r2=805061&view=diff
==============================================================================
--- 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
 (original)
+++ 
maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
 Mon Aug 17 17:30:33 2009
@@ -267,6 +267,9 @@
             {
                 retValue = retValue.charAt( 0 ) + ":" + retValue.substring( 2 
);
             }
+
+            // normalize separators
+            retValue = new File( retValue ).getPath();
         }
 
         if ( retValue == null )

Modified: 
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java?rev=805061&r1=805060&r2=805061&view=diff
==============================================================================
--- 
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
 (original)
+++ 
maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
 Mon Aug 17 17:30:33 2009
@@ -1,5 +1,6 @@
 package org.apache.maven.repository;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.List;
 
@@ -186,7 +187,7 @@
         ArtifactRepository repo = repos.get( 0 );
         assertEquals( "file:///tmp", repo.getUrl() );
         assertEquals( "file", repo.getProtocol() );
-        assertEquals( "/tmp", repo.getBasedir() );
+        assertEquals( File.separator + "tmp", repo.getBasedir() );
     }
 
     /**

Modified: 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java?rev=805061&r1=805060&r2=805061&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
 (original)
+++ 
maven/components/trunk/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
 Mon Aug 17 17:30:33 2009
@@ -135,4 +135,22 @@
             assertTrue( result.hasMissingArtifacts() );
         }
     }
+
+    public void testLocalRepositoryBasedir()
+        throws Exception
+    {
+        File localRepoDir = new File( "" ).getAbsoluteFile();
+
+        ArtifactRepository localRepo = repositorySystem.createLocalRepository( 
localRepoDir );
+
+        String basedir = localRepo.getBasedir();
+
+        assertFalse( basedir.endsWith( "/" ) );
+        assertFalse( basedir.endsWith( "\\" ) );
+
+        assertEquals( localRepoDir, new File( basedir ) );
+
+        assertEquals( localRepoDir.getPath(), basedir );
+    }
+
 }