bodewig 00/09/18 00:55:03
Modified: docs index.html
src/main/org/apache/tools/ant Project.java
src/main/org/apache/tools/ant/taskdefs Ant.java
Available.java Copydir.java Copyfile.java
Deltree.java Expand.java Filter.java GZip.java
Get.java Mkdir.java Property.java Rename.java
Replace.java Tar.java
Log:
Various checks for required attributes and better error messages added.
Submitted by: Nico Seessle <[EMAIL PROTECTED]>
Revision Changes Path
1.103 +90 -60 jakarta-ant/docs/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/index.html,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- index.html 2000/09/15 11:41:16 1.102
+++ index.html 2000/09/18 07:54:54 1.103
@@ -101,7 +101,7 @@
<p>
If you do not have a JAXP compliant XML parse installed, you may use the
reference implementation
available from Sun. It is available from <a
href="http://java.sun.com/xml";>http://java.sun.com/xml</a>.
- Once installed make sure the "jaxp.jar" and "parser.jar" files are in your
classpath.
+ Once installed make sure the "jaxp.jar" and
"parser.jar" files are in your classpath.
<p>
You will also need the JDK installed on your system, version 1.1 or later.
@@ -155,12 +155,13 @@
needed for your chosen JAXP compliant XML parser.</p>
<p>When you need JDK functionality (like a <a href="#javac">javac</a> task,
or a
<a href="#rmic">rmic</a> task), then for JDK 1.1, the
<code>classes.zip</code>
-file of the JDK must be added to the classpath; for JDK 1.2,
<code>tools.jar</code>
+file of the JDK must be added to the classpath; for JDK 1.2 or JDK 1.3,
<code>tools.jar</code>
must be added. The scripts supplied with ant, in the bin directory, will add
<code>tools.jar</code> automatically if the JAVA_HOME environment variable
is set.</p>
<p>When you are executing platform specific applications (like the <a
href="#exec">exec</a> task, or the <a href="#cvs">cvs</a> task), the
property <code>ant.home</code>
-must be set to the directory containing a bin directory, which contains the
<code>antRun</code> shell script necessary to run execs on Unix.</p>
+must be set to the directory containing a bin directory, which contains the
<code>antRun</code>
+shell script necessary to run execs on Unix.</p>
<hr>
<h2><a name="running">Running Ant</a></h2>
<p>Running Ant is simple, when you installed it as described in the previous
@@ -173,7 +174,10 @@
buildfile (see the <a href="#property">property task</a>).
This can be done with the <i>-D<property>=<value></i>
option, where <i><property></i> is the name of the property and
<i><value></i>
-the value.</p>
+the value. This can also be used (and is the only way since Java can not
access them)
+to have access to your environment variables, just pass -DMYVAR=%MYVAR%
(Windows) or
+-DMYVAR=$MYVAR (Unix) do Ant, you can access these variables inside your
build-file
+as ${MYVAR}.</p>
<p>Two more options are <i>-quiet</i> which instructs Ant to print less
information on the console when running. The option <i>-verbose</i> on the
other
hand makes Ant print more information on the console.</p>
@@ -303,7 +307,7 @@
href="#tstamp">tstamp</a> tasks in a so called initialization target, on
which
all other targets depend. Make sure that target is always the first one in
the depends list of the other targets. In this manual, most initialization
targets
-have the name "init".</p>
+have the name "init".</p>
<p>The optional <i>description</i> attribute can be used to provide a one
line description of this target that is printed by the <i>-projecthelp</i>
commandline option.</p>
<p>A target has the following attributes:</p>
<table border="1" cellpadding="2" cellspacing="0">
@@ -314,7 +318,7 @@
</tr>
<tr>
<td valign="top">name</td>
- <td valign="top">the name of the project.</td>
+ <td valign="top">the name of the target.</td>
<td align="center" valign="top">Yes</td>
</tr>
<tr>
@@ -415,7 +419,7 @@
in the filter task. This token syntax matches the syntax of other build
systems
that perform such filtering and remains sufficiently orthogonal to most
programming and scripting languages, as well with documentation systems.</p>
-<p>Note: in case a token with the format @token@ if found in a file but no
+<p>Note: in case a token with the format @token@ is found in a file but no
filter is associated with that token, no changes take place. So, no escaping
method is present, but as long as you choose appropriate names for your
tokens,
this should not cause problems.</p>
@@ -885,7 +889,7 @@
used.</p>
<p>The properties of the current project will be available in the new
project.
These properties will override the properties that are set in the new
project.
-(See also the <a href="#property">properties task</a>). �You can set
properties
+(See also the <a href="#property">properties task</a>). You can set
properties
in the new project from the old project by using nested property tags. This
allows you to parameterize your subprojects.</p>
<h3>Parameters:</h3>
@@ -897,13 +901,13 @@
</tr>
<tr>
<td valign="top">antfile</td>
- <td valign="top">the buildfile to use.</td>
+ <td valign="top">the buildfile to use. Defaults to
"build.xml".</td>
<td valign="top" align="center">No</td>
</tr>
<tr>
<td valign="top">dir</td>
- � �<td valign="top">the directory to use as a basedir for the new Ant
project
- Defaults to the current directory.</td>
+ <td valign="top">the directory to use as a basedir for the new Ant
project.
+ Defaults to the current directory.</td>
� �<td valign="top" align="center">No</td>
</tr>
<tr>
@@ -982,7 +986,7 @@
</tr>
�<tr>
� �<td valign="top">value</td>
- � �<td valign="top">the value to set the property to. Defaults to
"true".</td>
+ � �<td valign="top">the value to set the property to. Defaults to
"true".</td>
� �<td valign="top" align="center">No</td>
�</tr>
<tr>
@@ -1092,7 +1096,7 @@
UNIX system.</p>
<blockquote>
<pre>
- <chmod dir="${dist}/bin" perm="ugo+rx"
includes="**/*.sh" />
+ <chmod dir="${dist}/bin" perm="ugo+rx"
includes="**/*.sh" />
</pre>
</blockquote>
<p>makes all ".sh" files below <code>${dist}/bin</code>
@@ -1391,7 +1395,8 @@
</tr>
<tr>
<td valign="top">verbose</td>
- <td valign="top">Show name of each deleted file
("true"/"false"). Default is "false" when omitted.</td>
+ <td valign="top">Show name of each deleted file
("true"/"false").
+ Default is "false" when omitted.</td>
<td align="center" valign="top">No</td>
</tr>
</table>
@@ -1479,7 +1484,7 @@
<tr>
<td valign="top">executable</td>
<td valign="top">the command to execute without any command line
- arguments.</b></td>
+ arguments.</td>
</tr>
<tr>
<td valign="top">dir</td>
@@ -1516,7 +1521,6 @@
<p><code><exec dir="${src}" executable="dir"
os="windows"
output="dir.txt" /></code></p>
</blockquote>
-
<h3>Parameters specified as nested elements</h3>
<h4>arg</h4>
<p>Command line arguments should be specified as nested
@@ -1558,7 +1562,7 @@
</table>
<h5>Examples</h5>
<blockquote><pre>
-<exec executable="emacs" >
+<exec executable="emacs" >
<env key="DISPLAY" value=":1.0" />
</exec>
</pre></blockquote>
@@ -1570,6 +1574,14 @@
</pre></blockquote>
<p>adds <code>${basedir}/bin</code> to the <code>PATH</code> of the
system command.</p>
+<p><b>Note:</b> Although it may work for you to specify arguments using
+a simple arg-element and seperate them by spaces it may fail if you switch to
+a newer version of the JDK. JDK < 1.2 will pass these as separate
arguments
+to the program you are calling, JDK >= 1.2 will pass them as a single
+argument and cause most calls to fail.</p>
+<p><b>Note2:</b> If you are using Ant on Windows and a new DOS-Window pops up
+for every command which is excuted this may be a problem of the JDK you are
using.
+This problem may occur with all JDK's < 1.2.</p>
<hr>
<h2><a name="execon">ExecOn</a></h2>
<h3>Description</h3>
@@ -1589,7 +1601,7 @@
<tr>
<td valign="top">executable</td>
<td valign="top">the command to execute without any command line
- arguments.</b></td>
+ arguments.</td>
<td align="center" valign="top">Yes</td>
</tr>
<tr>
@@ -1710,7 +1722,6 @@
<p>Sets a token filter for this project. Token filters are used by all tasks
that perform file copying operations through the Project commodity
methods.</p>
<p>Note: the token string must not contain the separators chars (@).</p>
-<hr>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
@@ -1815,7 +1826,7 @@
For Unix platforms, the default is remove. For DOS based systems
(including Windows), the default is add.
<p>
- Note: Unless this property is specified as "asis", extra CR characters
+ Note: Unless this property is specified as "asis", extra CR
characters
which do not precede a LF will be removed.
</td>
<td valign="top" align="center">No</td>
@@ -1829,9 +1840,9 @@
<li>asis: leave tab and space characters alone
<li>remove: convert tabs to spaces
</ul>
- Default for this parameter is "asis".
+ Default for this parameter is "asis".
<p>
- Note: Unless this property is specified as "asis", extra spaces and
+ Note: Unless this property is specified as "asis", extra
spaces and
tabs after the last non-whitespace character on the line will be
removed.
</td>
<td valign="top" align="center">No</td>
@@ -2467,7 +2478,8 @@
</tr>
<tr>
<td valign="top">target</td>
- <td valign="top">Generate class files for specific VM version, e.g.
"1.1" or "1.2".</td>
+ <td valign="top">Generate class files for specific VM version, e.g.
+ "1.1" or "1.2".</td>
<td align="center" valign="top">No</td>
</tr>
</table>
@@ -2528,6 +2540,10 @@
<exclude name="mypackage/p1/testpackage/**" />
</javac></pre>
+<p><b>Note:</b> If you are using Ant on Windows and a new DOS-Window pops up
+for every use of an external compiler this may be a problem of the JDK you
are using.
+This problem may occur with all JDK's < 1.2.</p>
+
<hr>
<h2><a name="javadoc">Javadoc/Javadoc2</a></h2>
<h3>Description</h3>
@@ -3031,7 +3047,7 @@
<pre> <patch patchfile="module.1.0-1.1.patch" /></pre>
<p>applies the diff included in <i>module.1.0-1.1.patch</i> to the
files in base directory guessing the filename(s) from the diff output.
-<pre> <patch patchfile="module.1.0-1.1.patch" strip="1"
/></pre>
+<pre> <patch patchfile="module.1.0-1.1.patch"
strip="1" /></pre>
<p>like above but one leading directory part will be removed. i.e. if
the diff output looked like
<pre>
@@ -3155,7 +3171,7 @@
<tr>
<td valign="top">file</td>
<td valign="top">file for which the token should be replaced.</td>
- <td align="center" rowspan=2">Exactly one of the two.</td>
+ <td align="center" rowspan="2">Exactly one of the two.</td>
</tr>
<tr>
<td valign="top">dir</td>
@@ -3282,14 +3298,14 @@
</tr>
<tr>
<td valign="top">sourcebase</td>
- <td valign="top">Pass the "-keepgenerated" flag to rmic and
+ <td valign="top">Pass the "-keepgenerated" flag to rmic and
move the generated source file to the base directory.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
<td valign="top">stubversion</td>
<td valign="top">Specify the JDK version for the generated stub code.
- Specify "1.1" to pass the "-v1.1" option to rmic.</td>
+ Specify "1.1" to pass the "-v1.1" option to rmic.</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
@@ -3471,7 +3487,7 @@
<tr>
<td valign="top">extension</td>
<td valign="top">desired file extension to be used for the targets.
- If not specified, the default is "html".</td>
+ If not specified, the default is "html".</td>
<td align="center" valign="top">No</td>
</tr>
<tr>
@@ -3482,8 +3498,8 @@
<tr>
<td valign="top">processor</td>
<td valign="top">name of the XSLT processor to use. Permissible
-values are "xslp" for the XSL:P processor, "xalan" for the Apache XML Xalan
-processor, or the name of an arbitrary XSLTLiaison class.
+values are "xslp" for the XSL:P processor, "xalan"
+for the Apache XML Xalan processor, or the name of an arbitrary XSLTLiaison
class.
Defaults to xslp or xalan (in that order), if one is found in your
class path</td>
<td align="center" valign="top">No</td>
@@ -3705,9 +3721,9 @@
<h2><a name="unzip">Unjar/Unwar/Unzip</a></h2>
<h3>Description</h3>
<p>Unzips a zip-, war- or jarfile.</p>
-<p>For JDK 1.1 "last modified time" field is set to current time instead of
being
+<p>For JDK 1.1 "last modified time" field is set to current time
instead of being
carried from zipfile.</p>
-<p>File permissions will not be restored on extracted files.</a>
+<p>File permissions will not be restored on extracted files.</p>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
@@ -3735,8 +3751,8 @@
<h2><a name="untar">Untar</a></h2>
<h3>Description</h3>
<p>Untars a tarfile.</p>
-<p>File permissions will not be restored on extracted files.</a>
-<p>For JDK 1.1 "last modified time" field is set to current time instead of
being
+<p>File permissions will not be restored on extracted files.</p>
+<p>For JDK 1.1 "last modified time" field is set to current time
instead of being
carried from tarfile.</p>
<h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0">
@@ -4054,14 +4070,14 @@
</tr>
<tr>
<td valign="top">verbose</td>
- <td valign="top">set to "yes" if you want to see the output from
- the cabarc tool. defaults to "no".</td>
+ <td valign="top">set to "yes" if you want to see the output
from
+ the cabarc tool. defaults to "no".</td>
<td valign="top" align="center">No</td>
</tr>
<tr>
<td valign="top">compress</td>
- <td valign="top">set to "no" to store files without compressing.
- defaults to "yes".</td>
+ <td valign="top">set to "no" to store files without
compressing.
+ defaults to "yes".</td>
<td valign="top" align="center">No</td>
</tr>
<tr>
@@ -4098,33 +4114,33 @@
<tr>
<td valign="top">defaultexcludes</td>
<td valign="top">indicates whether default excludes should be used
- or not ("yes"/"no"). Default excludes are used when omitted.</td>
+ or not ("yes"/"no"). Default excludes are used
when omitted.</td>
<td valign="top" align="center">No</td>
</tr>
</table>
<h3>Examples</h3>
<blockquote><pre>
-<cab cabfile="${dist}/manual.cab"
- basedir="htdocs/manual"
+<cab cabfile="${dist}/manual.cab"
+ basedir="htdocs/manual"
/>
</pre></blockquote>
<p>cabs all files in the htdocs/manual directory in a file called
manual.cab in the ${dist} directory.</p>
<blockquote><pre>
-<cab cabfile="${dist}/manual.cab"
- basedir="htdocs/manual"
- excludes="mydocs/**, **/todo.html"
+<cab cabfile="${dist}/manual.cab"
+ basedir="htdocs/manual"
+ excludes="mydocs/**, **/todo.html"
/>
</pre></blockquote>
<p>cabs all files in the htdocs/manual directory in a file called
manual.cab in the ${dist} directory. Files in the directory mydocs,
or files with the name todo.html are excluded.</p>
<blockquote><pre>
-<cab cabfile="${dist}/manual.cab"
- basedir="htdocs/manual"
- includes="api/**/*.html"
- excludes="**/todo.html"
- verbose="yes"
+<cab cabfile="${dist}/manual.cab"
+ basedir="htdocs/manual"
+ includes="api/**/*.html"
+ excludes="**/todo.html"
+ verbose="yes"
/>
</pre></blockquote>
<p>cab all files in the htdocs/manual directory in a file called
@@ -4289,7 +4305,7 @@
FTP server, and the dir attribute as the local directory to put the files
into. The file structure from the FTP site is preserved on the local
machine.</p>
<pre>
- <ftp action="get"
+ <ftp action="get"
server="ftp.apache.org"
userid="anonymous"
password="[EMAIL PROTECTED]">
@@ -4307,7 +4323,7 @@
filesets are relative to the remote directory, not a local directory. In
fact, the dir attribute of the fileset is ignored completely.
<pre>
- <ftp action="del"
+ <ftp action="del"
server="ftp.apache.org"
userid="anonymous"
password="[EMAIL PROTECTED]" >
@@ -4795,8 +4811,8 @@
<h2><a name="vssget">VssGet</a></h2>
<h3><b>Description:</b></h3>
Task to perform GET commands to Microsoft Visual Source Safe.
-<p>
-The following attributes are interpretted:
+<p>If you specify two or more attributes from version, date and
+label only one will be used in the order version, date, label.</p>
<h3>Parameters:</h3>
<table border="1" cellpadding="2" cellspacing="0">
<tr>
@@ -4854,7 +4870,18 @@
<p>Note that only one of version, date or label should be specified</p>
<h3>Examples</h3>
<blockquote>
- <p>None yet available</p>
+<pre>
+<vssget localPath="C:\mysrc\myproject"
+ recursive="true"
+ label="Release1"
+ login="me,mypassword"
+ vsspath="/source/aProject"
+ writable="true"/>
+</pre>
+Does a get on the VSS-Project <i>$/source/aproject</i> using the username
+<i>me</i> and the password <i>mypassword</i>. It will recursively get the
files
+which are labeled <i>Release1</i> and write them to the local directory
+<i>C:\mysrc\myproject</i>. The local files will be writable.
</blockquote>
<hr>
<h2><a name="buildevents">Build Events</a></h2>
@@ -4895,10 +4922,13 @@
name of the method must begin with "set", followed by the
attribute name, with the first character in uppercase, and the rest in
lowercase. The type of the attribute can be <code>String</code>, any
- primitive type, <code>Class</code>, <code>File</code> (in which case the
- value of the attribute is interpreted relative to the project's basedir)
- or any other type that has a constructor with a single
<code>String</code>
- argument</li>
+ primitive type (they are converted for you from their
String-representation
+ in the build-file. If you specify a boolean your method will be passed
the value
+ <i>true</i> if the value specified in the build-file is one of
"true",
+ "yes" or "on"), <code>Class</code>,
<code>File</code>
+ (in which case the value of the attribute is interpreted relative to
the
+ project's basedir) or any other type that has a constructor with a
single
+ <code>String</code> argument</li>
<li>If your task has enumerated attributes, you should consider using
a subclass of org.apache.tools.ant.types.EnumeratedAttribute as argument
to your setter method. See org.apache.tools.ant.taskdefs.FixCRLF for
@@ -5007,8 +5037,8 @@
href="http://jakarta.apache.org/jyve-faq/Turbine/screen/DisplayTopics/action/SetAll/project_id/2/faq_id/16";>jakarta.apache.org</a>.
This
FAQ is interactive, which means you can ask and answer questions
online.</p>
-<p>One of the questions poping up quite often is "Is there a DTD for
-buildfiles?". Please refer to the FAQ for an answer.</p>
+<p>One of the questions poping up quite often is "Is there a DTD for
+buildfiles?". Please refer to the FAQ for an answer.</p>
<hr>
<h2><a name="feedback">Feedback</a></h2>
<p>To provide feedback on this software, please subscribe to the Ant User
1.38 +1 -1 jakarta-ant/src/main/org/apache/tools/ant/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Project.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- Project.java 2000/09/05 11:43:22 1.37
+++ Project.java 2000/09/18 07:54:58 1.38
@@ -307,7 +307,7 @@
try {
setBaseDir(new File(new File(baseD).getCanonicalPath()));
} catch (IOException ioe) {
- String msg = "Can't set basedir " + baseDir + " due to " +
+ String msg = "Can't set basedir " + baseD + " due to " +
ioe.getMessage();
throw new BuildException(msg);
}
1.17 +4 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java
Index: Ant.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Ant.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Ant.java 2000/09/15 07:37:10 1.16
+++ Ant.java 2000/09/18 07:54:59 1.17
@@ -102,9 +102,11 @@
newP.setName(p.getName());
if (p.getValue() != null) {
newP.setValue(p.getValue());
- } else if (p.getFile() != null) {
+ }
+ if (p.getFile() != null) {
newP.setFile(p.getFile());
- } else if (p.getResource() != null) {
+ }
+ if (p.getResource() != null) {
newP.setResource(p.getResource());
}
properties.setElementAt(newP, i);
1.13 +8 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java
Index: Available.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Available.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Available.java 2000/09/18 07:50:44 1.12
+++ Available.java 2000/09/18 07:54:59 1.13
@@ -115,6 +115,14 @@
}
public void execute() throws BuildException {
+ if (property == null) {
+ throw new BuildException("property attribute is required",
location);
+ }
+
+ if (classname == null && file == null && resource == null) {
+ throw new BuildException("At least one of
(classname|file|resource) is required", location);
+ }
+
if (classpath != null) {
this.loader = new AntClassLoader(project, classpath, false);
}
1.13 +5 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java
Index: Copydir.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copydir.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Copydir.java 2000/09/11 10:15:00 1.12
+++ Copydir.java 2000/09/18 07:54:59 1.13
@@ -96,7 +96,7 @@
public void execute() throws BuildException {
if (srcDir == null) {
- throw new BuildException("srcdir attribute must be set!",
+ throw new BuildException("src attribute must be set!",
location);
}
@@ -107,6 +107,10 @@
if (destDir == null) {
throw new BuildException("The dest attribute must be set.",
location);
+ }
+
+ if (srcDir.equals(destDir)) {
+ log("Warning: src == dest");
}
DirectoryScanner ds = super.getDirectoryScanner(srcDir);
1.6 +5 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java
Index: Copyfile.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Copyfile.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Copyfile.java 2000/09/11 10:14:59 1.5
+++ Copyfile.java 2000/09/18 07:54:59 1.6
@@ -101,7 +101,11 @@
if (destFile == null) {
throw new BuildException("The dest attribute must be present.",
location);
}
-
+
+ if (srcFile.equals(destFile)) {
+ log("Warning: src == dest");
+ }
+
if (forceOverwrite || srcFile.lastModified() >
destFile.lastModified()) {
try {
project.copyFile(srcFile, destFile, filtering,
forceOverwrite);
1.6 +12 -5
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java
Index: Deltree.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Deltree.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Deltree.java 2000/07/06 16:48:14 1.5
+++ Deltree.java 2000/09/18 07:55:00 1.6
@@ -67,28 +67,35 @@
private File dir;
- public void setDir(String dirName) {
- dir = project.resolveFile(dirName);
+ public void setDir(File dir) {
+ this.dir = dir;
}
public void execute() throws BuildException {
- log("Deleting: " + dir.getAbsolutePath());
+ if (dir == null) {
+ throw new BuildException("dir attribute must be set!", location);
+ }
if (dir.exists()) {
if (!dir.isDirectory()) {
if (!dir.delete()) {
- throw new BuildException("Unable to delete file " +
dir.getAbsolutePath());
+ throw new BuildException("Unable to delete directory "
+ + dir.getAbsolutePath(),
+ location);
}
return;
// String msg = "Given dir: " + dir.getAbsolutePath() +
// " is not a dir";
// throw new BuildException(msg);
}
+
+ log("Deleting: " + dir.getAbsolutePath());
+
try {
removeDir(dir);
} catch (IOException ioe) {
String msg = "Unable to delete " + dir.getAbsolutePath();
- throw new BuildException(msg);
+ throw new BuildException(msg, location);
}
}
}
1.11 +3 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java
Index: Expand.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Expand.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Expand.java 2000/08/22 23:31:31 1.10
+++ Expand.java 2000/09/18 07:55:00 1.11
@@ -87,6 +87,9 @@
if (source == null) {
throw new BuildException("Source attribute must be specified");
}
+ if (dest == null) {
+ throw new BuildException("Dest attribute must be specified");
+ }
if (source.isDirectory()) {
// get all the files in the descriptor directory
1.3 +4 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java
Index: Filter.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Filter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Filter.java 2000/09/14 07:19:52 1.2
+++ Filter.java 2000/09/18 07:55:00 1.3
@@ -76,6 +76,10 @@
}
public void execute() throws BuildException {
+ if (token == null || value == null) {
+ throw new BuildException("token and value are required",
location);
+ }
+
project.addFilter(token, value);
}
}
1.5 +8 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java
Index: GZip.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GZip.java 2000/07/10 07:29:26 1.4
+++ GZip.java 2000/09/18 07:55:00 1.5
@@ -81,6 +81,14 @@
}
public void execute() throws BuildException {
+ if (zipFile == null) {
+ throw new BuildException("zipfile attribute is required",
location);
+ }
+
+ if (source == null) {
+ throw new BuildException("src attribute is required", location);
+ }
+
log("Building gzip: " + zipFile.getAbsolutePath());
GZIPOutputStream zOut = null;
1.6 +20 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java
Index: Get.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Get.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Get.java 2000/07/24 13:23:29 1.5
+++ Get.java 2000/09/18 07:55:00 1.6
@@ -80,11 +80,29 @@
* @exception BuildException Thrown in unrecoverable error.
*/
public void execute() throws BuildException {
- try {
+ if (source == null) {
+ throw new BuildException("src attribute is required", location);
+ }
+ if (dest == null) {
+ throw new BuildException("dest attribute is required", location);
+ }
+
+ if (dest.exists() && dest.isDirectory()) {
+ throw new BuildException("The specified destination is a
directory",
+ location);
+ }
+
+ if (dest.exists() && !dest.canWrite()) {
+ throw new BuildException("Can't write to " +
dest.getAbsolutePath(),
+ location);
+ }
+
+ try {
+
log("Getting: " + source);
- //set the timestamp to the file date.
+ //set the timestamp to the file date.
long timestamp=0;
boolean hasTimestamp=false;
1.3 +14 -7
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java
Index: Mkdir.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Mkdir.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mkdir.java 2000/07/06 16:48:18 1.2
+++ Mkdir.java 2000/09/18 07:55:00 1.3
@@ -66,22 +66,29 @@
public class Mkdir extends Task {
- private String dirName;
+ private File dir;
public void execute() throws BuildException {
- File dir = project.resolveFile(dirName);
- if (!dir.exists()) {
+ if (dir == null) {
+ throw new BuildException("dir attribute is required", location);
+ }
+
+ if (dir.isFile()) {
+ log("Warning: Specified directory is a file: " +
dir.getAbsolutePath());
+ }
+
+ if (!dir.exists()) {
boolean result = dir.mkdirs();
if (result == false) {
- String msg = "Directory " + dirName + " creation was not " +
+ String msg = "Directory " + dir.getAbsolutePath() + " creation
was not " +
"succesful for an unknown reason";
- throw new BuildException(msg);
+ throw new BuildException(msg, location);
}
log("Created dir: " + dir.getAbsolutePath());
}
}
- public void setDir(String dirName) {
- this.dirName = dirName;
+ public void setDir(File dir) {
+ this.dir = dir;
}
}
1.16 +1 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Property.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Property.java 2000/09/14 07:19:52 1.15
+++ Property.java 2000/09/18 07:55:01 1.16
@@ -124,7 +124,7 @@
private void loadFile (File file) throws BuildException {
Properties props = new Properties();
- log("Loading " + name, Project.MSG_VERBOSE);
+ log("Loading " + file.getAbsolutePath(), Project.MSG_VERBOSE);
try {
if (file.exists()) {
props.load(new FileInputStream(file));
1.2 +8 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rename.java
Index: Rename.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rename.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Rename.java 2000/03/23 03:40:32 1.1
+++ Rename.java 2000/09/18 07:55:01 1.2
@@ -102,6 +102,14 @@
* thrown, if the rename operation fails.
*/
public void execute() throws BuildException {
+ if (dest == null) {
+ throw new BuildException("dest attribute is required", location);
+ }
+
+ if (src == null) {
+ throw new BuildException("src attribute is required", location);
+ }
+
if (replace && dest.exists()) {
if (!dest.delete()) {
throw new BuildException("Unable to remove existing file " +
1.6 +8 -0
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java
Index: Replace.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Replace.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Replace.java 2000/09/11 10:45:16 1.5
+++ Replace.java 2000/09/18 07:55:01 1.6
@@ -95,6 +95,10 @@
throw new BuildException("replace token must not be null",
location);
}
+ if (token.getText().equals("")) {
+ throw new BuildException("replace token must not be empty",
location);
+ }
+
if (src == null && dir == null) {
throw new BuildException("Either the file or the dir attribute
must be specified", location);
}
@@ -124,6 +128,10 @@
* @param src the source file
*/
private void processFile(File src) throws BuildException {
+ if (!src.exists()) {
+ throw new BuildException("Replace: source file " + src.getPath()
+ " doesn't exist", location);
+ }
+
File temp = new File(src.getPath() + ".temp");
if (temp.exists()) {
1.5 +6 -1
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
Index: Tar.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Tar.java 2000/07/10 07:29:26 1.4
+++ Tar.java 2000/09/18 07:55:01 1.5
@@ -84,7 +84,10 @@
}
public void execute() throws BuildException {
- log("Building tar: "+ tarFile.getAbsolutePath());
+ if (tarFile == null) {
+ throw new BuildException("tarfile attribute must be set!",
+ location);
+ }
if (baseDir == null) {
throw new BuildException("basedir attribute must be set!",
@@ -93,6 +96,8 @@
if (!baseDir.exists()) {
throw new BuildException("basedir does not exist!", location);
}
+
+ log("Building tar: "+ tarFile.getAbsolutePath());
DirectoryScanner ds = super.getDirectoryScanner(baseDir);
