ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
Date Tue, 05 Aug 2003 16:44:43 GMT
antoine     2003/08/05 09:44:43

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
  Log:
  Make the FTP.FTPDirectoryScanner class also register the root of a fileset
  when the root matches include exclude patterns.
  This is the behavior of the DirectoryScanner for normal filesets.
  This change should only possibly impact the RMDIR modus of the ftp task
  when the root directory is included.
  
  Revision  Changes    Path
  1.40      +12 -0     ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
  
  Index: FTP.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- FTP.java	29 Jul 2003 11:19:27 -0000	1.39
  +++ FTP.java	5 Aug 2003 16:44:43 -0000	1.40
  @@ -215,7 +215,19 @@
   
               try {
                   String cwd = ftp.printWorkingDirectory();
  +                // register also the root directory of the fileset if it matches
  +                // include and exclude patterns
  +                if (isIncluded("")) {
  +                    if (!isExcluded("")) {
  +                        dirsIncluded.addElement("");
  +                    } else {
  +                        dirsExcluded.addElement("");
  +                    }
  +                } else {
  +                    dirsNotIncluded.addElement("");
  +                }
                   // always start from the current ftp working dir
  +
                   scandir(".", "", true);
                   ftp.changeWorkingDirectory(cwd);
               } catch (IOException e) {
  
  
  

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


Mime
View raw message