dion 2003/10/16 01:53:42
Modified: src/test/java/org/apache/maven MavenUtilsTest.java
src/java/org/apache/maven MavenUtils.java
Log:
handle path == basedir for makeRelativePath
Revision Changes Path
1.14 +4 -1 maven/src/test/java/org/apache/maven/MavenUtilsTest.java
Index: MavenUtilsTest.java
===================================================================
RCS file: /home/cvs/maven/src/test/java/org/apache/maven/MavenUtilsTest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- MavenUtilsTest.java 20 Aug 2003 00:18:53 -0000 1.13
+++ MavenUtilsTest.java 16 Oct 2003 08:53:42 -0000 1.14
@@ -303,5 +303,8 @@
new File( basedir +
"/src/test/basedir/project.xml" ).getCanonicalPath() ) );
assertEquals( "Check absolute path outside basedir", new File(
"/www/docs/index.html" ).getCanonicalPath(),
MavenUtils.makeRelativePath( basedirFile, new File(
"/www/docs/index.html" ).getCanonicalPath() ) );
+
+ assertEquals( "Check absolute path == basedir", ".",
+ MavenUtils.makeRelativePath( basedirFile, basedir ) );
}
}
1.106 +7 -1 maven/src/java/org/apache/maven/MavenUtils.java
Index: MavenUtils.java
===================================================================
RCS file: /home/cvs/maven/src/java/org/apache/maven/MavenUtils.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- MavenUtils.java 4 Sep 2003 00:36:04 -0000 1.105
+++ MavenUtils.java 16 Oct 2003 08:53:42 -0000 1.106
@@ -1093,6 +1093,12 @@
{
String canonicalBasedir = basedir.getCanonicalPath();
String canonicalPath = new File( path ).getCanonicalPath();
+
+ if ( canonicalPath.equals(canonicalBasedir))
+ {
+ return ".";
+ }
+
if ( canonicalPath.startsWith( canonicalBasedir ) )
{
if ( canonicalPath.charAt( canonicalBasedir.length() ) ==
File.separatorChar )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
