You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/05/31 22:58:40 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/startup HostConfig.java SimpleStartup.java Tomcat.java
costin 00/05/31 13:58:40
Modified: src/share/org/apache/tomcat/adapter HttpAdapter.java
src/share/org/apache/tomcat/core ContextManager.java
ServerConnector.java
src/share/org/apache/tomcat/service
JNIEndpointConnector.java PoolTcpConnector.java
PoolTcpEndpoint.java TcpConnection.java
src/share/org/apache/tomcat/service/connector
JNIConnectionHandler.java
src/share/org/apache/tomcat/startup HostConfig.java
SimpleStartup.java Tomcat.java
Removed: src/share/org/apache/tomcat/service SimpleTcpConnector.java
SimpleTcpEndpoint.java TcpEndpoint.java
TcpEndpointConnector.java
Log:
- removed SimpleEndpoint - I sent a proposal yesterday, nobody -1
- small change in ServerConnector - removed the dependency on ContextManager,
now we use setServer(Object) and the protocol adapter can use it. That will
allow to use the tcp code outside tomcat.
Revision Changes Path
1.3 +1 -0 jakarta-tomcat/src/share/org/apache/tomcat/adapter/HttpAdapter.java
Index: HttpAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/adapter/HttpAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpAdapter.java 2000/05/30 15:40:06 1.2
+++ HttpAdapter.java 2000/05/31 20:58:36 1.3
@@ -129,6 +129,7 @@
else
in.setInputStream( socket.getInputStream() );
sout= socket.getOutputStream();
+
this.socket = socket;
}
1.84 +2 -2 jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- ContextManager.java 2000/05/30 06:16:45 1.83
+++ ContextManager.java 2000/05/31 20:58:37 1.84
@@ -285,7 +285,7 @@
public void setDefaults() {
if(connectors.size()==0) {
if(debug>5) log("Setting default adapter");
- org.apache.tomcat.service.SimpleTcpConnector sc=new org.apache.tomcat.service.SimpleTcpConnector();
+ org.apache.tomcat.service.PoolTcpConnector sc=new org.apache.tomcat.service.PoolTcpConnector();
sc.setTcpConnectionHandler( new org.apache.tomcat.service.http.HttpConnectionHandler());
addServerConnector( sc );
}
@@ -505,7 +505,7 @@
*/
public synchronized void addServerConnector( ServerConnector con ) {
if(debug>0) log("Add connector javaClass=\"" + con.getClass().getName() + "\"");
- con.setContextManager( this );
+ con.setServer( this );
connectors.addElement( con );
}
1.3 +10 -5 jakarta-tomcat/src/share/org/apache/tomcat/core/ServerConnector.java
Index: ServerConnector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServerConnector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerConnector.java 2000/04/25 22:07:04 1.2
+++ ServerConnector.java 2000/05/31 20:58:37 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServerConnector.java,v 1.2 2000/04/25 22:07:04 costin Exp $
- * $Revision: 1.2 $
- * $Date: 2000/04/25 22:07:04 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ServerConnector.java,v 1.3 2000/05/31 20:58:37 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/05/31 20:58:37 $
*
* ====================================================================
*
@@ -95,7 +95,12 @@
*/
public void stop() throws Exception;
- /** Set the entry point to tomcat
+ /** Set the entry point to tomcat. This object will be used by the
+ * protocol implementation.
*/
- public void setContextManager( ContextManager cm );
+ public void setServer( Object cm );
+
+ /** Set a config property
+ */
+ public void setAttribute( String s, Object value );
}
1.2 +6 -6 jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpointConnector.java
Index: JNIEndpointConnector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpointConnector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JNIEndpointConnector.java 2000/02/09 12:00:53 1.1
+++ JNIEndpointConnector.java 2000/05/31 20:58:37 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpointConnector.java,v 1.1 2000/02/09 12:00:53 rubys Exp $
- * $Revision: 1.1 $
- * $Date: 2000/02/09 12:00:53 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/JNIEndpointConnector.java,v 1.2 2000/05/31 20:58:37 costin Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/05/31 20:58:37 $
*
* ====================================================================
*
@@ -85,7 +85,7 @@
static JNIEndpoint ep;
JNIConnectionHandler con = new JNIConnectionHandler();
- ContextManager cm;
+ Object cm;
String handlerNativeLib;
boolean running = true;
@@ -104,7 +104,7 @@
throw new Exception("Missing connector native library name");
}
- con.setContextManager(cm);
+ con.setServer(cm);
con.setNativeLibrary(handlerNativeLib);
ep.setConnectionHandler(con);
ep.startEndpoint();
@@ -114,7 +114,7 @@
ep.stopEndpoint();
}
- public void setContextManager(ContextManager ctx) {
+ public void setServer(Object ctx) {
this.cm=ctx;
}
1.5 +7 -12 jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpConnector.java
Index: PoolTcpConnector.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpConnector.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PoolTcpConnector.java 2000/05/26 17:32:14 1.4
+++ PoolTcpConnector.java 2000/05/31 20:58:37 1.5
@@ -1,8 +1,4 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpConnector.java,v 1.4 2000/05/26 17:32:14 costin Exp $
- * $Revision: 1.4 $
- * $Date: 2000/05/26 17:32:14 $
- *
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -89,7 +85,7 @@
* @author costin@eng.sun.com
* @author Gal Shachor [shachor@il.ibm.com]
*/
-public class PoolTcpConnector extends TcpEndpointConnector implements ServerConnector {
+public class PoolTcpConnector implements ServerConnector {
// Attributes we accept ( to support the old model of
// configuration, will be deprecated )
public static final String VHOST_PORT="vhost_port";
@@ -122,7 +118,7 @@
TcpConnectionHandler con;
Hashtable attributes = new Hashtable();
- ContextManager cm;
+ Object cm;
private InetAddress address;
private int port;
@@ -133,8 +129,6 @@
private int maxSpareThreads = -1;
private int minSpareThreads = -1;
- int vport;
-
private ServerSocketFactory socketFactory;
private ServerSocket serverSocket;
@@ -158,7 +152,7 @@
Object v=attributes.get( key );
con.setAttribute( key, v );
}
-
+
ep.setPort(port);
ep.setAddress( address );
ep.setPoolOn(usePools);
@@ -190,7 +184,7 @@
ep.stopEndpoint();
}
- public void setContextManager( ContextManager ctx ) {
+ public void setServer( Object ctx ) {
this.cm=ctx;
}
@@ -207,7 +201,7 @@
}
public void setPort( String portS ) {
- this.port=string2Int( portS );
+ this.port=string2Int( portS );
}
public int getPort() {
@@ -249,7 +243,8 @@
if(VHOST_NAME.equals(prop) ) {
//vhost=(String)value;
} else if(VHOST_PORT.equals(prop) ) {
- vport=((Integer)value).intValue();
+ System.out.println("Setting port to " + port );
+ port=((Integer)value).intValue();
} else if(VHOST_ADDRESS.equals(prop)) {
address=(InetAddress)value;
} else if(SERVER.equals(prop)) {
1.6 +4 -4 jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java
Index: PoolTcpEndpoint.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PoolTcpEndpoint.java 2000/05/30 06:16:48 1.5
+++ PoolTcpEndpoint.java 2000/05/31 20:58:37 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java,v 1.5 2000/05/30 06:16:48 costin Exp $
- * $Revision: 1.5 $
- * $Date: 2000/05/30 06:16:48 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/PoolTcpEndpoint.java,v 1.6 2000/05/31 20:58:37 costin Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/05/31 20:58:37 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* @author Costin@eng.sun.com
* @author Gal Shachor [shachor@il.ibm.com]
*/
-public class PoolTcpEndpoint extends TcpEndpoint { // implements Endpoint {
+public class PoolTcpEndpoint { // implements Endpoint {
private StringManager sm = StringManager.getManager("org.apache.tomcat.service");
1.3 +6 -6 jakarta-tomcat/src/share/org/apache/tomcat/service/TcpConnection.java
Index: TcpConnection.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/TcpConnection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TcpConnection.java 2000/02/17 10:37:41 1.2
+++ TcpConnection.java 2000/05/31 20:58:38 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/TcpConnection.java,v 1.2 2000/02/17 10:37:41 shachor Exp $
- * $Revision: 1.2 $
- * $Date: 2000/02/17 10:37:41 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/TcpConnection.java,v 1.3 2000/05/31 20:58:38 costin Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/05/31 20:58:38 $
*
* ====================================================================
*
@@ -80,14 +80,14 @@
// -------------------- Properties --------------------
- TcpEndpoint endpoint;
+ PoolTcpEndpoint endpoint;
Socket socket;
- public void setEndpoint(TcpEndpoint endpoint) {
+ public void setEndpoint(PoolTcpEndpoint endpoint) {
this.endpoint = endpoint;
}
- public TcpEndpoint getEndpoint() {
+ public PoolTcpEndpoint getEndpoint() {
return endpoint;
}
1.8 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java
Index: JNIConnectionHandler.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JNIConnectionHandler.java 2000/05/23 21:39:52 1.7
+++ JNIConnectionHandler.java 2000/05/31 20:58:39 1.8
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java,v 1.7 2000/05/23 21:39:52 costin Exp $
- * $Revision: 1.7 $
- * $Date: 2000/05/23 21:39:52 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/service/connector/JNIConnectionHandler.java,v 1.8 2000/05/31 20:58:39 costin Exp $
+ * $Revision: 1.8 $
+ * $Date: 2000/05/31 20:58:39 $
*
* ====================================================================
*
@@ -77,8 +77,8 @@
public JNIConnectionHandler() {
}
- public void setContextManager(ContextManager contextM) {
- this.contextM=contextM;
+ public void setServer(Object contextM) {
+ this.contextM=(ContextManager)contextM;
}
public void setNativeLibrary(String lib) {
1.2 +0 -4 jakarta-tomcat/src/share/org/apache/tomcat/startup/HostConfig.java
Index: HostConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/HostConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HostConfig.java 2000/05/26 18:55:30 1.1
+++ HostConfig.java 2000/05/31 20:58:39 1.2
@@ -12,10 +12,6 @@
import org.apache.tomcat.core.*;
import org.xml.sax.*;
-// Used to stop tomcat
-import org.apache.tomcat.service.TcpEndpointConnector;
-import org.apache.tomcat.service.connector.Ajp12ConnectionHandler;
-
/** Used by Tomcat.java, need to be public for Reflection in JDK11
*/
public class HostConfig {
1.2 +0 -2 jakarta-tomcat/src/share/org/apache/tomcat/startup/SimpleStartup.java
Index: SimpleStartup.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/SimpleStartup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleStartup.java 2000/02/11 00:34:44 1.1
+++ SimpleStartup.java 2000/05/31 20:58:39 1.2
@@ -12,8 +12,6 @@
import org.apache.tomcat.core.*;
// Used to stop tomcat
-import org.apache.tomcat.service.TcpEndpointConnector;
-import org.apache.tomcat.service.connector.Ajp12ConnectionHandler;
/**
* Simple starter for Tomcat.
1.25 +3 -3 jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java
Index: Tomcat.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Tomcat.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Tomcat.java 2000/05/26 18:55:30 1.24
+++ Tomcat.java 2000/05/31 20:58:39 1.25
@@ -13,7 +13,7 @@
import org.xml.sax.*;
// Used to stop tomcat
-import org.apache.tomcat.service.TcpEndpointConnector;
+import org.apache.tomcat.service.PoolTcpConnector;
import org.apache.tomcat.service.connector.Ajp12ConnectionHandler;
/**
@@ -256,8 +256,8 @@
Enumeration enum=cm.getConnectors();
while( enum.hasMoreElements() ) {
Object con=enum.nextElement();
- if( con instanceof TcpEndpointConnector ) {
- TcpEndpointConnector tcpCon=(TcpEndpointConnector) con;
+ if( con instanceof PoolTcpConnector ) {
+ PoolTcpConnector tcpCon=(PoolTcpConnector) con;
if( tcpCon.getTcpConnectionHandler() instanceof Ajp12ConnectionHandler ) {
portInt=tcpCon.getPort();
}