$FreeBSD$

--- conf/server.xml.orig	Sat Mar 30 18:58:31 2002
+++ conf/server.xml	Sat Mar 30 19:00:01 2002
@@ -10,7 +10,7 @@
      define subcomponents such as "Valves" or "Loggers" at this level.
  -->
 
-<Server port="8005" shutdown="SHUTDOWN" debug="0">
+<Server port="%%SHUTDOWN_PORT%%" shutdown="SHUTDOWN" debug="0">
 
 
   <!-- A "Service" is a collection of one or more "Connectors" that share
@@ -51,9 +51,9 @@
          IP address of the remote client.
     -->
 
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
+    <!-- Define a non-SSL HTTP/1.1 Connector -->
     <Connector className="org.apache.catalina.connector.http.HttpConnector"
-               port="8080" minProcessors="5" maxProcessors="75"
+               port="%%HTTP_PORT%%" minProcessors="5" maxProcessors="75"
                enableLookups="true" redirectPort="8443"
                acceptCount="10" debug="0" connectionTimeout="60000"/>
     <!-- Note : To disable connection timeouts, set connectionTimeout value 
@@ -70,9 +70,9 @@
     </Connector>
     -->
 
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- Define an AJP 1.3 Connector -->
     <Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
-               port="8009" minProcessors="5" maxProcessors="75"
+               port="%%AJP_1_3_PORT%%" minProcessors="5" maxProcessors="75"
                acceptCount="10" debug="0"/>
 
     <!-- Define a Proxied HTTP/1.1 Connector on port 8081 -->
@@ -310,7 +310,7 @@
   <Service name="Tomcat-Apache">
 
     <Connector className="org.apache.catalina.connector.warp.WarpConnector"
-     port="8008" minProcessors="5" maxProcessors="75"
+     port="%%WARP_PORT%%" minProcessors="5" maxProcessors="75"
      enableLookups="true" appBase="webapps"
      acceptCount="10" debug="0"/>