You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2007/08/14 19:32:04 UTC
svn commit: r565862 - in /incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver: ./ interfaces/ listener/ listener/io/ listener/mina/ ssl/

Author: ngn
Date: Tue Aug 14 12:32:02 2007
New Revision: 565862

URL: http://svn.apache.org/viewvc?view=rev&rev=565862
Log:
Moved the Ssl interface into a ssl package

Added:
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/ClientAuth.java
      - copied, changed from r564538, incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ClientAuth.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/Ssl.java
      - copied, changed from r564538, incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/Ssl.java
Removed:
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ClientAuth.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/Ssl.java
Modified:
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultDataConnectionConfig.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/IODataConnectionFactory.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/DataConnectionConfig.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/SocketFactory.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/AbstractListener.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/Listener.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOConnection.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOListener.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaConnection.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaListener.java
    incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/DefaultSsl.java

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultDataConnectionConfig.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultDataConnectionConfig.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultDataConnectionConfig.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/DefaultDataConnectionConfig.java Tue Aug 14 12:32:02 2007
@@ -23,7 +23,7 @@
 import java.net.UnknownHostException;
 
 import org.apache.ftpserver.interfaces.DataConnectionConfig;
-import org.apache.ftpserver.interfaces.Ssl;
+import org.apache.ftpserver.ssl.Ssl;
 
 /**
  * Data connection configuration.

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/IODataConnectionFactory.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/IODataConnectionFactory.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/IODataConnectionFactory.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/IODataConnectionFactory.java Tue Aug 14 12:32:02 2007
@@ -34,10 +34,10 @@
 
 import org.apache.ftpserver.ftplet.DataConnection;
 import org.apache.ftpserver.ftplet.FtpException;
-import org.apache.ftpserver.interfaces.ClientAuth;
 import org.apache.ftpserver.interfaces.DataConnectionConfig;
 import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.Ssl;
+import org.apache.ftpserver.ssl.ClientAuth;
+import org.apache.ftpserver.ssl.Ssl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/DataConnectionConfig.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/DataConnectionConfig.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/DataConnectionConfig.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/DataConnectionConfig.java Tue Aug 14 12:32:02 2007
@@ -21,6 +21,8 @@
 
 import java.net.InetAddress;
 
+import org.apache.ftpserver.ssl.Ssl;
+
 /**
  * Data connection configuration interface.
  */

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/SocketFactory.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/SocketFactory.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/SocketFactory.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/SocketFactory.java Tue Aug 14 12:32:02 2007
@@ -22,6 +22,8 @@
 import java.net.InetAddress;
 import java.net.ServerSocket;
 
