You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by im...@apache.org on 2004/06/19 20:31:11 UTC
cvs commit: jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/tasks DeleteTask.java
imario 2004/06/19 11:31:11
Modified: vfs/xdocs anttasks.xml
vfs/src/java/org/apache/commons/vfs/tasks DeleteTask.java
Log:
Allow srcdir and includes (list of files) in v-copy and v-delete tasks.
PR: 29605
Submitted By: Anthony Goubard (adagoubard -at- chello.nl)
Revision Changes Path
1.6 +3 -0 jakarta-commons-sandbox/vfs/xdocs/anttasks.xml
Index: anttasks.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/xdocs/anttasks.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- anttasks.xml 18 Jun 2004 16:54:21 -0000 1.5
+++ anttasks.xml 19 Jun 2004 18:31:11 -0000 1.6
@@ -105,12 +105,14 @@
<td>srcdir</td>
<td>The source folder. If used the includes and desdir
attributes should be specified.</td>
+ <td>No</td>
</tr>
<tr>
<td>includes</td>
<td>A comma or space separated list of files. The files
are resolved in combination with the specified
srcdir attribute.</td>
+ <td>Only if srcdir is specified.</td>
</tr>
<tr>
<td>overwrite</td>
@@ -213,6 +215,7 @@
<td>A comma or space separated list of files. The files
are resolved in combination with the specified
srcdir attribute.</td>
+ <td>Only if srcdir is specified.</td>
</tr>
</table>
</section>
1.10 +2 -2 jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/tasks/DeleteTask.java
Index: DeleteTask.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/vfs/src/java/org/apache/commons/vfs/tasks/DeleteTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DeleteTask.java 18 Jun 2004 16:54:20 -0000 1.9
+++ DeleteTask.java 19 Jun 2004 18:31:11 -0000 1.10
@@ -67,7 +67,7 @@
*/
public void execute() throws BuildException
{
- if ((file == null && srcDirUrl == null) || (filesList != null && filesList.length() > 0))
+ if ((file == null && srcDirUrl == null) || (srcDirUrl != null && filesList == null))
{
final String message = Messages.getString("vfs.tasks/delete.no-source-files.error");
throw new BuildException(message);
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org