You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by df...@apache.org on 2003/01/26 01:21:46 UTC
cvs commit: jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser EnterpriseUnixFTPEntryParserTest.java FTPParseTestFramework.java NTFTPEntryParserTest.java OS2FTPEntryParserTest.java UnixFTPEntryParserTest.java VMSFTPEntryParserTest.java
dfs 2003/01/25 16:21:46
Modified: net LICENSE.txt build.xml
net/src/java/examples IOUtil.java PrintCommandListener.java
chargen.java daytime.java echo.java finger.java
ftp.java fwhois.java mail.java messages.java
newsgroups.java post.java rdate.java rexec.java
rlogin.java rshell.java server2serverFTP.java
tftp.java weatherTelnet.java
net/src/java/org/apache/commons/net CharGenTCPClient.java
CharGenUDPClient.java DatagramSocketClient.java
DatagramSocketFactory.java DaytimeTCPClient.java
DaytimeUDPClient.java
DefaultDatagramSocketFactory.java
DefaultSocketFactory.java DiscardTCPClient.java
DiscardUDPClient.java EchoTCPClient.java
EchoUDPClient.java FingerClient.java
MalformedServerReplyException.java
ProtocolCommandEvent.java
ProtocolCommandListener.java
ProtocolCommandSupport.java SocketClient.java
SocketFactory.java TimeTCPClient.java
TimeUDPClient.java WhoisClient.java
net/src/java/org/apache/commons/net/bsd RCommandClient.java
RExecClient.java RLoginClient.java
net/src/java/org/apache/commons/net/ftp
DefaultFTPFileListParser.java FTP.java
FTPClient.java FTPCommand.java
FTPConnectionClosedException.java FTPFile.java
FTPFileListParser.java FTPReply.java
net/src/java/org/apache/commons/net/ftp/ftp2 FTPClient2.java
FTPFileEntryParser.java FTPFileIterator.java
FTPFileList.java
net/src/java/org/apache/commons/net/ftp/ftp2/parser
EnterpriseUnixFTPEntryParser.java
MatchApparatus.java NTFTPEntryParser.java
OS2FTPEntryParser.java UnixFTPEntryParser.java
VMSFTPEntryParser.java
net/src/java/org/apache/commons/net/nntp ArticlePointer.java
NNTP.java NNTPClient.java NNTPCommand.java
NNTPConnectionClosedException.java NNTPReply.java
NewGroupsOrNewsQuery.java NewsgroupInfo.java
SimpleNNTPHeader.java
net/src/java/org/apache/commons/net/pop3 POP3.java
POP3Client.java POP3Command.java
POP3MessageInfo.java POP3Reply.java
net/src/java/org/apache/commons/net/smtp RelayPath.java
SMTP.java SMTPClient.java SMTPCommand.java
SMTPConnectionClosedException.java SMTPReply.java
SimpleSMTPHeader.java
net/src/java/org/apache/commons/net/telnet Telnet.java
TelnetClient.java TelnetCommand.java
TelnetInputStream.java TelnetOption.java
TelnetOutputStream.java
net/src/java/org/apache/commons/net/tftp TFTP.java
TFTPAckPacket.java TFTPClient.java
TFTPDataPacket.java TFTPErrorPacket.java
TFTPPacket.java TFTPPacketException.java
TFTPReadRequestPacket.java TFTPRequestPacket.java
TFTPWriteRequestPacket.java
net/src/test/org/apache/commons/net/ftp/ftp2/parser
EnterpriseUnixFTPEntryParserTest.java
FTPParseTestFramework.java
NTFTPEntryParserTest.java
OS2FTPEntryParserTest.java
UnixFTPEntryParserTest.java
VMSFTPEntryParserTest.java
Removed: net/src/java/org/apache/commons/io CopyStreamAdapter.java
CopyStreamEvent.java CopyStreamException.java
CopyStreamListener.java
DotTerminatedMessageReader.java
DotTerminatedMessageWriter.java
FromNetASCIIInputStream.java
FromNetASCIIOutputStream.java
SocketInputStream.java SocketOutputStream.java
ToNetASCIIInputStream.java
ToNetASCIIOutputStream.java Util.java
net/src/java/org/apache/commons/util ListenerList.java
Log:
Fixed the following problems reported by Stephen Colebourne:
> [net] currently contains two packages
> o.a.commons.io
> o.a.commons.util
> These packages need to be renamed to be
> o.a.commons.net.io
> o.a.commons.net.util
>
> Also, some of the licences in the source files refer to the turbine licence,
> not the commons licence. This should be changed.
Also commented out the dependency of the jar build rule on the test build
rule because the test rule doesn't work for me and if it doesn't work for
me, it won't work for the average person who checks out the source. Will
resolve later (probably punt to Jeff since I've yet to learn Maven).
Revision Changes Path
1.2 +1 -1 jakarta-commons-sandbox/net/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/LICENSE.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LICENSE.txt 27 Apr 2002 17:33:25 -0000 1.1
+++ LICENSE.txt 26 Jan 2003 00:21:40 -0000 1.2
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.13 +5 -2 jakarta-commons-sandbox/net/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 9 Oct 2002 05:26:33 -0000 1.12
+++ build.xml 26 Jan 2003 00:21:40 -0000 1.13
@@ -52,9 +52,12 @@
</target>
-
- <target name="jar" description="o Create the jar" depends="compile,test">
+ <target name="jar" description="o Create the jar"
+ depends="compile">
+<!--
+ depends="compile,test">
+-->
<jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
</target>
1.5 +2 -2 jakarta-commons-sandbox/net/src/java/examples/IOUtil.java
Index: IOUtil.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/IOUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IOUtil.java 12 Apr 2002 04:42:44 -0000 1.4
+++ IOUtil.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -57,7 +57,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.commons.io.Util;
+import org.apache.commons.net.io.Util;
/***
* This is a utility class providing a reader/writer capability required
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/PrintCommandListener.java
Index: PrintCommandListener.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/PrintCommandListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PrintCommandListener.java 12 Apr 2002 04:42:44 -0000 1.4
+++ PrintCommandListener.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/chargen.java
Index: chargen.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/chargen.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- chargen.java 12 Apr 2002 04:42:44 -0000 1.4
+++ chargen.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/daytime.java
Index: daytime.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/daytime.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- daytime.java 12 Apr 2002 04:42:44 -0000 1.4
+++ daytime.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/echo.java
Index: echo.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/echo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- echo.java 12 Apr 2002 04:42:44 -0000 1.4
+++ echo.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/finger.java
Index: finger.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/finger.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- finger.java 12 Apr 2002 04:42:44 -0000 1.4
+++ finger.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.6 +1 -1 jakarta-commons-sandbox/net/src/java/examples/ftp.java
Index: ftp.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/ftp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ftp.java 19 Sep 2002 16:23:55 -0000 1.5
+++ ftp.java 26 Jan 2003 00:21:40 -0000 1.6
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/fwhois.java
Index: fwhois.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/fwhois.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fwhois.java 12 Apr 2002 04:42:44 -0000 1.4
+++ fwhois.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +2 -2 jakarta-commons-sandbox/net/src/java/examples/mail.java
Index: mail.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/mail.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mail.java 12 Apr 2002 04:42:44 -0000 1.4
+++ mail.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -63,7 +63,7 @@
import java.io.Writer;
import java.util.Enumeration;
import java.util.Vector;
-import org.apache.commons.io.Util;
+import org.apache.commons.net.io.Util;
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.commons.net.smtp.SimpleSMTPHeader;
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/messages.java
Index: messages.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/messages.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- messages.java 12 Apr 2002 04:42:44 -0000 1.4
+++ messages.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/newsgroups.java
Index: newsgroups.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/newsgroups.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- newsgroups.java 12 Apr 2002 04:42:44 -0000 1.4
+++ newsgroups.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +2 -2 jakarta-commons-sandbox/net/src/java/examples/post.java
Index: post.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/post.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- post.java 12 Apr 2002 04:42:44 -0000 1.4
+++ post.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -61,7 +61,7 @@
import java.io.InputStreamReader;
import java.io.PrintWriter;
import java.io.Writer;
-import org.apache.commons.io.Util;
+import org.apache.commons.net.io.Util;
import org.apache.commons.net.nntp.NNTPClient;
import org.apache.commons.net.nntp.NNTPReply;
import org.apache.commons.net.nntp.SimpleNNTPHeader;
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/rdate.java
Index: rdate.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/rdate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rdate.java 12 Apr 2002 04:42:44 -0000 1.4
+++ rdate.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/rexec.java
Index: rexec.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/rexec.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rexec.java 12 Apr 2002 04:42:44 -0000 1.4
+++ rexec.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/rlogin.java
Index: rlogin.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/rlogin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rlogin.java 12 Apr 2002 04:42:44 -0000 1.4
+++ rlogin.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/rshell.java
Index: rshell.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/rshell.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rshell.java 12 Apr 2002 04:42:44 -0000 1.4
+++ rshell.java 26 Jan 2003 00:21:40 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/server2serverFTP.java
Index: server2serverFTP.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/server2serverFTP.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- server2serverFTP.java 12 Apr 2002 04:42:44 -0000 1.4
+++ server2serverFTP.java 26 Jan 2003 00:21:41 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/examples/tftp.java
Index: tftp.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/tftp.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tftp.java 12 Apr 2002 04:42:44 -0000 1.4
+++ tftp.java 26 Jan 2003 00:21:41 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.6 +1 -1 jakarta-commons-sandbox/net/src/java/examples/weatherTelnet.java
Index: weatherTelnet.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/examples/weatherTelnet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- weatherTelnet.java 15 Sep 2002 00:28:53 -0000 1.5
+++ weatherTelnet.java 26 Jan 2003 00:21:41 -0000 1.6
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/CharGenTCPClient.java
Index: CharGenTCPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/CharGenTCPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CharGenTCPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ CharGenTCPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/CharGenUDPClient.java
Index: CharGenUDPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/CharGenUDPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CharGenUDPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ CharGenUDPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DatagramSocketClient.java
Index: DatagramSocketClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DatagramSocketClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatagramSocketClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ DatagramSocketClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DatagramSocketFactory.java
Index: DatagramSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DatagramSocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DatagramSocketFactory.java 12 Apr 2002 04:42:45 -0000 1.2
+++ DatagramSocketFactory.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DaytimeTCPClient.java
Index: DaytimeTCPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DaytimeTCPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DaytimeTCPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ DaytimeTCPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DaytimeUDPClient.java
Index: DaytimeUDPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DaytimeUDPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DaytimeUDPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ DaytimeUDPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DefaultDatagramSocketFactory.java
Index: DefaultDatagramSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DefaultDatagramSocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultDatagramSocketFactory.java 12 Apr 2002 04:42:45 -0000 1.2
+++ DefaultDatagramSocketFactory.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DefaultSocketFactory.java
Index: DefaultSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DefaultSocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultSocketFactory.java 12 Apr 2002 04:42:45 -0000 1.2
+++ DefaultSocketFactory.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DiscardTCPClient.java
Index: DiscardTCPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DiscardTCPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DiscardTCPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ DiscardTCPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DiscardUDPClient.java
Index: DiscardUDPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/DiscardUDPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DiscardUDPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ DiscardUDPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/EchoTCPClient.java
Index: EchoTCPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/EchoTCPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EchoTCPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ EchoTCPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/EchoUDPClient.java
Index: EchoUDPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/EchoUDPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EchoUDPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ EchoUDPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/FingerClient.java
Index: FingerClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/FingerClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FingerClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ FingerClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/MalformedServerReplyException.java
Index: MalformedServerReplyException.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/MalformedServerReplyException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MalformedServerReplyException.java 12 Apr 2002 04:42:45 -0000 1.2
+++ MalformedServerReplyException.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ProtocolCommandEvent.java
Index: ProtocolCommandEvent.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ProtocolCommandEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProtocolCommandEvent.java 12 Apr 2002 04:42:45 -0000 1.2
+++ ProtocolCommandEvent.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ProtocolCommandListener.java
Index: ProtocolCommandListener.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ProtocolCommandListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProtocolCommandListener.java 12 Apr 2002 04:42:45 -0000 1.2
+++ ProtocolCommandListener.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ProtocolCommandSupport.java
Index: ProtocolCommandSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ProtocolCommandSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProtocolCommandSupport.java 12 Apr 2002 04:42:45 -0000 1.2
+++ ProtocolCommandSupport.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -56,7 +56,7 @@
import java.io.Serializable;
import java.util.Enumeration;
-import org.apache.commons.util.ListenerList;
+import org.apache.commons.net.util.ListenerList;
/***
* ProtocolCommandSupport is a convenience class for managing a list of
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/SocketClient.java
Index: SocketClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/SocketClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SocketClient.java 6 Aug 2002 15:23:37 -0000 1.3
+++ SocketClient.java 26 Jan 2003 00:21:41 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/SocketFactory.java
Index: SocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/SocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SocketFactory.java 12 Apr 2002 04:42:45 -0000 1.2
+++ SocketFactory.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/TimeTCPClient.java
Index: TimeTCPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/TimeTCPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TimeTCPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ TimeTCPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/TimeUDPClient.java
Index: TimeUDPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/TimeUDPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TimeUDPClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ TimeUDPClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/WhoisClient.java
Index: WhoisClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/WhoisClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WhoisClient.java 12 Apr 2002 04:42:45 -0000 1.2
+++ WhoisClient.java 26 Jan 2003 00:21:41 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/bsd/RCommandClient.java
Index: RCommandClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/bsd/RCommandClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RCommandClient.java 12 Apr 2002 04:42:46 -0000 1.2
+++ RCommandClient.java 26 Jan 2003 00:21:42 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -61,7 +61,7 @@
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
-import org.apache.commons.io.SocketInputStream;
+import org.apache.commons.net.io.SocketInputStream;
import org.apache.commons.net.SocketClient;
/***
1.3 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/bsd/RExecClient.java
Index: RExecClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/bsd/RExecClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RExecClient.java 12 Apr 2002 04:42:46 -0000 1.2
+++ RExecClient.java 26 Jan 2003 00:21:42 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -58,7 +58,7 @@
import java.io.InputStream;
import java.net.ServerSocket;
import java.net.Socket;
-import org.apache.commons.io.SocketInputStream;
+import org.apache.commons.net.io.SocketInputStream;
import org.apache.commons.net.SocketClient;
import java.io.OutputStream;
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/bsd/RLoginClient.java
Index: RLoginClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/bsd/RLoginClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RLoginClient.java 12 Apr 2002 04:42:46 -0000 1.2
+++ RLoginClient.java 26 Jan 2003 00:21:43 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/DefaultFTPFileListParser.java
Index: DefaultFTPFileListParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/DefaultFTPFileListParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultFTPFileListParser.java 12 Apr 2002 04:42:46 -0000 1.2
+++ DefaultFTPFileListParser.java 26 Jan 2003 00:21:43 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTP.java
Index: FTP.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTP.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FTP.java 12 Apr 2002 04:42:46 -0000 1.2
+++ FTP.java 26 Jan 2003 00:21:43 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +7 -7 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPClient.java
Index: FTPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPClient.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FTPClient.java 20 Sep 2002 14:36:42 -0000 1.4
+++ FTPClient.java 26 Jan 2003 00:21:43 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -65,9 +65,9 @@
import java.net.ServerSocket;
import java.net.Socket;
import java.util.Vector;
-import org.apache.commons.io.FromNetASCIIInputStream;
-import org.apache.commons.io.ToNetASCIIOutputStream;
-import org.apache.commons.io.Util;
+import org.apache.commons.net.io.FromNetASCIIInputStream;
+import org.apache.commons.net.io.ToNetASCIIOutputStream;
+import org.apache.commons.net.io.Util;
import org.apache.commons.net.MalformedServerReplyException;
/***
@@ -139,7 +139,7 @@
* must create your own filter InputStreams and OutputStreams and wrap
* them around the streams returned or required by the FTPClient methods.
* FTPClient uses the NetASCII filter streams in
- * <a href="Package-org.apache.commons.io.html"> org.apache.commons.io </a> to provide
+ * <a href="Package-org.apache.commons.net.io.html"> org.apache.commons.net.io </a> to provide
* transparent handling of ASCII files. We will consider incorporating
* EBCDIC support if there is enough demand.
* <p>
@@ -462,7 +462,7 @@
output = socket.getOutputStream();
if (__fileType == ASCII_FILE_TYPE)
output = new ToNetASCIIOutputStream(output);
- return new org.apache.commons.io.SocketOutputStream(socket, output);
+ return new org.apache.commons.net.io.SocketOutputStream(socket, output);
}
@@ -1250,7 +1250,7 @@
input = socket.getInputStream();
if (__fileType == ASCII_FILE_TYPE)
input = new FromNetASCIIInputStream(input);
- return new org.apache.commons.io.SocketInputStream(socket, input);
+ return new org.apache.commons.net.io.SocketInputStream(socket, input);
}
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPCommand.java
Index: FTPCommand.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FTPCommand.java 12 Apr 2002 04:42:46 -0000 1.2
+++ FTPCommand.java 26 Jan 2003 00:21:43 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPConnectionClosedException.java
Index: FTPConnectionClosedException.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPConnectionClosedException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FTPConnectionClosedException.java 12 Apr 2002 04:42:46 -0000 1.2
+++ FTPConnectionClosedException.java 26 Jan 2003 00:21:43 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPFile.java
Index: FTPFile.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPFile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FTPFile.java 12 Apr 2002 04:42:46 -0000 1.2
+++ FTPFile.java 26 Jan 2003 00:21:43 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPFileListParser.java
Index: FTPFileListParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPFileListParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FTPFileListParser.java 12 Apr 2002 04:42:46 -0000 1.2
+++ FTPFileListParser.java 26 Jan 2003 00:21:43 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPReply.java
Index: FTPReply.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/FTPReply.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FTPReply.java 12 Apr 2002 04:42:46 -0000 1.2
+++ FTPReply.java 26 Jan 2003 00:21:43 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/FTPClient2.java
Index: FTPClient2.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/FTPClient2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FTPClient2.java 3 May 2002 14:52:29 -0000 1.3
+++ FTPClient2.java 26 Jan 2003 00:21:43 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/FTPFileEntryParser.java
Index: FTPFileEntryParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/FTPFileEntryParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FTPFileEntryParser.java 3 May 2002 14:52:29 -0000 1.3
+++ FTPFileEntryParser.java 26 Jan 2003 00:21:43 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/FTPFileIterator.java
Index: FTPFileIterator.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/FTPFileIterator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FTPFileIterator.java 3 May 2002 14:52:29 -0000 1.3
+++ FTPFileIterator.java 26 Jan 2003 00:21:43 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/FTPFileList.java
Index: FTPFileList.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/FTPFileList.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FTPFileList.java 3 May 2002 14:52:29 -0000 1.3
+++ FTPFileList.java 26 Jan 2003 00:21:43 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.2 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/EnterpriseUnixFTPEntryParser.java
Index: EnterpriseUnixFTPEntryParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/EnterpriseUnixFTPEntryParser.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnterpriseUnixFTPEntryParser.java 15 Aug 2002 17:47:44 -0000 1.1
+++ EnterpriseUnixFTPEntryParser.java 26 Jan 2003 00:21:43 -0000 1.2
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/MatchApparatus.java
Index: MatchApparatus.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/MatchApparatus.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MatchApparatus.java 8 Aug 2002 20:01:41 -0000 1.4
+++ MatchApparatus.java 26 Jan 2003 00:21:44 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.6 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/NTFTPEntryParser.java
Index: NTFTPEntryParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/NTFTPEntryParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NTFTPEntryParser.java 8 Aug 2002 20:01:41 -0000 1.5
+++ NTFTPEntryParser.java 26 Jan 2003 00:21:44 -0000 1.6
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.6 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/OS2FTPEntryParser.java
Index: OS2FTPEntryParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/OS2FTPEntryParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- OS2FTPEntryParser.java 8 Aug 2002 20:01:41 -0000 1.5
+++ OS2FTPEntryParser.java 26 Jan 2003 00:21:44 -0000 1.6
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.6 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/UnixFTPEntryParser.java
Index: UnixFTPEntryParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/UnixFTPEntryParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnixFTPEntryParser.java 8 Aug 2002 20:01:41 -0000 1.5
+++ UnixFTPEntryParser.java 26 Jan 2003 00:21:44 -0000 1.6
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.7 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/VMSFTPEntryParser.java
Index: VMSFTPEntryParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/ftp/ftp2/parser/VMSFTPEntryParser.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- VMSFTPEntryParser.java 8 Aug 2002 20:01:41 -0000 1.6
+++ VMSFTPEntryParser.java 26 Jan 2003 00:21:44 -0000 1.7
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/ArticlePointer.java
Index: ArticlePointer.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/ArticlePointer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ArticlePointer.java 6 Aug 2002 15:23:37 -0000 1.3
+++ ArticlePointer.java 26 Jan 2003 00:21:44 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTP.java
Index: NNTP.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTP.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NNTP.java 21 Nov 2002 18:55:21 -0000 1.3
+++ NNTP.java 26 Jan 2003 00:21:44 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +4 -4 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTPClient.java
Index: NNTPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPClient.java 12 Apr 2002 04:42:46 -0000 1.2
+++ NNTPClient.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -61,9 +61,9 @@
import java.io.Writer;
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.commons.io.DotTerminatedMessageReader;
-import org.apache.commons.io.DotTerminatedMessageWriter;
-import org.apache.commons.io.Util;
+import org.apache.commons.net.io.DotTerminatedMessageReader;
+import org.apache.commons.net.io.DotTerminatedMessageWriter;
+import org.apache.commons.net.io.Util;
import org.apache.commons.net.MalformedServerReplyException;
/***
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTPCommand.java
Index: NNTPCommand.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTPCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPCommand.java 12 Apr 2002 04:42:46 -0000 1.2
+++ NNTPCommand.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTPConnectionClosedException.java
Index: NNTPConnectionClosedException.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTPConnectionClosedException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPConnectionClosedException.java 12 Apr 2002 04:42:46 -0000 1.2
+++ NNTPConnectionClosedException.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTPReply.java
Index: NNTPReply.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NNTPReply.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NNTPReply.java 12 Apr 2002 04:42:46 -0000 1.2
+++ NNTPReply.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java
Index: NewGroupsOrNewsQuery.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NewGroupsOrNewsQuery.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NewGroupsOrNewsQuery.java 6 Aug 2002 15:23:37 -0000 1.3
+++ NewGroupsOrNewsQuery.java 26 Jan 2003 00:21:44 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NewsgroupInfo.java
Index: NewsgroupInfo.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/NewsgroupInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NewsgroupInfo.java 12 Apr 2002 04:42:46 -0000 1.2
+++ NewsgroupInfo.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java
Index: SimpleNNTPHeader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/nntp/SimpleNNTPHeader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleNNTPHeader.java 12 Apr 2002 04:42:46 -0000 1.2
+++ SimpleNNTPHeader.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3.java
Index: POP3.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- POP3.java 12 Apr 2002 04:42:47 -0000 1.2
+++ POP3.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +3 -3 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3Client.java
Index: POP3Client.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3Client.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- POP3Client.java 12 Apr 2002 04:42:47 -0000 1.2
+++ POP3Client.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -60,7 +60,7 @@
import java.security.NoSuchAlgorithmException;
import java.util.Enumeration;
import java.util.StringTokenizer;
-import org.apache.commons.io.DotTerminatedMessageReader;
+import org.apache.commons.net.io.DotTerminatedMessageReader;
/***
* The POP3Client class implements the client side of the Internet POP3
@@ -81,7 +81,7 @@
* <p>
* @author Daniel F. Savarese
* @see POP3MessageInfo
- * @see org.apache.commons.io.DotTerminatedMessageReader
+ * @see org.apache.commons.net.io.DotTerminatedMessageReader
* @see org.apache.commons.net.MalformedServerReplyException
***/
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3Command.java
Index: POP3Command.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3Command.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- POP3Command.java 12 Apr 2002 04:42:47 -0000 1.2
+++ POP3Command.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3MessageInfo.java
Index: POP3MessageInfo.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3MessageInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- POP3MessageInfo.java 12 Apr 2002 04:42:47 -0000 1.2
+++ POP3MessageInfo.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3Reply.java
Index: POP3Reply.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/pop3/POP3Reply.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- POP3Reply.java 12 Apr 2002 04:42:47 -0000 1.2
+++ POP3Reply.java 26 Jan 2003 00:21:44 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/RelayPath.java
Index: RelayPath.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/RelayPath.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RelayPath.java 12 Apr 2002 04:42:47 -0000 1.2
+++ RelayPath.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTP.java
Index: SMTP.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTP.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SMTP.java 12 Apr 2002 04:42:47 -0000 1.2
+++ SMTP.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +2 -2 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTPClient.java
Index: SMTPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTPClient.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SMTPClient.java 12 Apr 2002 04:42:47 -0000 1.2
+++ SMTPClient.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -57,7 +57,7 @@
import java.io.IOException;
import java.io.Writer;
import java.net.InetAddress;
-import org.apache.commons.io.DotTerminatedMessageWriter;
+import org.apache.commons.net.io.DotTerminatedMessageWriter;
/***
* SMTPClient encapsulates all the functionality necessary to send files
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTPCommand.java
Index: SMTPCommand.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTPCommand.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SMTPCommand.java 12 Apr 2002 04:42:47 -0000 1.2
+++ SMTPCommand.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTPConnectionClosedException.java
Index: SMTPConnectionClosedException.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTPConnectionClosedException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SMTPConnectionClosedException.java 12 Apr 2002 04:42:47 -0000 1.2
+++ SMTPConnectionClosedException.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTPReply.java
Index: SMTPReply.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SMTPReply.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SMTPReply.java 12 Apr 2002 04:42:47 -0000 1.2
+++ SMTPReply.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SimpleSMTPHeader.java
Index: SimpleSMTPHeader.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/smtp/SimpleSMTPHeader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleSMTPHeader.java 12 Apr 2002 04:42:47 -0000 1.2
+++ SimpleSMTPHeader.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/Telnet.java
Index: Telnet.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/Telnet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Telnet.java 6 Aug 2002 15:23:37 -0000 1.3
+++ Telnet.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +3 -3 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetClient.java
Index: TelnetClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TelnetClient.java 15 Sep 2002 00:28:53 -0000 1.3
+++ TelnetClient.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -58,8 +58,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.commons.io.FromNetASCIIInputStream;
-import org.apache.commons.io.ToNetASCIIOutputStream;
+import org.apache.commons.net.io.FromNetASCIIInputStream;
+import org.apache.commons.net.io.ToNetASCIIOutputStream;
/***
* The TelnetClient class implements the simple network virtual
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetCommand.java
Index: TelnetCommand.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetCommand.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TelnetCommand.java 6 Aug 2002 15:23:37 -0000 1.3
+++ TelnetCommand.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetInputStream.java
Index: TelnetInputStream.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetInputStream.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TelnetInputStream.java 19 Sep 2002 18:09:25 -0000 1.4
+++ TelnetInputStream.java 26 Jan 2003 00:21:45 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetOption.java
Index: TelnetOption.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetOption.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TelnetOption.java 6 Aug 2002 15:23:37 -0000 1.3
+++ TelnetOption.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetOutputStream.java
Index: TelnetOutputStream.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/telnet/TelnetOutputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TelnetOutputStream.java 12 Apr 2002 04:42:47 -0000 1.2
+++ TelnetOutputStream.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTP.java
Index: TFTP.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTP.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TFTP.java 6 Aug 2002 15:23:37 -0000 1.3
+++ TFTP.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPAckPacket.java
Index: TFTPAckPacket.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPAckPacket.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TFTPAckPacket.java 6 Aug 2002 15:23:37 -0000 1.3
+++ TFTPAckPacket.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.6 +3 -3 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPClient.java
Index: TFTPClient.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPClient.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TFTPClient.java 17 Sep 2002 22:02:32 -0000 1.5
+++ TFTPClient.java 26 Jan 2003 00:21:45 -0000 1.6
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -61,8 +61,8 @@
import java.net.InetAddress;
import java.net.SocketException;
import java.net.UnknownHostException;
-import org.apache.commons.io.FromNetASCIIOutputStream;
-import org.apache.commons.io.ToNetASCIIInputStream;
+import org.apache.commons.net.io.FromNetASCIIOutputStream;
+import org.apache.commons.net.io.ToNetASCIIInputStream;
/***
* The TFTPClient class encapsulates all the aspects of the TFTP protocol
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPDataPacket.java
Index: TFTPDataPacket.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPDataPacket.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TFTPDataPacket.java 6 Aug 2002 15:23:37 -0000 1.3
+++ TFTPDataPacket.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPErrorPacket.java
Index: TFTPErrorPacket.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPErrorPacket.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TFTPErrorPacket.java 6 Aug 2002 15:23:37 -0000 1.3
+++ TFTPErrorPacket.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPPacket.java
Index: TFTPPacket.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPPacket.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TFTPPacket.java 6 Aug 2002 15:23:37 -0000 1.3
+++ TFTPPacket.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPPacketException.java
Index: TFTPPacketException.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPPacketException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TFTPPacketException.java 12 Apr 2002 04:42:48 -0000 1.2
+++ TFTPPacketException.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPReadRequestPacket.java
Index: TFTPReadRequestPacket.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPReadRequestPacket.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TFTPReadRequestPacket.java 12 Apr 2002 04:42:48 -0000 1.2
+++ TFTPReadRequestPacket.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.4 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPRequestPacket.java
Index: TFTPRequestPacket.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPRequestPacket.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TFTPRequestPacket.java 6 Aug 2002 15:23:37 -0000 1.3
+++ TFTPRequestPacket.java 26 Jan 2003 00:21:45 -0000 1.4
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +1 -1 jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPWriteRequestPacket.java
Index: TFTPWriteRequestPacket.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/java/org/apache/commons/net/tftp/TFTPWriteRequestPacket.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TFTPWriteRequestPacket.java 12 Apr 2002 04:42:48 -0000 1.2
+++ TFTPWriteRequestPacket.java 26 Jan 2003 00:21:45 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.3 +2 -2 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/EnterpriseUnixFTPEntryParserTest.java
Index: EnterpriseUnixFTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/EnterpriseUnixFTPEntryParserTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EnterpriseUnixFTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.2
+++ EnterpriseUnixFTPEntryParserTest.java 26 Jan 2003 00:21:46 -0000 1.3
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.6 +2 -2 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/FTPParseTestFramework.java
Index: FTPParseTestFramework.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/FTPParseTestFramework.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FTPParseTestFramework.java 9 Oct 2002 12:40:04 -0000 1.5
+++ FTPParseTestFramework.java 26 Jan 2003 00:21:46 -0000 1.6
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +2 -2 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/NTFTPEntryParserTest.java
Index: NTFTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/NTFTPEntryParserTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NTFTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.4
+++ NTFTPEntryParserTest.java 26 Jan 2003 00:21:46 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +2 -2 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/OS2FTPEntryParserTest.java
Index: OS2FTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/OS2FTPEntryParserTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OS2FTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.4
+++ OS2FTPEntryParserTest.java 26 Jan 2003 00:21:46 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.6 +2 -2 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/UnixFTPEntryParserTest.java
Index: UnixFTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/UnixFTPEntryParserTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UnixFTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.5
+++ UnixFTPEntryParserTest.java 26 Jan 2003 00:21:46 -0000 1.6
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
1.5 +2 -2 jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/VMSFTPEntryParserTest.java
Index: VMSFTPEntryParserTest.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/net/src/test/org/apache/commons/net/ftp/ftp2/parser/VMSFTPEntryParserTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VMSFTPEntryParserTest.java 9 Oct 2002 05:11:19 -0000 1.4
+++ VMSFTPEntryParserTest.java 26 Jan 2003 00:21:46 -0000 1.5
@@ -31,7 +31,7 @@
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>