Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4305] [regression] ${localRepository.basedir} is not a proper path 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@805061 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-08-17 17:30:33 +00:00
parent 00ed1a01c0
commit b725e30dea
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
maven-compat/src/main/java/org/apache/maven/artifact/repository/MavenArtifactRepository.java
View File

@ -267,6 +267,9 @@ else if ( index >= 0 )
{
retValue = retValue.charAt( 0 ) + ":" + retValue.substring( 2 );
}
// normalize separators
retValue = new File( retValue ).getPath();
}
if ( retValue == null )

3
maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
View File

@ -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 @@ public void testMirrorProperUrlAndProtocolAndBasedir()
ArtifactRepository repo = repos.get( 0 );
assertEquals( "file:///tmp", repo.getUrl() );
assertEquals( "file", repo.getProtocol() );
assertEquals( "/tmp", repo.getBasedir() );
assertEquals( File.separator + "tmp", repo.getBasedir() );
}
/**

18
maven-core/src/test/java/org/apache/maven/repository/LegacyRepositorySystemTest.java
View File

@ -135,4 +135,22 @@ public void testThatASystemScopedDependencyIsNotResolvedFromRepositories()
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 );
}
}