$FreeBSD$

--- ./conf/server.xml.orig	2010-09-04 21:54:16.000000000 +0200
+++ ./conf/server.xml	2010-10-01 23:00:25.000000000 +0200
@@ -27,7 +27,7 @@
      define subcomponents such as "Valves" or "Loggers" at this level.
  -->
 
-<Server port="8005" shutdown="SHUTDOWN">
+<Server port="%%SHUTDOWN_PORT%%" shutdown="SHUTDOWN">
 
   <!-- Comment these entries out to disable JMX MBeans support used for the 
        administration web application -->
@@ -90,11 +90,11 @@
          IP address of the remote client.
     -->
 
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
-    <Connector port="8080" maxHttpHeaderSize="8192"
+    <!-- Define a non-SSL HTTP/1.1 Connector -->
+    <Connector port="%%HTTP_PORT%%" maxHttpHeaderSize="8192"
                maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
                enableLookups="false" redirectPort="8443" acceptCount="100"
-               connectionTimeout="20000" disableUploadTimeout="true" />
+               connectionTimeout="%%HTTP_TIMEOUT%%" disableUploadTimeout="true" />
     <!-- Note : To disable connection timeouts, set connectionTimeout value
      to 0 -->
 	
@@ -115,8 +115,8 @@
                clientAuth="false" sslProtocol="TLS" />
     -->
 
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009" 
+    <!-- Define an AJP 1.3 Connector -->
+    <Connector port="%%AJP_1_3_PORT%%" 
                enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
 
     <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->