From 4f2ff64361dd1027372a591f67ba068410e5aafd Mon Sep 17 00:00:00 2001 From: Kevin Jackson Date: Thu, 15 Jun 2006 02:47:34 +0000 Subject: [PATCH] use fileutils.resolveFile git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@414442 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/AbstractJarSignerTask.java | 19 +++++++++++-------- .../apache/tools/ant/taskdefs/ExecTask.java | 2 +- .../org/apache/tools/ant/taskdefs/Javac.java | 6 +++++- .../apache/tools/ant/taskdefs/Javadoc.java | 6 +++--- .../apache/tools/ant/taskdefs/TempFile.java | 2 +- .../org/apache/tools/ant/taskdefs/Touch.java | 2 +- .../tools/ant/taskdefs/XSLTProcess.java | 2 +- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java index c35940c33..9601a32ed 100644 --- a/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/AbstractJarSignerTask.java @@ -17,17 +17,18 @@ package org.apache.tools.ant.taskdefs; -import org.apache.tools.ant.Task; +import java.io.File; +import java.util.Enumeration; +import java.util.Vector; + import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.util.JavaEnvUtils; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.Environment; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.RedirectorElement; -import org.apache.tools.ant.types.Environment; - -import java.io.File; -import java.util.Vector; -import java.util.Enumeration; +import org.apache.tools.ant.util.FileUtils; +import org.apache.tools.ant.util.JavaEnvUtils; /** * This is factored out from {@link SignJar}; a base class that can be used @@ -98,6 +99,8 @@ public abstract class AbstractJarSignerTask extends Task { */ private Path path = null; + private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); + /** * Set the maximum memory to be used by the jarsigner process * @@ -287,7 +290,7 @@ public abstract class AbstractJarSignerTask extends Task { // is the keystore a file addValue(cmd,"-keystore"); String loc; - File keystoreFile = getProject().resolveFile(keystore); + File keystoreFile = FILE_UTILS.resolveFile(getProject().getBaseDir(), keystore); if (keystoreFile.exists()) { loc = keystoreFile.getPath(); } else { diff --git a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java index a192aa3ff..0f0da3b95 100644 --- a/src/main/org/apache/tools/ant/taskdefs/ExecTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/ExecTask.java @@ -412,7 +412,7 @@ public class ExecTask extends Task { return exec; } // try to find the executable - File executableFile = getProject().resolveFile(exec); + File executableFile = FILE_UTILS.resolveFile(getProject().getBaseDir(), exec); if (executableFile.exists()) { return executableFile.getAbsolutePath(); } diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java index 9c4e9b2e0..f6825f201 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javac.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs; import java.io.File; + import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.MagicNames; @@ -26,6 +27,7 @@ import org.apache.tools.ant.taskdefs.compilers.CompilerAdapter; import org.apache.tools.ant.taskdefs.compilers.CompilerAdapterFactory; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.GlobPatternMapper; import org.apache.tools.ant.util.JavaEnvUtils; import org.apache.tools.ant.util.SourceFileScanner; @@ -109,6 +111,8 @@ public class Javac extends MatchingTask { private String source; private String debugLevel; private File tmpDir; + + private static final FileUtils FILE_UTILS = FileUtils.getFileUtils(); /** * Javac task for compilation of Java files. @@ -800,7 +804,7 @@ public class Javac extends MatchingTask { // compile lists String[] list = src.list(); for (int i = 0; i < list.length; i++) { - File srcDir = getProject().resolveFile(list[i]); + File srcDir = FILE_UTILS.resolveFile(getProject().getBaseDir(), list[i]); if (!srcDir.exists()) { throw new BuildException("srcdir \"" + srcDir.getPath() diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java index e434dc496..541df9754 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java +++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java @@ -543,7 +543,7 @@ public class Javadoc extends Task { while (tok.hasMoreTokens()) { String f = tok.nextToken(); SourceFile sf = new SourceFile(); - sf.setFile(getProject().resolveFile(f.trim())); + sf.setFile(FILE_UTILS.resolveFile(getProject().getBaseDir(),f.trim())); addSource(sf); } } @@ -1016,7 +1016,7 @@ public class Javadoc extends Task { if (!tok.hasMoreTokens()) { throw new BuildException(linkOfflineError); } - le.setPackagelistLoc(getProject().resolveFile(tok.nextToken())); + le.setPackagelistLoc(FILE_UTILS.resolveFile(getProject().getBaseDir(),tok.nextToken())); } /** @@ -1745,7 +1745,7 @@ public class Javadoc extends Task { String link = null; if (la.shouldResolveLink()) { File hrefAsFile = - getProject().resolveFile(la.getHref()); + FILE_UTILS.resolveFile(getProject().getBaseDir(), la.getHref()); if (hrefAsFile.exists()) { try { link = FILE_UTILS.getFileURL(hrefAsFile) diff --git a/src/main/org/apache/tools/ant/taskdefs/TempFile.java b/src/main/org/apache/tools/ant/taskdefs/TempFile.java index 7d5f9bc55..14fbb11c1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/TempFile.java +++ b/src/main/org/apache/tools/ant/taskdefs/TempFile.java @@ -115,7 +115,7 @@ public class TempFile extends Task { throw new BuildException("no property specified"); } if (destDir == null) { - destDir = getProject().resolveFile("."); + destDir = FILE_UTILS.resolveFile(getProject().getBaseDir(),"."); } File tfile = FILE_UTILS.createTempFile(prefix, suffix, destDir); getProject().setNewProperty(property, tfile.toString()); diff --git a/src/main/org/apache/tools/ant/taskdefs/Touch.java b/src/main/org/apache/tools/ant/taskdefs/Touch.java index 87a56b79e..59b9cd2d1 100644 --- a/src/main/org/apache/tools/ant/taskdefs/Touch.java +++ b/src/main/org/apache/tools/ant/taskdefs/Touch.java @@ -341,7 +341,7 @@ public class Touch extends Task { long modTime = (r.isExists()) ? r.getLastModified() : defaultTimestamp; for (int i = 0; i < mapped.length; i++) { - touch(getProject().resolveFile(mapped[i]), modTime); + touch(FILE_UTILS.resolveFile(getProject().getBaseDir(),mapped[i]), modTime); } } } diff --git a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java index 2ba1ef727..6d28dc3c3 100644 --- a/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java +++ b/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java @@ -283,7 +283,7 @@ public class XSLTProcess extends MatchingTask implements XSLTLogger { try { if (baseDir == null) { - baseDir = getProject().resolveFile("."); + baseDir = FILE_UTILS.resolveFile(getProject().getBaseDir(),"."); } liaison = getLiaison();