From 1fd2cabd3d9ef03d515a98b579b74f931e0df97d Mon Sep 17 00:00:00 2001 From: dion Date: Mon, 21 Jul 2003 06:04:23 +0000 Subject: [PATCH] Fix relative path not being found git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113678 13f79535-47bb-0310-9956-ffa450edef68 --- simian/src/main/org/apache/maven/simian/SimianLog.java | 10 +++++----- simian/xdocs/changes.xml | 6 ++++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/simian/src/main/org/apache/maven/simian/SimianLog.java b/simian/src/main/org/apache/maven/simian/SimianLog.java index 59998dfc..71b3ea15 100644 --- a/simian/src/main/org/apache/maven/simian/SimianLog.java +++ b/simian/src/main/org/apache/maven/simian/SimianLog.java @@ -70,7 +70,7 @@ import java.util.StringTokenizer; * Maven documentation, with links pointing to the JXR sources. * * @author Aslak Hellesoy - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ public class SimianLog { private File logFile; @@ -96,12 +96,12 @@ public class SimianLog { this.jellyContext = jellyContext; } - public void setSourceDirectory(String sourceDirectory) { - this.sourceDirectory = new File(sourceDirectory).getAbsolutePath(); + public void setSourceDirectory(String sourceDirectory) throws IOException { + this.sourceDirectory = new File(sourceDirectory).getCanonicalPath(); } - public void setUnitTestSourceDirectory(String unitTestSourceDirectory) { - this.unitTestSourceDirectory = new File(unitTestSourceDirectory).getAbsolutePath(); + public void setUnitTestSourceDirectory(String unitTestSourceDirectory) throws IOException { + this.unitTestSourceDirectory = new File(unitTestSourceDirectory).getCanonicalPath(); } public Duplication[] getDuplications() { diff --git a/simian/xdocs/changes.xml b/simian/xdocs/changes.xml index 38f32c8a..3ddc8446 100644 --- a/simian/xdocs/changes.xml +++ b/simian/xdocs/changes.xml @@ -9,6 +9,12 @@ + + Fix Couldn't find relative path ... message on windows + under multiproject build. Paths with .. in them + were absolute, but it meant that the 'startsWith' logic was flawed. + Changed to using the canonical path. + Add sourceModification include/excludes