bodewig 2003/02/24 00:25:19
Modified: . WHATSNEW build.xml
docs/manual install.html
src/main/org/apache/tools/ant/taskdefs/optional/net FTP.java
TelnetTask.java
Log:
commons-net 1.0.0 has been released, drop NetComponents in favor of it.
Revision Changes Path
1.358 +4 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- WHATSNEW 19 Feb 2003 07:34:30 -0000 1.357
+++ WHATSNEW 24 Feb 2003 08:25:18 -0000 1.358
@@ -31,6 +31,10 @@
compile against the current code base. If it still compiles, it will
probably not work as in Ant 1.5.1.
+* The <ftp> and <telnet> tasks now require Jakarta Commons Net instead
+ of the older ORO Netcomponents version. See
+ <http://jakarta.apache.org/commons/net/index.html>.
+
Fixed bugs:
-----------
* <translate> was not ignoring comment lines.
1.351 +7 -7 ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ant/build.xml,v
retrieving revision 1.350
retrieving revision 1.351
diff -u -r1.350 -r1.351
--- build.xml 18 Feb 2003 12:12:02 -0000 1.350
+++ build.xml 24 Feb 2003 08:25:18 -0000 1.351
@@ -253,7 +253,7 @@
<filename name="${optional.package}/ejb/WLStop*"/>
</or>
</selector>
- <selector id="needs.netcomponents">
+ <selector id="needs.commons.net">
<or>
<filename name="${optional.package}/net/FTP*"/>
<filename name="${optional.package}/net/TelnetTask*"/>
@@ -381,8 +381,8 @@
<available property="junit.present"
classname="junit.framework.TestCase"
classpathref="classpath"/>
- <available property="netcomp.present"
- classname="com.oroinc.net.ftp.FTPClient"
+ <available property="commons.net.present"
+ classname="org.apache.commons.net.ftp.FTPClient"
classpathref="classpath"/>
<available property="starteam.present"
classname="com.starbase.util.Platform"
@@ -616,7 +616,7 @@
<selector refid="needs.weblogic.ddcreator"
unless="ejb.DDCreator.present"/>
<selector refid="needs.weblogic.server"
unless="ejb.wls.present"/>
- <selector refid="needs.netcomponents" unless="netcomp.present"/>
+ <selector refid="needs.commons.net"
unless="commons.net.present"/>
<selector refid="needs.starteam" unless="starteam.present"/>
<selector refid="needs.vaj" unless="vaj.present"/>
<selector refid="needs.antlr" unless="antlr.present"/>
@@ -783,7 +783,7 @@
<selector refid="needs.weblogic.ejbc"/>
<selector refid="needs.weblogic.ddcreator"/>
<selector refid="needs.weblogic.server"/>
- <selector refid="needs.netcomponents"/>
+ <selector refid="needs.commons.net"/>
<selector refid="needs.starteam"/>
<selector refid="needs.vaj"/>
<selector refid="needs.antlr"/>
@@ -892,10 +892,10 @@
<selector refid="needs.netrexx"/>
</jar>
- <jar destfile="${build.lib}/${optional.jars.prefix}-netcomp.jar"
+ <jar destfile="${build.lib}/${optional.jars.prefix}-commons-net.jar"
basedir="${build.classes}"
manifest="${manifest.tmp}">
- <selector refid="needs.netcomponents"/>
+ <selector refid="needs.commons.net"/>
</jar>
<jar destfile="${build.lib}/${optional.jars.prefix}-starteam.jar"
1.46 +3 -3 ant/docs/manual/install.html
Index: install.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/install.html,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- install.html 19 Feb 2003 09:23:19 -0000 1.45
+++ install.html 24 Feb 2003 08:25:19 -0000 1.46
@@ -377,10 +377,10 @@
<td><a href="http://www.judoscript.com/index.html";
target="_top">www.judoscript.com/index.html</a></td>
</tr>
<tr>
- <td>netcomponents.jar</td>
+ <td>commons-net.jar</td>
<td>ftp and telnet tasks</td>
- <td><a
href="http://www.savarese.org/oro/downloads/index.html#NetComponents";
- target="_top">www.savarese.org/oro/downloads</a></td>
+ <td><a href="http://jakarta.apache.org/commons/net/index.html";
+
target="_top">http://jakarta.apache.org/commons/net/index.html</a></td>
</tr>
<tr>
<td>bcel.jar</td>
1.34 +4 -4
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.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- FTP.java 21 Feb 2003 10:41:53 -0000 1.33
+++ FTP.java 24 Feb 2003 08:25:19 -0000 1.34
@@ -53,9 +53,9 @@
*/
package org.apache.tools.ant.taskdefs.optional.net;
-import com.oroinc.net.ftp.FTPClient;
-import com.oroinc.net.ftp.FTPFile;
-import com.oroinc.net.ftp.FTPReply;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
@@ -1052,7 +1052,7 @@
log("login succeeded", Project.MSG_VERBOSE);
if (binary) {
- ftp.setFileType(com.oroinc.net.ftp.FTP.IMAGE_FILE_TYPE);
+
ftp.setFileType(org.apache.commons.net.ftp.FTP.IMAGE_FILE_TYPE);
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
throw new BuildException("could not set transfer type: "
+
ftp.getReplyString());
1.19 +6 -5
ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
Index: TelnetTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- TelnetTask.java 10 Feb 2003 14:14:18 -0000 1.18
+++ TelnetTask.java 24 Feb 2003 08:25:19 -0000 1.19
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2000,2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2000,2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
package org.apache.tools.ant.taskdefs.optional.net;
-import com.oroinc.net.telnet.TelnetClient;
+import org.apache.commons.net.telnet.TelnetClient;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -305,8 +305,9 @@
/**
* This class handles the abstraction of the telnet protocol.
- * Currently it is a wrapper around <a href="www.oroinc.com">ORO</a>'s
- * NetComponents
+ * Currently it is a wrapper around <a
+ * href="http://jakarta.apache.org/commons/net/index.html";>Jakarta
+ * Commons Net</a>.
*/
public class AntTelnetClient extends TelnetClient {
/**
