Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@commons.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1076391 - in /commons/proper/net/trunk/src:
 changes/changes.xml
 main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
 main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
Date: Wed, 02 Mar 2011 21:28:50 -0000
To: commits@commons.apache.org
From: sebb@apache.org
Message-Id: <20110302212850.CACC22388A3B@eris.apache.org>

Author: sebb
Date: Wed Mar  2 21:28:50 2011
New Revision: 1076391

URL: http://svn.apache.org/viewvc?rev=1076391&view=rev
Log:
Removed deprecated methods

Modified:
    commons/proper/net/trunk/src/changes/changes.xml
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java

Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1076391&r1=1076390&r2=1076391&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Wed Mar  2 21:28:50 2011
@@ -62,6 +62,10 @@ The <action> type attribute can be add,u
             </action>
             <action dev="sebb" type="fix">
             Removed deprecated unused fields from FTPSClient.
+            Removed deprecated methods FTPClient.getSystemName(), FTPListParseEngine.readServerList(InputStream stream),
+            FTPSSocketFactory.createServerSocket(int port), FTPSSocketFactory.createServerSocket(int port, int backlog),
+            FTPSSocketFactory.createServerSocket(int port, int backlog, InetAddress ifAddress),
+            FTPSSocketFactory.init(ServerSocket socket)
             </action>
             <action issue="NET-258" dev="sebb" type="fix">
             Implement A Keepalive Mechanism. Control channel keepalive implemented for the following methods:

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java?rev=1076391&r1=1076390&r2=1076391&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPListParseEngine.java Wed Mar  2 21:28:50 2011
@@ -104,26 +104,6 @@ public class FTPListParseEngine {
     }
     
     /**
-     * handle the iniitial reading and preparsing of the list returned by
-     * the server.  After this method has completed, this object will contain
-     * a list of unparsed entries (Strings) each referring to a unique file
-     * on the server.
-     *
-     * @param stream input stream provided by the server socket.
-     *
-     * @exception IOException
-     *                   thrown on any failure to read from the sever.
-     *
-     * @deprecated The version of this method which takes an encoding should be used.
-    */
-    @Deprecated
-    public void readServerList(InputStream stream)
-    throws IOException
-    {
-        readServerList(stream, null);
-    }
-  
-    /**
      * Internal method for reading the input into the <code>entries</code> list.
      * After this method has completed, <code>entries</code> will contain a
      * collection of entries (as defined by

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java?rev=1076391&r1=1076390&r2=1076391&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java (original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java Wed Mar  2 21:28:50 2011
@@ -60,30 +60,4 @@ public class FTPSSocketFactory extends S
     public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
         return this.context.getSocketFactory().createSocket(address, port, localAddress, localPort);
     }
-
-    /** @deprecated (2.2) use {@link FTPSServerSocketFactory#createServerSocket(int) instead} */
-    @Deprecated
-    public ServerSocket createServerSocket(int port) throws IOException {
-        return this.init(this.context.getServerSocketFactory().createServerSocket(port));
-    }
-
-    /** @deprecated  (2.2) use {@link FTPSServerSocketFactory#createServerSocket(int, int) instead} */
-    @Deprecated
-    public ServerSocket createServerSocket(int port, int backlog) throws IOException {
-        return this.init(this.context.getServerSocketFactory().createServerSocket(port, backlog));
-    }
-
-    /** @deprecated  (2.2) use {@link FTPSServerSocketFactory#createServerSocket(int, int, InetAddress) instead} */
-    @Deprecated
-    public ServerSocket createServerSocket(int port, int backlog, InetAddress ifAddress) throws IOException {
-        return this.init(this.context.getServerSocketFactory().createServerSocket(port, backlog, ifAddress));
-    }
-        
-    /** @deprecated  (2.2) use {@link FTPSServerSocketFactory#init(ServerSocket)} */
-    @SuppressWarnings("unused")
-    @Deprecated
-    public ServerSocket init(ServerSocket socket) throws IOException {
-        ((SSLServerSocket) socket).setUseClientMode(true);
-        return socket;
-    }
 }