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/09/17 09:16:51 UTC
cvs commit: jakarta-tomcat/src/etc server.xml server2.xml
costin 00/09/17 00:16:51
Modified: src/etc server.xml server2.xml
Log:
Replaced <connector> with <interceptor> in config files.
<connector> should still work ( except for shutdown using the Ajp12 message,
that means the new ajp12 must be used. We can easily back off if the
interceptors will fail )
Revision Changes Path
1.43 +17 -35 jakarta-tomcat/src/etc/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- server.xml 2000/09/13 01:57:03 1.42
+++ server.xml 2000/09/17 07:16:51 1.43
@@ -102,18 +102,6 @@
ContextInterceptor className="org.apache.tomcat.context.LogEvents"
-->
- <!-- new http adapter. Attributes:
- secure - use SSL ( https )
- keystore, keypass - certs for SSL
- port
- XXX not finished, more attributes will come to match the current
- functionality
- -->
- <ContextInterceptor className="org.apache.tomcat.service.http.HttpInterceptor"
- port="8081"
- secure="false"
- />
-
<ContextInterceptor className="org.apache.tomcat.context.AutoSetup" />
<ContextInterceptor
@@ -225,13 +213,14 @@
<!-- ==================== Connectors ==================== -->
+ <!-- new http adapter. Attributes:
+ secure - use SSL ( https )
+ keystore, keypass - certs for SSL
+ port -->
<!-- Normal HTTP -->
- <Connector className="org.apache.tomcat.service.PoolTcpConnector">
- <Parameter name="handler"
- value="org.apache.tomcat.service.http.HttpConnectionHandler"/>
- <Parameter name="port"
- value="8080"/>
- </Connector>
+ <RequestInterceptor
+ className="org.apache.tomcat.modules.server.HttpInterceptor"
+ port="8080" />
<!--
Uncomment this for SSL support.
@@ -250,33 +239,26 @@
to change the default ( user.home/.keystore with changeit )
-->
<!--
- <Connector className="org.apache.tomcat.service.PoolTcpConnector">
- <Parameter name="handler"
- value="org.apache.tomcat.service.http.HttpConnectionHandler"/>
- <Parameter name="port"
- value="8443"/>
- <Parameter name="socketFactory"
- value="org.apache.tomcat.util.net.SSLSocketFactory" />
- </Connector>
+ <RequestInterceptor
+ className="org.apache.tomcat.modules.server.HttpInterceptor"
+ port="8443"
+ secure="true" />
-->
<!--
JNI connector, make sure that you update the native_lib
Parameter to point to your jni_connect.dll.
-->
<!--
- <Connector className="org.apache.tomcat.service.JNIEndpointConnector">
- <Parameter name="native_lib"
- value="D:\tomcat\bin\i386\jni_connect.dll"/>
- </Connector>
+ <RequestInterceptor
+ className="org.apache.tomcat.modules.server.JNIConnectionHandler"
+ nativeLibrary="D:\tomcat\bin\i386\jni_connect.dll" />
-->
<!-- Apache AJP12 support. This is also used to shut down tomcat.
-->
- <Connector className="org.apache.tomcat.service.PoolTcpConnector">
- <Parameter name="handler"
- value="org.apache.tomcat.service.connector.Ajp12ConnectionHandler"/>
- <Parameter name="port" value="8007"/>
- </Connector>
+ <RequestInterceptor
+ className="org.apache.tomcat.modules.server.Ajp12ConnectionHandler"
+ port="8007" />
<!-- ==================== Special webapps ==================== -->
<!-- You don't need this if you place your app in webapps/
1.8 +17 -35 jakarta-tomcat/src/etc/server2.xml
Index: server2.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/server2.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- server2.xml 2000/09/13 01:57:03 1.7
+++ server2.xml 2000/09/17 07:16:51 1.8
@@ -102,18 +102,6 @@
ContextInterceptor className="org.apache.tomcat.context.LogEvents"
-->
- <!-- new http adapter. Attributes:
- secure - use SSL ( https )
- keystore, keypass - certs for SSL
- port
- XXX not finished, more attributes will come to match the current
- functionality
- -->
- <ContextInterceptor className="org.apache.tomcat.service.http.HttpInterceptor"
- port="8081"
- secure="false"
- />
-
<ContextInterceptor className="org.apache.tomcat.context.AutoSetup" />
<ContextInterceptor
@@ -224,13 +212,14 @@
<!-- ==================== Connectors ==================== -->
+ <!-- new http adapter. Attributes:
+ secure - use SSL ( https )
+ keystore, keypass - certs for SSL
+ port -->
<!-- Normal HTTP -->
- <Connector className="org.apache.tomcat.service.PoolTcpConnector">
- <Parameter name="handler"
- value="org.apache.tomcat.service.http.HttpConnectionHandler"/>
- <Parameter name="port"
- value="8080"/>
- </Connector>
+ <RequestInterceptor
+ className="org.apache.tomcat.modules.server.HttpInterceptor"
+ port="8080" />
<!--
Uncomment this for SSL support.
@@ -249,33 +238,26 @@
to change the default ( user.home/.keystore with changeit )
-->
<!--
- <Connector className="org.apache.tomcat.service.PoolTcpConnector">
- <Parameter name="handler"
- value="org.apache.tomcat.service.http.HttpConnectionHandler"/>
- <Parameter name="port"
- value="8443"/>
- <Parameter name="socketFactory"
- value="org.apache.tomcat.util.net.SSLSocketFactory" />
- </Connector>
+ <RequestInterceptor
+ className="org.apache.tomcat.modules.server.HttpInterceptor"
+ port="8443"
+ secure="true" />
-->
<!-- Apache AJP12 support. This is also used to shut down tomcat.
-->
- <Connector className="org.apache.tomcat.service.PoolTcpConnector">
- <Parameter name="handler"
- value="org.apache.tomcat.service.connector.Ajp12ConnectionHandler"/>
- <Parameter name="port" value="8007"/>
- </Connector>
+ <RequestInterceptor
+ className="org.apache.tomcat.modules.server.Ajp12ConnectionHandler"
+ port="8007" />
<!--
JNI connector, make sure that you update the native_lib
Parameter to point to your jni_connect.dll.
-->
<!--
- <Connector className="org.apache.tomcat.service.JNIEndpointConnector">
- <Parameter name="native_lib"
- value="D:\tomcat\bin\i386\jni_connect.dll"/>
- </Connector>
+ <RequestInterceptor
+ className="org.apache.tomcat.modules.server.JNIConnectionHandler"
+ nativeLibrary="D:\tomcat\bin\i386\jni_connect.dll" />
-->
<!-- ==================== Special webapps ==================== -->