Return-Path: 
 <dev-return-73595-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 72045 invoked from network); 2 Aug 2006 02:45:56 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 Aug 2006 02:45:56 -0000
Received: (qmail 74409 invoked by uid 500); 2 Aug 2006 02:45:49 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 74365 invoked by uid 500); 2 Aug 2006 02:45:48 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 74354 invoked by uid 500); 2 Aug 2006 02:45:48 -0000
Delivered-To: apmail-jakarta-tomcat-dev@jakarta.apache.org
Received: (qmail 74351 invoked by uid 99); 2 Aug 2006 02:45:48 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Aug 2006 19:45:48 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Aug 2006 19:45:45 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 384F01A981A; Tue,  1 Aug 2006 19:45:25 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r427861 - in /tomcat/container/branches/tc4.1.x:
 catalina/src/conf/server.xml resources/confinstall/server_1.xml
 resources/confinstall/server_2.xml
Date: Wed, 02 Aug 2006 02:45:24 -0000
To: tomcat-dev@jakarta.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060802024525.384F01A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: markt
Date: Tue Aug  1 19:45:23 2006
New Revision: 427861

URL: http://svn.apache.org/viewvc?rev=427861&view=rev
Log:
Align standard server.xml with one created by the Windows installer

Modified:
    tomcat/container/branches/tc4.1.x/catalina/src/conf/server.xml
    tomcat/container/branches/tc4.1.x/resources/confinstall/server_1.xml
    tomcat/container/branches/tc4.1.x/resources/confinstall/server_2.xml

Modified: tomcat/container/branches/tc4.1.x/catalina/src/conf/server.xml
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/catalina/src/conf/server.xml?rev=427861&r1=427860&r2=427861&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/catalina/src/conf/server.xml (original)
+++ tomcat/container/branches/tc4.1.x/catalina/src/conf/server.xml Tue Aug  1 19:45:23 2006
@@ -109,7 +109,7 @@
     <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
                port="8009" enableLookups="true" redirectPort="8443"
                connectionTimeout="0"
- useURIValidationHack="false"
+               useURIValidationHack="false"
                protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler" />
 
     <!-- An Engine represents the entry point (within Catalina) that processes
@@ -344,6 +344,5 @@
     </Engine>
 
   </Service>
-
 
 </Server>

Modified: tomcat/container/branches/tc4.1.x/resources/confinstall/server_1.xml
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/resources/confinstall/server_1.xml?rev=427861&r1=427860&r2=427861&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/resources/confinstall/server_1.xml (original)
+++ tomcat/container/branches/tc4.1.x/resources/confinstall/server_1.xml Tue Aug  1 19:45:23 2006
@@ -13,7 +13,13 @@
 <Server port="8005" shutdown="SHUTDOWN" debug="0">
 
 
-  <!-- Uncomment these entries to enable JMX MBeans support -->
+  <!-- Comment these entries out to disable JMX MBeans support -->
+  <!-- You may also configure custom components (e.g. Valves/Realms) by
+       including your own mbean-descriptor file(s), and setting the
+       "descriptors" attribute to point to a ';' seperated list of paths
+       (in the ClassLoader sense) of files to add to the default list.
+       e.g. descriptors="/com/myfirm/mypackage/mbean-descriptor.xml"
+  -->
   <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"
             debug="0"/>
   <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"

Modified: tomcat/container/branches/tc4.1.x/resources/confinstall/server_2.xml
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/resources/confinstall/server_2.xml?rev=427861&r1=427860&r2=427861&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/resources/confinstall/server_2.xml (original)
+++ tomcat/container/branches/tc4.1.x/resources/confinstall/server_2.xml Tue Aug  1 19:45:23 2006
@@ -1,7 +1,6 @@
 
-               minProcessors="5" maxProcessors="75"
                enableLookups="true" redirectPort="8443"
-               acceptCount="100" debug="0" connectionTimeout="20000"
+               acceptCount="100" connectionTimeout="20000"
                useURIValidationHack="false" disableUploadTimeout="true" />
     <!-- Note : To disable connection timeouts, set connectionTimeout value 
      to 0 -->
@@ -9,61 +8,28 @@
     <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
     <!--
     <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
-               port="8443" minProcessors="5" maxProcessors="75"
-               enableLookups="true"
-	       acceptCount="100" debug="0" scheme="https" secure="true"
-               useURIValidationHack="false" disableUploadTimeout="true">
-      <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
-               clientAuth="false" protocol="TLS" />
-    </Connector>
+               port="8443" enableLookups="true" scheme="https" secure="true"
+               acceptCount="100"
+               useURIValidationHack="false" disableUploadTimeout="true"
+               clientAuth="false" sslProtocol="TLS" />
     -->
 
-    <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
+    <!-- Define a Coyote AJP/1.3 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"
+               port="8009" enableLookups="true" redirectPort="8443"
+               connectionTimeout="0"
                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 8082 -->
-    <!-- See proxy documentation for more information about using this. -->
-    <!--
-    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
-               port="8082" minProcessors="5" maxProcessors="75"
-               enableLookups="true" disableUploadTimeout="true"
-               acceptCount="100" 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 8084 -->
-    <!--
-    <Connector className="org.apache.catalina.connector.http10.HttpConnector"
-               port="8084" minProcessors="5" maxProcessors="75"
-               enableLookups="true" redirectPort="8443"
-               acceptCount="10" debug="0" />
-    -->
-
     <!-- An Engine represents the entry point (within Catalina) that processes
          every request.  The Engine implementation for Tomcat stand alone
          analyzes the HTTP headers included with the request, and passes them
          on to the appropriate Host (virtual host). -->
 
+    <!-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
+    <Engine name="Standalone" defaultHost="localhost" debug="0" jvmRoute="jvm1">
+    -->
+
     <!-- Define the top level container in our container hierarchy -->
     <Engine name="Standalone" defaultHost="localhost" debug="0">
 
@@ -286,46 +252,5 @@
     </Engine>
 
   </Service>
-
-  <!-- The MOD_WEBAPP connector is used to connect Apache 1.3 with Tomcat 4.0
-       as its servlet container. Please read the README.txt file coming with
-       the WebApp Module distribution on how to build it.
-       (Or check out the "jakarta-tomcat-connectors/webapp" CVS repository)
-
-       To configure the Apache side, you must ensure that you have the
-       "ServerName" and "Port" directives defined in "httpd.conf".  Then,
-       lines like these to the bottom of your "httpd.conf" file:
-
-         LoadModule webapp_module libexec/mod_webapp.so
-         WebAppConnection warpConnection warp localhost:8008
-         WebAppDeploy examples warpConnection /examples/
-
-       The next time you restart Apache (after restarting Tomcat, if needed)
-       the connection will be established, and all applications you make
-       visible via "WebAppDeploy" directives can be accessed through Apache.
-  -->
-
-  <!-- Define an Apache-Connector Service -->
-<!--
-  <Service name="Tomcat-Apache">
-
-    <Connector className="org.apache.catalina.connector.warp.WarpConnector"
-     port="8008" minProcessors="5" maxProcessors="75"
-     enableLookups="true" appBase="webapps"
-     acceptCount="10" debug="0"/>
-
-    <Engine className="org.apache.catalina.connector.warp.WarpEngine"
-     name="Apache" debug="0">
-
-      <Logger className="org.apache.catalina.logger.FileLogger"
-              prefix="apache_log." suffix=".txt"
-              timestamp="true"/>
-
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-
-    </Engine>
-
-  </Service>
--->
 
 </Server>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org