I think the issue of compatibility for Net 2.1 should have been discussed - but I'm surprised you arbitrarily decided to revert Rory's changes and restore compatibility without any discussion of that first. IMO its OK to dive into a component and make build/site fixes/improvements or minor code fixes - but if you're not an established Commons Net dev - then making functional/API changes without any discussion seems wrong to me.
Niall On Tue, Mar 23, 2010 at 8:20 PM, <s...@apache.org> wrote: > Author: sebb > Date: Tue Mar 23 20:20:41 2010 > New Revision: 926765 > > URL: http://svn.apache.org/viewvc?rev=926765&view=rev > Log: > Restore backward compatibility (lost in r740961) > > Modified: > > commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java > > Modified: > commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java > URL: > http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java?rev=926765&r1=926764&r2=926765&view=diff > ============================================================================== > --- > commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java > (original) > +++ > commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java > Tue Mar 23 20:20:41 2010 > @@ -19,11 +19,13 @@ package org.apache.commons.net.ftp; > > import java.io.IOException; > import java.net.InetAddress; > +import java.net.ServerSocket; > import java.net.Socket; > import java.net.UnknownHostException; > > import javax.net.SocketFactory; > import javax.net.ssl.SSLContext; > +import javax.net.ssl.SSLServerSocket; > > /** > * > @@ -58,4 +60,29 @@ 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 use {...@link > FTPSServerSocketFactory#createServerSocket(int) instead} */ > + �...@deprecated > + public ServerSocket createServerSocket(int port) throws IOException { > + return > this.init(this.context.getServerSocketFactory().createServerSocket(port)); > + } > + > + /** @deprecated 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 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 use {...@link > FTPSServerSocketFactory#init(ServerSocket)} */ > + �...@deprecated > + public ServerSocket init(ServerSocket socket) throws IOException { > + ((SSLServerSocket) socket).setUseClientMode(true); > + return socket; > + } > } > > > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org
