ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/types AbstractFileSet.java
Date Fri, 18 Feb 2005 12:29:51 GMT
bodewig     2005/02/18 04:29:51

  Modified:    .        Tag: ANT_16_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
                        Zip.java
               src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
                        AbstractFileSet.java
  Log:
  merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.503.2.178 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.503.2.177
  retrieving revision 1.503.2.178
  diff -u -r1.503.2.177 -r1.503.2.178
  --- WHATSNEW	18 Feb 2005 11:04:28 -0000	1.503.2.177
  +++ WHATSNEW	18 Feb 2005 12:29:50 -0000	1.503.2.178
  @@ -204,6 +204,9 @@
     connetced to, potentially leading to exceptions in commons-net.
     Bugzilla Report 33618.
   
  +* <zip>'s defaultexcludes attribute was ignored when an archive was
  +  updated.  Bugzilla Report 33412.
  +
   Changes from Ant 1.6.1 to Ant 1.6.2
   ===================================
   
  
  
  
  No                   revision
  No                   revision
  1.116.2.13 +2 -0      ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
  
  Index: Zip.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
  retrieving revision 1.116.2.12
  retrieving revision 1.116.2.13
  diff -u -r1.116.2.12 -r1.116.2.13
  --- Zip.java	18 Jan 2005 12:40:01 -0000	1.116.2.12
  +++ Zip.java	18 Feb 2005 12:29:51 -0000	1.116.2.13
  @@ -482,6 +482,8 @@
                       ZipFileSet oldFiles = new ZipFileSet();
                       oldFiles.setProject(getProject());
                       oldFiles.setSrc(renamedFile);
  +                    oldFiles.setDefaultexcludes(getImplicitFileSet()
  +                                                .getDefaultexcludes());
   
                       for (int i = 0; i < addedFiles.size(); i++) {
                           PatternSet.NameEntry ne = oldFiles.createExclude();
  
  
  
  No                   revision
  No                   revision
  1.29.2.6  +9 -0      ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java
  
  Index: AbstractFileSet.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/AbstractFileSet.java,v
  retrieving revision 1.29.2.5
  retrieving revision 1.29.2.6
  diff -u -r1.29.2.5 -r1.29.2.6
  --- AbstractFileSet.java	10 Dec 2004 21:52:32 -0000	1.29.2.5
  +++ AbstractFileSet.java	18 Feb 2005 12:29:51 -0000	1.29.2.6
  @@ -267,6 +267,15 @@
       }
   
       /**
  +     * Whether default exclusions should be used or not.
  +     * @since Ant 1.6.3
  +     */
  +    public boolean getDefaultexcludes() {
  +        return (isReference())
  +            ? getRef(getProject()).getDefaultexcludes() : useDefaultExcludes;
  +    }
  +
  +    /**
        * Sets case sensitivity of the file system.
        *
        * @param isCaseSensitive <code>boolean</code>.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message