You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2001/12/20 22:25:23 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net ServerSocketFactory.java
remm 01/12/20 13:25:23
Modified: catalina/src/share/org/apache/catalina Connector.java
catalina/src/share/org/apache/catalina/connector/http
HttpConnector.java
catalina/src/share/org/apache/catalina/connector/http10
HttpConnector.java
catalina/src/share/org/apache/catalina/connector/warp
WarpConnector.java
catalina/src/share/org/apache/catalina/net
ServerSocketFactory.java
Removed: catalina/src/share/org/apache/catalina
ServerSocketFactory.java
Log:
- Move back the ServerSocketFactory to the o.a.c.net package, to preserve
compatibility between connectors for Tomcat 4.0 and Tomcat 4.1.
Revision Changes Path
1.12 +5 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Connector.java
Index: Connector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Connector.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Connector.java 2001/10/17 02:33:45 1.11
+++ Connector.java 2001/12/20 21:25:23 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Connector.java,v 1.11 2001/10/17 02:33:45 craigmcc Exp $
- * $Revision: 1.11 $
- * $Date: 2001/10/17 02:33:45 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Connector.java,v 1.12 2001/12/20 21:25:23 remm Exp $
+ * $Revision: 1.12 $
+ * $Date: 2001/12/20 21:25:23 $
*
* ====================================================================
*
@@ -64,6 +64,7 @@
package org.apache.catalina;
+import org.apache.catalina.net.ServerSocketFactory;
/**
* A <b>Connector</b> is a component responsible receiving requests from,
@@ -114,7 +115,7 @@
* normative.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.11 $ $Date: 2001/10/17 02:33:45 $
+ * @version $Revision: 1.12 $ $Date: 2001/12/20 21:25:23 $
*/
public interface Connector {
1.29 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java
Index: HttpConnector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- HttpConnector.java 2001/11/09 19:38:43 1.28
+++ HttpConnector.java 2001/12/20 21:25:23 1.29
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v 1.28 2001/11/09 19:38:43 remm Exp $
- * $Revision: 1.28 $
- * $Date: 2001/11/09 19:38:43 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v 1.29 2001/12/20 21:25:23 remm Exp $
+ * $Revision: 1.29 $
+ * $Date: 2001/12/20 21:25:23 $
*
* ====================================================================
*
@@ -90,9 +90,9 @@
import org.apache.catalina.Logger;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
-import org.apache.catalina.ServerSocketFactory;
import org.apache.catalina.Service;
import org.apache.catalina.net.DefaultServerSocketFactory;
+import org.apache.catalina.net.ServerSocketFactory;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -102,7 +102,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.28 $ $Date: 2001/11/09 19:38:43 $
+ * @version $Revision: 1.29 $ $Date: 2001/12/20 21:25:23 $
*/
1.16 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java
Index: HttpConnector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- HttpConnector.java 2001/11/09 19:38:44 1.15
+++ HttpConnector.java 2001/12/20 21:25:23 1.16
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v 1.15 2001/11/09 19:38:44 remm Exp $
- * $Revision: 1.15 $
- * $Date: 2001/11/09 19:38:44 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v 1.16 2001/12/20 21:25:23 remm Exp $
+ * $Revision: 1.16 $
+ * $Date: 2001/12/20 21:25:23 $
*
* ====================================================================
*
@@ -88,9 +88,9 @@
import org.apache.catalina.Logger;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
-import org.apache.catalina.ServerSocketFactory;
import org.apache.catalina.Service;
import org.apache.catalina.net.DefaultServerSocketFactory;
+import org.apache.catalina.net.ServerSocketFactory;
import org.apache.catalina.util.LifecycleSupport;
import org.apache.catalina.util.StringManager;
@@ -100,7 +100,7 @@
* purposes. Not intended to be the final solution.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.15 $ $Date: 2001/11/09 19:38:44 $
+ * @version $Revision: 1.16 $ $Date: 2001/12/20 21:25:23 $
*/
1.22 +1 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnector.java
Index: WarpConnector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/warp/WarpConnector.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- WarpConnector.java 2001/11/09 19:38:44 1.21
+++ WarpConnector.java 2001/12/20 21:25:23 1.22
@@ -73,9 +73,9 @@
import org.apache.catalina.Logger;
import org.apache.catalina.Request;
import org.apache.catalina.Response;
-import org.apache.catalina.ServerSocketFactory;
import org.apache.catalina.Service;
import org.apache.catalina.net.DefaultServerSocketFactory;
+import org.apache.catalina.net.ServerSocketFactory;
import org.apache.catalina.util.LifecycleSupport;
import java.security.KeyStoreException;
1.6 +83 -6 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/ServerSocketFactory.java
Index: ServerSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/ServerSocketFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServerSocketFactory.java 2001/10/17 02:33:46 1.5
+++ ServerSocketFactory.java 2001/12/20 21:25:23 1.6
@@ -73,20 +73,97 @@
/**
* Interface that describes the common characteristics of factory classes
- * that create server sockets required by a Connector. A concreate
+ * that create server sockets which may be required by a Connector. A concrete
* implementation of this interface will be assigned to a Connector
* via the <code>setFactory()</code> method.
*
* @author db@eng.sun.com
* @author Harish Prabandham
* @author Craig R. McClanahan
- *
- * @deprecated Use {@link org.apache.catalina.ServerSocketFactory}
- * directly instead.
*/
-public interface ServerSocketFactory
- extends org.apache.catalina.ServerSocketFactory {
+public interface ServerSocketFactory {
+
+
+ // --------------------------------------------------------- Public Methods
+
+
+ /**
+ * Returns a server socket which uses all network interfaces on
+ * the host, and is bound to a the specified port. The socket is
+ * configured with the socket options (such as accept timeout)
+ * given to this factory.
+ *
+ * @param port the port to listen to
+ *
+ * @exception IOException input/output or network error
+ * @exception KeyStoreException error instantiating the
+ * KeyStore from file (SSL only)
+ * @exception NoSuchAlgorithmException KeyStore algorithm unsupported
+ * by current provider (SSL only)
+ * @exception CertificateException general certificate error (SSL only)
+ * @exception UnrecoverableKeyException internal KeyStore problem with
+ * the certificate (SSL only)
+ * @exception KeyManagementException problem in the key management
+ * layer (SSL only)
+ */
+ public ServerSocket createSocket (int port)
+ throws IOException, KeyStoreException, NoSuchAlgorithmException,
+ CertificateException, UnrecoverableKeyException,
+ KeyManagementException;
+
+
+ /**
+ * Returns a server socket which uses all network interfaces on
+ * the host, is bound to a the specified port, and uses the
+ * specified connection backlog. The socket is configured with
+ * the socket options (such as accept timeout) given to this factory.
+ *
+ * @param port the port to listen to
+ * @param backlog how many connections are queued
+ *
+ * @exception IOException input/output or network error
+ * @exception KeyStoreException error instantiating the
+ * KeyStore from file (SSL only)
+ * @exception NoSuchAlgorithmException KeyStore algorithm unsupported
+ * by current provider (SSL only)
+ * @exception CertificateException general certificate error (SSL only)
+ * @exception UnrecoverableKeyException internal KeyStore problem with
+ * the certificate (SSL only)
+ * @exception KeyManagementException problem in the key management
+ * layer (SSL only)
+ */
+ public ServerSocket createSocket (int port, int backlog)
+ throws IOException, KeyStoreException, NoSuchAlgorithmException,
+ CertificateException, UnrecoverableKeyException,
+ KeyManagementException;
+
+ /**
+ * Returns a server socket which uses only the specified network
+ * interface on the local host, is bound to a the specified port,
+ * and uses the specified connection backlog. The socket is configured
+ * with the socket options (such as accept timeout) given to this factory.
+ *
+ * @param port the port to listen to
+ * @param backlog how many connections are queued
+ * @param ifAddress the network interface address to use
+ *
+ * @exception IOException input/output or network error
+ * @exception KeyStoreException error instantiating the
+ * KeyStore from file (SSL only)
+ * @exception NoSuchAlgorithmException KeyStore algorithm unsupported
+ * by current provider (SSL only)
+ * @exception CertificateException general certificate error (SSL only)
+ * @exception UnrecoverableKeyException internal KeyStore problem with
+ * the certificate (SSL only)
+ * @exception KeyManagementException problem in the key management
+ * layer (SSL only)
+ */
+ public ServerSocket createSocket (int port, int backlog,
+ InetAddress ifAddress)
+ throws IOException, KeyStoreException, NoSuchAlgorithmException,
+ CertificateException, UnrecoverableKeyException,
+ KeyManagementException;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>