remm 02/04/15 17:16:34
Modified: resources/confinstall server_1.xml server_2.xml
Log:
- Update the configuration file used by the installer.
Revision Changes Path
1.2 +5 -4 jakarta-tomcat-4.0/resources/confinstall/server_1.xml
Index: server_1.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/resources/confinstall/server_1.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server_1.xml 1 Feb 2002 00:15:11 -0000 1.1
+++ server_1.xml 16 Apr 2002 00:16:34 -0000 1.2
@@ -13,10 +13,11 @@
<Server port="8005" shutdown="SHUTDOWN" debug="0">
+ <!-- Uncomment these entries to enable JMX MBeans support -->
<Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
- debug="0"/>
+ debug="0"/>
<Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"
- debug="0"/>
+ debug="0"/>
<!-- Global JNDI resources -->
<GlobalNamingResources>
@@ -81,5 +82,5 @@
IP address of the remote client.
-->
- <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
- <Connector className="org.apache.catalina.connector.http.HttpConnector"
+ <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8081 -->
+ <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
1.3 +40 -19 jakarta-tomcat-4.0/resources/confinstall/server_2.xml
Index: server_2.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/resources/confinstall/server_2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- server_2.xml 20 Feb 2002 02:44:11 -0000 1.2
+++ server_2.xml 16 Apr 2002 00:16:34 -0000 1.3
@@ -1,41 +1,61 @@
minProcessors="5" maxProcessors="75"
enableLookups="true" redirectPort="8443"
- acceptCount="10" debug="0" connectionTimeout="60000"/>
+ acceptCount="10" debug="0" connectionTimeout="20000"
+ useURIValidationHack="false" />
<!-- Note : To disable connection timeouts, set connectionTimeout value
to -1 -->
- <!-- Define an SSL HTTP/1.1 Connector on port 8443 -->
+ <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
<!--
- <Connector className="org.apache.catalina.connector.http.HttpConnector"
+ <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
port="8443" minProcessors="5" maxProcessors="75"
enableLookups="true"
- acceptCount="10" debug="0" scheme="https" secure="true">
- <Factory className="org.apache.catalina.net.SSLServerSocketFactory"
- clientAuth="false" protocol="TLS"/>
+ acceptCount="10" debug="0" scheme="https" secure="true"
+ useURIValidationHack="false">
+ <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
+ clientAuth="false" protocol="TLS" />
</Connector>
-->
+ <!-- Define a Coyote/JK2 AJP 1.4 Connector on port 8009 -->
+ <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+ port="8009" minProcessors="5" maxProcessors="75"
+ enableLookups="true" redirectPort="8443"
+ acceptCount="10" debug="0" connectionTimeout="20000"
+ useURIValidationHack="false"
+ protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
+
<!-- Define an AJP 1.3 Connector on port 8009 -->
+ <!--
<Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
port="8009" minProcessors="5" maxProcessors="75"
acceptCount="10" debug="0"/>
+ -->
- <!-- Define a Proxied HTTP/1.1 Connector on port 8081 -->
+ <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
<!-- See proxy documentation for more information about using this. -->
<!--
- <Connector className="org.apache.catalina.connector.http.HttpConnector"
- port="8081" minProcessors="5" maxProcessors="75"
+ <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
+ port="8082" minProcessors="5" maxProcessors="75"
enableLookups="true"
- acceptCount="10" debug="0" connectionTimeout="60000"
- proxyPort="80"/>
+ acceptCount="10" debug="0" connectionTimeout="20000"
+ proxyPort="80" useURIValidationHack="false" />
+ -->
+
+ <!-- Define a non-SSL legacy HTTP/1.1 Test Connector on port 8083 -->
+ <!--
+ <Connector className="org.apache.catalina.connector.http.HttpConnector"
+ port="8083" minProcessors="5" maxProcessors="75"
+ enableLookups="true" redirectPort="8443"
+ acceptCount="10" debug="0" />
-->
- <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8082 -->
+ <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8084 -->
<!--
<Connector className="org.apache.catalina.connector.http10.HttpConnector"
- port="8082" minProcessors="5" maxProcessors="75"
+ port="8084" minProcessors="5" maxProcessors="75"
enableLookups="true" redirectPort="8443"
- acceptCount="10" debug="0"/>
+ acceptCount="10" debug="0" />
-->
<!-- An Engine represents the entry point (within Catalina) that processes
@@ -80,9 +100,9 @@
<!-- Comment out the old realm but leave here for now in case we
need to go back quickly -->
-<!--
+ <!--
<Realm className="org.apache.catalina.realm.MemoryRealm" />
--->
+ -->
<!-- Replace the above Realm with one of the following to get a Realm
stored in a database and accessed via JDBC -->
@@ -134,9 +154,11 @@
directory with the "directory" attribute. Specify either a relative
(to $CATALINA_HOME) or absolute path to the desired directory.
-->
+ <!--
<Valve className="org.apache.catalina.valves.AccessLogValve"
directory="logs" prefix="localhost_access_log." suffix=".txt"
pattern="common" resolveHosts="false"/>
+ -->
<!-- Logger shared by all Contexts related to this virtual host. By
default (when using FileLogger), log files are created in the "logs"
@@ -283,6 +305,7 @@
-->
<!-- Define an Apache-Connector Service -->
+<!--
<Service name="Tomcat-Apache">
<Connector className="org.apache.catalina.connector.warp.WarpConnector"
@@ -290,20 +313,18 @@
enableLookups="true" appBase="webapps"
acceptCount="10" debug="0"/>
- <!-- Replace "localhost" with what your Apache "ServerName" is set to -->
<Engine className="org.apache.catalina.connector.warp.WarpEngine"
name="Apache" debug="0">
- <!-- Global logger unless overridden at lower levels -->
<Logger className="org.apache.catalina.logger.FileLogger"
prefix="apache_log." suffix=".txt"
timestamp="true"/>
- <!-- Because this Realm is here, an instance will be shared globally -->
<Realm className="org.apache.catalina.realm.MemoryRealm" />
</Engine>
</Service>
+-->
</Server>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
