You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/10/17 04:33:46 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Catalina.java
craigmcc 01/10/16 19:33:46
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
DefaultServerSocketFactory.java
SSLServerSocketFactory.java
ServerSocketFactory.java
catalina/src/share/org/apache/catalina/startup Catalina.java
Log:
Refactor org.apache.catalina.net.ServerSocketFactory to become
org.apache.catalina.ServerSocketFactory instead. The old interface is
deprecated and extends the new one.
Revision Changes Path
1.11 +4 -7 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Connector.java 2001/08/23 22:32:10 1.10
+++ Connector.java 2001/10/17 02:33:45 1.11
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Connector.java,v 1.10 2001/08/23 22:32:10 craigmcc Exp $
- * $Revision: 1.10 $
- * $Date: 2001/08/23 22:32:10 $
+ * $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 $
*
* ====================================================================
*
@@ -65,9 +65,6 @@
package org.apache.catalina;
-import org.apache.catalina.net.ServerSocketFactory;
-
-
/**
* A <b>Connector</b> is a component responsible receiving requests from,
* and returning responses to, a client application. A Connector performs
@@ -117,7 +114,7 @@
* normative.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.10 $ $Date: 2001/08/23 22:32:10 $
+ * @version $Revision: 1.11 $ $Date: 2001/10/17 02:33:45 $
*/
public interface Connector {
1.26 +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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- HttpConnector.java 2001/10/06 19:50:58 1.25
+++ HttpConnector.java 2001/10/17 02:33:45 1.26
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v 1.25 2001/10/06 19:50:58 ccain Exp $
- * $Revision: 1.25 $
- * $Date: 2001/10/06 19:50:58 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v 1.26 2001/10/17 02:33:45 craigmcc Exp $
+ * $Revision: 1.26 $
+ * $Date: 2001/10/17 02:33:45 $
*
* ====================================================================
*
@@ -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.25 $ $Date: 2001/10/06 19:50:58 $
+ * @version $Revision: 1.26 $ $Date: 2001/10/17 02:33:45 $
*/
1.14 +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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- HttpConnector.java 2001/10/06 19:50:58 1.13
+++ HttpConnector.java 2001/10/17 02:33:45 1.14
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v 1.13 2001/10/06 19:50:58 ccain Exp $
- * $Revision: 1.13 $
- * $Date: 2001/10/06 19:50:58 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v 1.14 2001/10/17 02:33:45 craigmcc Exp $
+ * $Revision: 1.14 $
+ * $Date: 2001/10/17 02:33:45 $
*
* ====================================================================
*
@@ -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.13 $ $Date: 2001/10/06 19:50:58 $
+ * @version $Revision: 1.14 $ $Date: 2001/10/17 02:33:45 $
*/
1.19 +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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- WarpConnector.java 2001/10/12 22:52:40 1.18
+++ WarpConnector.java 2001/10/17 02:33:45 1.19
@@ -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.5 +5 -3 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/DefaultServerSocketFactory.java
Index: DefaultServerSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/DefaultServerSocketFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultServerSocketFactory.java 2001/10/06 19:50:58 1.4
+++ DefaultServerSocketFactory.java 2001/10/17 02:33:46 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/DefaultServerSocketFactory.java,v 1.4 2001/10/06 19:50:58 ccain Exp $
- * $Revision: 1.4 $
- * $Date: 2001/10/06 19:50:58 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/DefaultServerSocketFactory.java,v 1.5 2001/10/17 02:33:46 craigmcc Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/10/17 02:33:46 $
*
* ====================================================================
*
@@ -73,6 +73,8 @@
import java.security.UnrecoverableKeyException;
import java.security.KeyManagementException;
import java.security.cert.CertificateException;
+import org.apache.catalina.ServerSocketFactory;
+
/**
* Default server socket factory, which returns unadorned server sockts.
1.9 +1 -1 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/SSLServerSocketFactory.java
Index: SSLServerSocketFactory.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/net/SSLServerSocketFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SSLServerSocketFactory.java 2001/10/07 02:28:54 1.8
+++ SSLServerSocketFactory.java 2001/10/17 02:33:46 1.9
@@ -110,7 +110,7 @@
*/
public class SSLServerSocketFactory
- implements org.apache.catalina.net.ServerSocketFactory {
+ implements org.apache.catalina.ServerSocketFactory {
// ----------------------------------------------------- Instance Variables
1.5 +5 -82 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServerSocketFactory.java 2001/10/06 19:50:58 1.4
+++ ServerSocketFactory.java 2001/10/17 02:33:46 1.5
@@ -80,90 +80,13 @@
* @author db@eng.sun.com
* @author Harish Prabandham
* @author Craig R. McClanahan
+ *
+ * @deprecated Use {@link org.apache.catalina.ServerSocketFactory}
+ * directly instead.
*/
-public interface ServerSocketFactory {
+public interface ServerSocketFactory
+ extends org.apache.catalina.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;
}
1.35 +5 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java
Index: Catalina.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Catalina.java 2001/10/17 00:44:02 1.34
+++ Catalina.java 2001/10/17 02:33:46 1.35
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.34 2001/10/17 00:44:02 craigmcc Exp $
- * $Revision: 1.34 $
- * $Date: 2001/10/17 00:44:02 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/Catalina.java,v 1.35 2001/10/17 02:33:46 craigmcc Exp $
+ * $Revision: 1.35 $
+ * $Date: 2001/10/17 02:33:46 $
*
* ====================================================================
*
@@ -97,7 +97,7 @@
* </u>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.34 $ $Date: 2001/10/17 00:44:02 $
+ * @version $Revision: 1.35 $ $Date: 2001/10/17 02:33:46 $
*/
public class Catalina {
@@ -328,7 +328,7 @@
digester.addSetProperties("Server/Service/Connector/Factory");
digester.addSetNext("Server/Service/Connector/Factory",
"setFactory",
- "org.apache.catalina.net.ServerSocketFactory");
+ "org.apache.catalina.ServerSocketFactory");
digester.addObjectCreate("Server/Service/Connector/Listener",
null, // MUST be specified in the element
Re: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup Catalina.java
Posted by Remy Maucherat <rm...@home.com>.
> craigmcc 01/10/16 19:33:46
>
> 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
> DefaultServerSocketFactory.java
> SSLServerSocketFactory.java
> ServerSocketFactory.java
> catalina/src/share/org/apache/catalina/startup
Catalina.java
> Log:
> Refactor org.apache.catalina.net.ServerSocketFactory to become
> org.apache.catalina.ServerSocketFactory instead. The old interface is
> deprecated and extends the new one.
You did forget to commit the new interface, apparently.
Remy