dion 2003/07/20 23:04:23
Modified: src/plugins-build/simian/src/main/org/apache/maven/simian
SimianLog.java
src/plugins-build/simian/xdocs changes.xml
Log:
Fix relative path not being found
Revision Changes Path
1.3 +5 -5
maven/src/plugins-build/simian/src/main/org/apache/maven/simian/SimianLog.java
Index: SimianLog.java
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/simian/src/main/org/apache/maven/simian/SimianLog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimianLog.java 21 Jul 2003 05:05:51 -0000 1.2
+++ SimianLog.java 21 Jul 2003 06:04:23 -0000 1.3
@@ -96,12 +96,12 @@
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() {
1.4 +6 -0 maven/src/plugins-build/simian/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/simian/xdocs/changes.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- changes.xml 21 Jul 2003 05:06:27 -0000 1.3
+++ changes.xml 21 Jul 2003 06:04:23 -0000 1.4
@@ -10,6 +10,12 @@
<release version="1.2" date="in CVS">
<action dev="dion" type="fix">
+ Fix <code>Couldn't find relative path ...</code> message on windows
+ under multiproject build. Paths with <code>..</code> in them
+ were absolute, but it meant that the 'startsWith' logic was flawed.
+ Changed to using the canonical path.
+ </action>
+ <action dev="dion" type="fix">
Add sourceModification include/excludes
</action>
<action dev="dion" type="fix">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
