commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bre...@apache.org
Subject cvs commit: jakarta-commons/net/src/test/org/apache/commons/net/telnet EchoOptionHandlerTest.java SimpleOptionHandlerTest.java SuppressGAOptionHandlerTest.java TelnetClientFunctionalTest.java TelnetClientTest.java TerminalTypeOptionHandlerTest.java
Date Sun, 18 May 2003 04:03:17 GMT
brekke      2003/05/17 21:03:17

  Modified:    net/src/java/examples TelnetClientExample.java
               net/src/java/org/apache/commons/net FingerClient.java
               net/src/java/org/apache/commons/net/ftp
                        DefaultFTPFileListParser.java FTP.java
                        FTPClient.java
               net/src/java/org/apache/commons/net/ftp/parser
                        EnterpriseUnixFTPEntryParser.java
                        NTFTPEntryParser.java VMSFTPEntryParser.java
               net/src/java/org/apache/commons/net/smtp SMTP.java
               net/src/java/org/apache/commons/net/tftp TFTPDataPacket.java
               net/src/test/org/apache/commons/net/telnet
                        EchoOptionHandlerTest.java
                        SimpleOptionHandlerTest.java
                        SuppressGAOptionHandlerTest.java
                        TelnetClientFunctionalTest.java
                        TelnetClientTest.java
                        TerminalTypeOptionHandlerTest.java
  Log:
  Used eclipse to find unused variables and unneeded import statements.
  Changes shouldn't effect behavior, all tests still passing.
  
  Revision  Changes    Path
  1.2       +0 -1      jakarta-commons/net/src/java/examples/TelnetClientExample.java
  
  Index: TelnetClientExample.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/examples/TelnetClientExample.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TelnetClientExample.java	14 Apr 2003 12:53:33 -0000	1.1
  +++ TelnetClientExample.java	18 May 2003 04:03:16 -0000	1.2
  @@ -59,7 +59,6 @@
   import java.io.FileOutputStream;
   import java.io.IOException;
   import org.apache.commons.net.telnet.TelnetClient;
  -import org.apache.commons.net.telnet.TelnetOptionHandler;
   import org.apache.commons.net.telnet.SimpleOptionHandler;
   import org.apache.commons.net.telnet.EchoOptionHandler;
   import org.apache.commons.net.telnet.TerminalTypeOptionHandler;
  
  
  
  1.4       +0 -2      jakarta-commons/net/src/java/org/apache/commons/net/FingerClient.java
  
  Index: FingerClient.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/FingerClient.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FingerClient.java	26 Jan 2003 00:21:41 -0000	1.3
  +++ FingerClient.java	18 May 2003 04:03:16 -0000	1.4
  @@ -58,7 +58,6 @@
   import java.io.IOException;
   import java.io.InputStream;
   import java.io.InputStreamReader;
  -import java.net.Socket;
   import java.io.DataOutputStream;
   
   /***
  @@ -174,7 +173,6 @@
       public InputStream getInputStream(boolean longOutput, String username)
       throws IOException
       {
  -        Socket socket;
           DataOutputStream output;
   
           __query.setLength(0);
  
  
  
  1.5       +0 -2      jakarta-commons/net/src/java/org/apache/commons/net/ftp/DefaultFTPFileListParser.java
  
  Index: DefaultFTPFileListParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/DefaultFTPFileListParser.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultFTPFileListParser.java	23 Feb 2003 23:00:02 -0000	1.4
  +++ DefaultFTPFileListParser.java	18 May 2003 04:03:16 -0000	1.5
  @@ -59,7 +59,6 @@
   import java.io.InputStream;
   import java.io.InputStreamReader;
   import java.util.Calendar;
  -import java.util.StringTokenizer;
   import java.util.Vector;
   
   /***
  @@ -154,7 +153,6 @@
           int access, start, end, type, month, year, hour, minutes;
           boolean isDevice;
           Calendar date;
  -        StringTokenizer tokenizer;
           String sToken;
           char cToken[];
           FTPFile file;
  
  
  
  1.4       +4 -4      jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTP.java
  
  Index: FTP.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTP.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FTP.java	26 Jan 2003 00:21:43 -0000	1.3
  +++ FTP.java	18 May 2003 04:03:16 -0000	1.4
  @@ -279,12 +279,11 @@
       private void __getReply() throws IOException
       {
           int length;
  -        String line, code;
   
           _newReplyString = true;
           _replyLines.setSize(0);
   
  -        line = _controlInput.readLine();
  +        String line = _controlInput.readLine();
   
           if (line == null)
               throw new FTPConnectionClosedException(
  @@ -299,7 +298,8 @@
   
           try
           {
  -            _replyCode = Integer.parseInt(code = line.substring(0, 3));
  +        	String code = line.substring(0, 3);
  +            _replyCode = Integer.parseInt(code);
           }
           catch (NumberFormatException e)
           {
  @@ -768,7 +768,7 @@
        ***/
       public int smnt(String dir) throws IOException
       {
  -        return sendCommand(FTPCommand.SMNT);
  +        return sendCommand(FTPCommand.SMNT, dir);
       }
   
       /***
  
  
  
  1.10      +0 -1      jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPClient.java
  
  Index: FTPClient.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/FTPClient.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- FTPClient.java	19 Apr 2003 19:56:41 -0000	1.9
  +++ FTPClient.java	18 May 2003 04:03:16 -0000	1.10
  @@ -2152,7 +2152,6 @@
       throws IOException
       {
           Socket socket;
  -        FTPFile[] results;
   
           if ((socket = _openDataConnection_(FTPCommand.LIST, pathname)) == null)
           {
  
  
  
  1.3       +1 -3      jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java
  
  Index: EnterpriseUnixFTPEntryParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/EnterpriseUnixFTPEntryParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EnterpriseUnixFTPEntryParser.java	6 Mar 2003 03:28:35 -0000	1.2
  +++ EnterpriseUnixFTPEntryParser.java	18 May 2003 04:03:17 -0000	1.3
  @@ -117,8 +117,6 @@
           FTPFile file = new FTPFile();
           file.setRawListing(entry);
   
  -        int type;
  -        boolean isDevice = false;
           if (matches(entry))
           {
               String usr = group(14);
  
  
  
  1.4       +2 -4      jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java
  
  Index: NTFTPEntryParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/NTFTPEntryParser.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NTFTPEntryParser.java	6 Mar 2003 03:28:36 -0000	1.3
  +++ NTFTPEntryParser.java	18 May 2003 04:03:17 -0000	1.4
  @@ -146,9 +146,7 @@
       {
           FTPFile f = new FTPFile();
           f.setRawListing(entry);
  -        int type;
  -        boolean isDevice = false;
  -
  +        
           if (matches(entry))
           {
               String mo = group(1);
  
  
  
  1.5       +1 -4      jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java
  
  Index: VMSFTPEntryParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/ftp/parser/VMSFTPEntryParser.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- VMSFTPEntryParser.java	6 Mar 2003 03:28:36 -0000	1.4
  +++ VMSFTPEntryParser.java	18 May 2003 04:03:17 -0000	1.5
  @@ -187,10 +187,7 @@
       public FTPFile parseFTPEntry(String entry)
       {
           //one block in VMS equals 512 bytes
  -        Integer oneBlock = new Integer(512);
  -        int intBlock = oneBlock.intValue();
           long longBlock = 512;
  -
   
           if (matches(entry))
           {
  
  
  
  1.4       +4 -4      jakarta-commons/net/src/java/org/apache/commons/net/smtp/SMTP.java
  
  Index: SMTP.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/smtp/SMTP.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SMTP.java	26 Jan 2003 00:21:45 -0000	1.3
  +++ SMTP.java	18 May 2003 04:03:17 -0000	1.4
  @@ -191,12 +191,11 @@
       private void __getReply() throws IOException
       {
           int length;
  -        String line, code;
  -
  +        
           _newReplyString = true;
           _replyLines.setSize(0);
   
  -        line = _reader.readLine();
  +        String line = _reader.readLine();
   
           if (line == null)
               throw new SMTPConnectionClosedException(
  @@ -211,7 +210,8 @@
   
           try
           {
  -            _replyCode = Integer.parseInt(code = line.substring(0, 3));
  +			String code = line.substring(0, 3);
  +            _replyCode = Integer.parseInt(code);
           }
           catch (NumberFormatException e)
           {
  
  
  
  1.5       +1 -2      jakarta-commons/net/src/java/org/apache/commons/net/tftp/TFTPDataPacket.java
  
  Index: TFTPDataPacket.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/java/org/apache/commons/net/tftp/TFTPDataPacket.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TFTPDataPacket.java	26 Jan 2003 00:21:45 -0000	1.4
  +++ TFTPDataPacket.java	18 May 2003 04:03:17 -0000	1.5
  @@ -208,8 +208,7 @@
       public DatagramPacket newDatagram()
       {
           byte[] data;
  -        DatagramPacket datagram;
  -
  +        
           data = new byte[_length + 4];
           data[0] = 0;
           data[1] = (byte)_type;
  
  
  
  1.2       +0 -57     jakarta-commons/net/src/test/org/apache/commons/net/telnet/EchoOptionHandlerTest.java
  
  Index: EchoOptionHandlerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/test/org/apache/commons/net/telnet/EchoOptionHandlerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EchoOptionHandlerTest.java	14 Apr 2003 12:53:34 -0000	1.1
  +++ EchoOptionHandlerTest.java	18 May 2003 04:03:17 -0000	1.2
  @@ -1,62 +1,5 @@
   package org.apache.commons.net.telnet;
   
  -/* ====================================================================
  - *
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2003 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowlegement may appear in the software itself,
  - *    if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *    nor may "Apache" appear in their names without prior written
  - *    permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
  -
  -import junit.framework.TestCase;
  -
   /***
    * JUnit test class for EchoOptionHandler
    * <p>
  
  
  
  1.2       +0 -57     jakarta-commons/net/src/test/org/apache/commons/net/telnet/SimpleOptionHandlerTest.java
  
  Index: SimpleOptionHandlerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/test/org/apache/commons/net/telnet/SimpleOptionHandlerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SimpleOptionHandlerTest.java	14 Apr 2003 12:53:34 -0000	1.1
  +++ SimpleOptionHandlerTest.java	18 May 2003 04:03:17 -0000	1.2
  @@ -1,62 +1,5 @@
   package org.apache.commons.net.telnet;
   
  -/* ====================================================================
  - *
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2003 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowlegement may appear in the software itself,
  - *    if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *    nor may "Apache" appear in their names without prior written
  - *    permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
  -
  -import junit.framework.TestCase;
  -
   /***
    * JUnit test class for SimpleOptionHandler
    * <p>
  
  
  
  1.2       +0 -57     jakarta-commons/net/src/test/org/apache/commons/net/telnet/SuppressGAOptionHandlerTest.java
  
  Index: SuppressGAOptionHandlerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/test/org/apache/commons/net/telnet/SuppressGAOptionHandlerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SuppressGAOptionHandlerTest.java	14 Apr 2003 12:53:34 -0000	1.1
  +++ SuppressGAOptionHandlerTest.java	18 May 2003 04:03:17 -0000	1.2
  @@ -1,62 +1,5 @@
   package org.apache.commons.net.telnet;
   
  -/* ====================================================================
  - *
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2003 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowlegement may appear in the software itself,
  - *    if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *    nor may "Apache" appear in their names without prior written
  - *    permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
  -
  -import junit.framework.TestCase;
  -
   /***
    * JUnit test class for SuppressGAOptionHandler
    * <p>
  
  
  
  1.2       +0 -1      jakarta-commons/net/src/test/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java
  
  Index: TelnetClientFunctionalTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/test/org/apache/commons/net/telnet/TelnetClientFunctionalTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TelnetClientFunctionalTest.java	14 Apr 2003 12:53:34 -0000	1.1
  +++ TelnetClientFunctionalTest.java	18 May 2003 04:03:17 -0000	1.2
  @@ -136,7 +136,6 @@
        ***/
       public boolean waitForString(InputStream is, String end, long timeout) throws Exception
       {
  -        boolean result = false;
           byte buffer[] = new byte[32];
           long starttime = System.currentTimeMillis();
   
  
  
  
  1.2       +1 -7      jakarta-commons/net/src/test/org/apache/commons/net/telnet/TelnetClientTest.java
  
  Index: TelnetClientTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/test/org/apache/commons/net/telnet/TelnetClientTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TelnetClientTest.java	14 Apr 2003 12:53:34 -0000	1.1
  +++ TelnetClientTest.java	18 May 2003 04:03:17 -0000	1.2
  @@ -89,14 +89,10 @@
        ***/
       protected void openConnections() throws Exception
       {
  -        boolean server_creation_ok = false;
  -        boolean client_creation_ok = false;
  -
           server1 = new TelnetTestSimpleServer(3333);
           server2 = new TelnetTestSimpleServer(3334);
           server3 = new TelnetTestSimpleServer(3335);
  -        server_creation_ok = true;
  -
  +        
           tc1 = new TelnetClient();
           tc2 = new TelnetClient();
           tc3 = new TelnetClient("ANSI");
  @@ -108,7 +104,6 @@
           tc2.addOptionHandler(ttopt);
           tc2.addOptionHandler(echoopt);
           tc2.addOptionHandler(gaopt);
  -        client_creation_ok = true;
   
           tc1.connect("127.0.0.1", 3333);
           tc2.connect("127.0.0.1", 3334);
  @@ -147,7 +142,6 @@
               add_invalid_ok1 = true;
           }
   
  -        EchoOptionHandler echoopt = new EchoOptionHandler(true, false, true, false);
           try
           {
               tc2.addOptionHandler(hand);
  
  
  
  1.2       +0 -57     jakarta-commons/net/src/test/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java
  
  Index: TerminalTypeOptionHandlerTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/net/src/test/org/apache/commons/net/telnet/TerminalTypeOptionHandlerTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TerminalTypeOptionHandlerTest.java	14 Apr 2003 12:53:34 -0000	1.1
  +++ TerminalTypeOptionHandlerTest.java	18 May 2003 04:03:17 -0000	1.2
  @@ -1,62 +1,5 @@
   package org.apache.commons.net.telnet;
   
  -/* ====================================================================
  - *
  - * The Apache Software License, Version 1.1
  - *
  - * Copyright (c) 2003 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution, if
  - *    any, must include the following acknowlegement:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowlegement may appear in the software itself,
  - *    if and wherever such third-party acknowlegements normally appear.
  - *
  - * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
  - *    Foundation" must not be used to endorse or promote products derived
  - *    from this software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache"
  - *    nor may "Apache" appear in their names without prior written
  - *    permission of the Apache Group.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
  -
  -import junit.framework.TestCase;
  -
   /***
    * JUnit test class for TerminalTypeOptionHandler
    * <p>
  
  
  

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


Mime
View raw message