Author: bodewig
Date: Thu Aug 13 10:15:03 2009
New Revision: 803830
URL: http://svn.apache.org/viewvc?rev=803830&view=rev
Log:
make ftp task compile against commons-net 2.0 and 1.4.1. PR 47669. Submitted
by Alexander Kurtakov
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=803830&r1=803829&r2=803830&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Thu Aug 13 10:15:03 2009
@@ -829,6 +829,9 @@
can be told to not download files that already exist locally.
Bugzilla Report 40058.
+ * Ant now builds against commons-net 2.0 as well.
+ Bugzilla Report 47669.
+
Changes from Ant 1.7.0 TO Ant 1.7.1
=============================================
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java?rev=803830&r1=803829&r2=803830&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
(original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
Thu Aug 13 10:15:03 2009
@@ -2447,7 +2447,7 @@
log("login succeeded", Project.MSG_VERBOSE);
if (binary) {
-
ftp.setFileType(org.apache.commons.net.ftp.FTP.IMAGE_FILE_TYPE);
+
ftp.setFileType(org.apache.commons.net.ftp.FTP.BINARY_FILE_TYPE);
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
throw new BuildException("could not set transfer type: "
+ ftp.getReplyString());
