You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@ant.apache.org by bo...@locus.apache.org on 2000/09/25 16:35:51 UTC

cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Zip.java

bodewig     00/09/25 07:35:51

  Modified:    src/main/org/apache/tools/ant/taskdefs Zip.java
  Log:
  Allow sub classes of Zip to hold their own filesets and not tell Zip
  about it.
  
  This one enables War to build .war files without content included in
  extra filesets.
  
  Revision  Changes    Path
  1.14      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Zip.java	2000/09/15 11:41:18	1.13
  +++ Zip.java	2000/09/25 14:35:50	1.14
  @@ -132,7 +132,7 @@
       }
   
       public void execute() throws BuildException {
  -        if (baseDir == null && filesets.size() == 0)
  +        if (baseDir == null && filesets.size() == 0 && "zip".equals(archiveType))
               throw new BuildException("basedir attribute must be set, or at least one fileset must be given!");
   
           Vector dss = new Vector ();