+import org.apache.ftpserver.ssl.Ssl;
+
 
 /**
  * This interface is responsible to create appropriate server socket.

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/AbstractListener.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/AbstractListener.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/AbstractListener.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/AbstractListener.java Tue Aug 14 12:32:02 2007
@@ -23,7 +23,7 @@
 
 import org.apache.ftpserver.DefaultDataConnectionConfig;
 import org.apache.ftpserver.interfaces.DataConnectionConfig;
-import org.apache.ftpserver.interfaces.Ssl;
+import org.apache.ftpserver.ssl.Ssl;
 
 
 /**

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/Listener.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/Listener.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/Listener.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/Listener.java Tue Aug 14 12:32:02 2007
@@ -21,7 +21,7 @@
 
 import org.apache.ftpserver.interfaces.DataConnectionConfig;
 import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.Ssl;
+import org.apache.ftpserver.ssl.Ssl;
 
 
 /**

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOConnection.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOConnection.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOConnection.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOConnection.java Tue Aug 14 12:32:02 2007
@@ -36,13 +36,13 @@
 import org.apache.ftpserver.FtpSessionImpl;
 import org.apache.ftpserver.FtpWriter;
 import org.apache.ftpserver.ftplet.FtpException;
-import org.apache.ftpserver.interfaces.ClientAuth;
 import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.FtpServerSession;
-import org.apache.ftpserver.interfaces.Ssl;
 import org.apache.ftpserver.listener.AbstractConnection;
 import org.apache.ftpserver.listener.ConnectionObserver;
 import org.apache.ftpserver.listener.FtpProtocolHandler;
+import org.apache.ftpserver.ssl.ClientAuth;
+import org.apache.ftpserver.ssl.Ssl;
 import org.apache.ftpserver.util.IoUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOListener.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOListener.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOListener.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/io/IOListener.java Tue Aug 14 12:32:02 2007
@@ -28,13 +28,13 @@
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
 
-import org.apache.ftpserver.interfaces.ClientAuth;
 import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.Ssl;
 import org.apache.ftpserver.listener.AbstractListener;
 import org.apache.ftpserver.listener.Connection;
 import org.apache.ftpserver.listener.ConnectionManager;
 import org.apache.ftpserver.listener.Listener;
+import org.apache.ftpserver.ssl.ClientAuth;
+import org.apache.ftpserver.ssl.Ssl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaConnection.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaConnection.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaConnection.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaConnection.java Tue Aug 14 12:32:02 2007
@@ -28,12 +28,12 @@
 import org.apache.ftpserver.IODataConnectionFactory;
 import org.apache.ftpserver.FtpSessionImpl;
 import org.apache.ftpserver.ftplet.FtpException;
-import org.apache.ftpserver.interfaces.ClientAuth;
 import org.apache.ftpserver.interfaces.FtpServerContext;
 import org.apache.ftpserver.interfaces.FtpServerSession;
-import org.apache.ftpserver.interfaces.Ssl;
 import org.apache.ftpserver.listener.AbstractConnection;
 import org.apache.ftpserver.listener.ConnectionObserver;
+import org.apache.ftpserver.ssl.ClientAuth;
+import org.apache.ftpserver.ssl.Ssl;
 import org.apache.mina.common.IoSession;
 import org.apache.mina.filter.SSLFilter;
 

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaListener.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaListener.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaListener.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/listener/mina/MinaListener.java Tue Aug 14 12:32:02 2007
@@ -22,12 +22,12 @@
 import java.io.IOException;
 import java.net.InetSocketAddress;
 
-import org.apache.ftpserver.interfaces.ClientAuth;
 import org.apache.ftpserver.interfaces.FtpServerContext;
-import org.apache.ftpserver.interfaces.Ssl;
 import org.apache.ftpserver.listener.AbstractListener;
 import org.apache.ftpserver.listener.FtpProtocolHandler;
 import org.apache.ftpserver.listener.Listener;
+import org.apache.ftpserver.ssl.ClientAuth;
+import org.apache.ftpserver.ssl.Ssl;
 import org.apache.mina.common.DefaultIoFilterChainBuilder;
 import org.apache.mina.common.IoAcceptor;
 import org.apache.mina.common.ThreadModel;

Copied: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/ClientAuth.java (from r564538, incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ClientAuth.java)
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/ClientAuth.java?view=diff&rev=565862&p1=incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ClientAuth.java&r1=564538&p2=incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/ClientAuth.java&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/ClientAuth.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/ClientAuth.java Tue Aug 14 12:32:02 2007
@@ -1,4 +1,4 @@
-package org.apache.ftpserver.interfaces;
+package org.apache.ftpserver.ssl;
 
 public class ClientAuth {
     public static final ClientAuth NEED = new ClientAuth("Need");

Modified: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/DefaultSsl.java
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/DefaultSsl.java?view=diff&rev=565862&r1=565861&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/DefaultSsl.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/DefaultSsl.java Tue Aug 14 12:32:02 2007
@@ -30,8 +30,6 @@
 import javax.net.ssl.TrustManagerFactory;
 
 import org.apache.ftpserver.FtpServerConfigurationException;
-import org.apache.ftpserver.interfaces.ClientAuth;
-import org.apache.ftpserver.interfaces.Ssl;
 import org.apache.ftpserver.util.IoUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Copied: incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/Ssl.java (from r564538, incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/Ssl.java)
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/Ssl.java?view=diff&rev=565862&p1=incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/Ssl.java&r1=564538&p2=incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/Ssl.java&r2=565862
==============================================================================
--- incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/interfaces/Ssl.java (original)
+++ incubator/ftpserver/trunk/core/src/java/org/apache/ftpserver/ssl/Ssl.java Tue Aug 14 12:32:02 2007
@@ -17,11 +17,12 @@
  * under the License.
  */  
 
-package org.apache.ftpserver.interfaces;
+package org.apache.ftpserver.ssl;
 
 import java.security.GeneralSecurityException;
 
 import javax.net.ssl.SSLContext;
+
 
 /**
  * SSL interface.