You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by an...@apache.org on 2003/08/05 18:44:43 UTC
cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
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
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
Posted by Antoine Levy-Lambert <an...@antbuild.com>.
I have tested against Win 2000 with a cygwin server (simulates more or less
UNIX server)
I am going to test against freebsd on cvs.apache.org
Please feel free to do your own tests too.
I want to "frame" the behavior of the ftp task, and then improve the
FTPDirectoryScanner.
Cheers,
Antoine
----- Original Message -----
From: "Steve Loughran" <st...@iseran.com>
To: "Ant Developers List" <de...@ant.apache.org>
Sent: Tuesday, August 05, 2003 7:02 PM
Subject: Re: cvs commit:
ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
> antoine@apache.org wrote:
>
> > 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.
>
>
> What platforms are you testing against, BTW?
>
> I could turn ftp on on an NT box, and do a run against that.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net
FTP.java
Posted by "J. David Beutel" <jd...@getsu.com>.
On Tue, 5 Aug 2003, Steve Loughran wrote:
> That is interesting. Exec() hanging. It is not like chmod is doing much.
>
> No obvious causes spring to mind, but then I dont use freebsd much.
> (though I could bring it up under vmware, I suppose)
I've had similar problems with JDK 1.4.1 on RedHat 7.2,
and better luck with 1.4.0_03.
11011011
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net
FTP.java
Posted by Steve Loughran <st...@iseran.com>.
Antoine Levy-Lambert wrote:
> Steve,
>
> I am trying to test on cvs.apache.org (FreeBsd and
> java version "1.4.1-p3"
> Java(TM) 2 Runtime Environment, Standard Edition (build
> 1.4.1-p3-brian_28_jul_2003_12_35)
> Java HotSpot(TM) Client VM (build 1.4.1-p3-brian_28_jul_2003_12_35, mixed
> mode)
>
> The exec task is hanging out there it seems; at least <chmod/> and
> <symlink/> hang out there.
> I wonder whether the JVM which I am using there is worth something ?
> Maybe I will try with a JDK 1.3 or 1.2
That is interesting. Exec() hanging. It is not like chmod is doing much.
No obvious causes spring to mind, but then I dont use freebsd much.
(though I could bring it up under vmware, I suppose)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
Posted by Antoine Levy-Lambert <an...@antbuild.com>.
Steve,
I am trying to test on cvs.apache.org (FreeBsd and
java version "1.4.1-p3"
Java(TM) 2 Runtime Environment, Standard Edition (build
1.4.1-p3-brian_28_jul_2003_12_35)
Java HotSpot(TM) Client VM (build 1.4.1-p3-brian_28_jul_2003_12_35, mixed
mode)
The exec task is hanging out there it seems; at least <chmod/> and
<symlink/> hang out there.
I wonder whether the JVM which I am using there is worth something ?
Maybe I will try with a JDK 1.3 or 1.2
Cheers,
Antoine
----- Original Message -----
From: "Steve Loughran" <st...@iseran.com>
To: "Ant Developers List" <de...@ant.apache.org>
Sent: Tuesday, August 05, 2003 7:02 PM
Subject: Re: cvs commit:
ant/src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
> antoine@apache.org wrote:
>
> > 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.
>
>
> What platforms are you testing against, BTW?
>
> I could turn ftp on on an NT box, and do a run against that.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
> For additional commands, e-mail: dev-help@ant.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
Re: cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/net
FTP.java
Posted by Steve Loughran <st...@iseran.com>.
antoine@apache.org wrote:
> 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.
What platforms are you testing against, BTW?
I could turn ftp on on an NT box, and do a run against that.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org