cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2005/05/27 02:41:38

  Modified:catalina/src/share/org/apache/catalina/core
StandardServer.java LocalStrings.properties
   catalina/src/conf server.xml
  Added:   catalina/src/share/org/apache/catalina/core
AprLifecycleListener.java
  Log:
  - Add a listener for handling APR init/shutdown.
  - Unfortunately, some hacks remain in the Connector class, as the protocol
handler is instantiated too early right now. Fixing it is not urgent, 
though.
  
  Revision  ChangesPath
  1.44  +2 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java
  
  Index: StandardServer.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardServer.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- StandardServer.java   18 Apr 2005 22:02:02 -  1.43
  +++ StandardServer.java   27 May 2005 09:41:38 -  1.44
  @@ -734,6 +734,7 @@
   
log.info(sm.getString("standardServer.initialize.initialized"));
   return;
   }
  +lifecycle.fireLifecycleEvent(INIT_EVENT, null);
   initialized = true;
   
   if( oname==null ) {
  
  
  
  1.22  +2 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/LocalStrings.properties,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- LocalStrings.properties   3 May 2005 17:24:10 -   1.21
  +++ LocalStrings.properties   27 May 2005 09:41:38 -  1.22
  @@ -14,6 +14,8 @@
   applicationRequest.badRequest=Request is not a 
javax.servlet.ServletRequestWrapper
   applicationResponse.badParent=Cannot locate parent Response implementation
   applicationResponse.badResponse=Response is not a 
javax.servlet.ServletResponseWrapper
  +aprListener.aprInit=The Apache Portable Runtime which allows optimal 
performance in production environments was not found on the java.library.path: 
{0}
  +aprListener.aprDestroy=Failed shutdown of Apache Portable Runtime
   containerBase.addDefaultMapper=Exception configuring default mapper of class 
{0}
   containerBase.alreadyStarted=Container {0} has already been started
   containerBase.notConfigured=No basic Valve has been configured
  
  
  
  1.1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
  
  Index: AprLifecycleListener.java
  ===
  /*
   * Copyright 2002,2004 The Apache Software Foundation.
   * 
   * Licensed under the Apache License, Version 2.0 (the "License");
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
   * 
   *  http://www.apache.org/licenses/LICENSE-2.0
   * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
   */
  
  package org.apache.catalina.core;
  
  
  import java.lang.reflect.Method;
  import org.apache.catalina.Lifecycle;
  import org.apache.catalina.LifecycleEvent;
  import org.apache.catalina.LifecycleListener;
  import org.apache.catalina.util.StringManager;
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
  
  
  /**
   * Implementation of LifecycleListener that will init and
   * and destroy APR.
   *
   * @author Remy Maucherat
   * @version $Revision: 1.1 $ $Date: 2005/05/27 09:41:38 $
   * @since 4.1
   */
  
  public class AprLifecycleListener
  implements LifecycleListener {
  
  private static Log log = LogFactory.getLog(AprLifecycleListener.class);
  
  /**
   * The string manager for this package.
   */
  protected StringManager sm =
  StringManager.getManager(Constants.Package);
  
  // -- LifecycleListener 
Methods
  
  
  /**
   * Primary entry point for startup and shutdown events.
   *
   * @param event The event that has occurred
   */
  public void lifecycleEvent(LifecycleEvent event) {
  
  if (Lifecycle.INIT_EVENT.equals(event.getType())) {
  try {
  String methodName = "initialize";
  Class paramTypes[] = new Class[1];
  paramTypes[0] = String.class;
  Object paramValues[] = new 

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2005/01/12 09:44:36

  Modified:resources/confinstall server_1.xml
   catalina/src/conf server.xml
  Log:
  - Enable the storeconfig listener in the default server.xml (otherwise, the 
admin webapp won't work).
  
  Revision  ChangesPath
  1.10  +1 -0  jakarta-tomcat-5/resources/confinstall/server_1.xml
  
  Index: server_1.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/resources/confinstall/server_1.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- server_1.xml  25 Oct 2004 15:29:41 -  1.9
  +++ server_1.xml  12 Jan 2005 17:44:36 -  1.10
  @@ -16,6 +16,7 @@
  administration web application -->
 
 
  +  
   
 
 
  
  
  
  1.44  +1 -0  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- server.xml19 Nov 2004 16:46:26 -  1.43
  +++ server.xml12 Jan 2005 17:44:36 -  1.44
  @@ -16,6 +16,7 @@
  administration web application -->
 
 
  +  
   
 
 
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2004/10/25 08:29:41

  Modified:webapps/docs/config valve.xml
   resources/confinstall server_1.xml server_2.xml
   catalina/src/conf server.xml
  Log:
  - Document new access log valve.
  - Add it in the default config.
  
  Revision  ChangesPath
  1.11  +9 -2  jakarta-tomcat-catalina/webapps/docs/config/valve.xml
  
  Index: valve.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/valve.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- valve.xml 27 Sep 2004 16:00:31 -  1.10
  +++ valve.xml 25 Oct 2004 15:29:41 -  1.11
  @@ -60,7 +60,12 @@
   
 
   Java class name of the implementation to use.  This MUST be set to
  -org.apache.catalina.valves.AccessLogValve.
  +org.apache.catalina.valves.AccessLogValve to use the
  +default access log valve. To use a more optimized access log valve
  +designed for production use, you MUST set this attribute to 
  +org.apache.catalina.valves.FastCommonAccessLogValve.
  +In this case, only the common and combined
  +patterns are supported.
 
   
 
  @@ -76,7 +81,9 @@
   from the request and response to be logged, or the word
   common or combined to select a
   standard format.  See below for more information on configuring
  -this attribute.
  +this attribute. Note that the optimized access does only support
  +common and combined as the value for this
  +attribute.
 
   
 
  
  
  
  1.9   +6 -14 jakarta-tomcat-5/resources/confinstall/server_1.xml
  
  Index: server_1.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/resources/confinstall/server_1.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- server_1.xml  26 Aug 2004 17:03:34 -  1.8
  +++ server_1.xml  25 Oct 2004 15:29:41 -  1.9
  @@ -10,20 +10,12 @@
define subcomponents such as "Valves" or "Loggers" at this level.
-->
   
  -
  +
   
  -
  -  
  -  
  -  
  -  
  +  
  +  
  +  
   
 
 
  @@ -80,4 +72,4 @@
   -->
   
   
  -
  +   connectionTimeout="2" disableUploadTimeout="true" />
   

  @@ -18,22 +17,20 @@
   
   -->
   
   
   
  +   enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
   
   
   
   
   
  @@ -43,11 +40,11 @@
on to the appropriate Host (virtual host). -->
   


   
  -
  +
   
 
 
  + resourceName="UserDatabase"/>
   
 
  @@ -86,7 +83,7 @@
  stored in a database and accessed via JDBC -->
   
 
   
 
   
 
  -  
   
  @@ -128,8 +125,6 @@
   
name = a descriptive name for your cluster, can be anything
   
  - debug = the debug level, higher means more output
  -
mcastAddr = the multicast address, has to be the same for all the nodes
   
mcastPort = the multicast port, has to be the same for all the nodes
  @@ -162,7 +157,7 @@
   
useDirtyFlag = true means that we only replicate a session after 
setAttribute,removeAttribute has been called.
   false means to replicate the session after each request.
  -false means that replication would work for the 
following piece of code:
  +false means that replication would work for the 
following piece of code: (only for SimpleTcpReplicationManager)
   <%
   HashMap map = (HashMap)session.getAttribute("map");
   map.put("key","value");
  @@ -211,7 +206,8 @@
   
  + useDirtyFlag="true"
  + notifyListenersOnReplication="true">
   
   
  +replicationMode="pooled"
  +ackTimeout="15000"/>
   
   
  @@ -251,8 +248,7 @@
user identity maintained across *all* web applications contained
in this virtual host. -->
   
   
   
   
  +
  +
  +
  
  
  
  1.41  +14 -0 jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- server.xml19 Oct 2004 23:19:45 -  1.40
  +++ server.xml25 Oct 2004 15:29:41 -  1.41
  @@ -338,6 +338,20 @@
pattern="common" resolveHosts

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[fhanik]

fhanik  2004/10/19 16:19:45

  Modified:catalina/src/conf server.xml
  Log:
  Added in note about useDirtyFlag and its usage
  
  Revision  ChangesPath
  1.40  +1 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- server.xml6 Oct 2004 15:24:59 -   1.39
  +++ server.xml19 Oct 2004 23:19:45 -  1.40
  @@ -232,7 +232,7 @@
   
useDirtyFlag = true means that we only replicate a session after 
setAttribute,removeAttribute has been called.
   false means to replicate the session after each request.
  -false means that replication would work for the 
following piece of code:
  +false means that replication would work for the 
following piece of code: (only for SimpleTcpReplicationManager)
   <%
   HashMap map = (HashMap)session.getAttribute("map");
   map.put("key","value");
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2004/10/06 08:24:59

  Modified:catalina/src/conf server.xml
  Log:
  - Cleanup: remove all "debug" attributes.
  
  Revision  ChangesPath
  1.39  +17 -31jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- server.xml29 Sep 2004 18:23:55 -  1.38
  +++ server.xml6 Oct 2004 15:24:59 -   1.39
  @@ -10,20 +10,12 @@
define subcomponents such as "Valves" or "Loggers" at this level.
-->
   
  -
  +
   
  -
  -  
  -  
  -  
  -  
  +  
  +  
  +  
   
 
 
  @@ -83,8 +75,7 @@
   
  +   connectionTimeout="2" disableUploadTimeout="true" />
   

  @@ -101,22 +92,20 @@
   
   -->
   
   
   
  +   enableLookups="false" redirectPort="8443" protocol="AJP/1.3" />
   
   
   
   
   
  @@ -126,11 +115,11 @@
on to the appropriate Host (virtual host). -->
   


   
  -
  +
   
 
 
  + resourceName="UserDatabase"/>
   
 
  @@ -169,7 +158,7 @@
  stored in a database and accessed via JDBC -->
   
 
   
 
   
 
  -  
   
  @@ -211,8 +200,6 @@
   
name = a descriptive name for your cluster, can be anything
   
  - debug = the debug level, higher means more output
  -
mcastAddr = the multicast address, has to be the same for all the nodes
   
mcastPort = the multicast port, has to be the same for all the nodes
  @@ -336,8 +323,7 @@
user identity maintained across *all* web applications contained
in this virtual host. -->
   
   
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[fhanik]

fhanik  2004/09/29 09:45:27

  Modified:catalina/src/conf server.xml
  Log:
  Added flag to enable/disable attribute/context events during session delta 
replication
  
  Revision  ChangesPath
  1.37  +2 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- server.xml31 Jul 2004 17:13:53 -  1.36
  +++ server.xml29 Sep 2004 16:45:27 -  1.37
  @@ -294,7 +294,8 @@
   
  + useDirtyFlag="true"
  + notifyListenersOnReplication="true">
   
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[fhanik]

fhanik  2004/06/04 13:30:34

  Modified:catalina/src/conf server.xml
  Log:
  Added in example for farm deployment into server.xml
  
  Revision  ChangesPath
  1.33  +15 -0 jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- server.xml14 May 2004 14:59:13 -  1.32
  +++ server.xml4 Jun 2004 20:30:34 -   1.33
  @@ -293,6 +293,15 @@
   
   filter=".*\.gif;.*\.js;" means that we will not replicate the session 
after requests with the URI
   ending with .gif and .js are intercepted.
  +
  +The deployer element can be used to deploy apps cluster wide.
  +Currently the deployment only deploys/undeploys to working members in 
the cluster
  +so no WARs are copied upons startup of a broken node.
  +The deployer watches a directory (watchDir) for WAR files when 
watchEnabled="true"
  +When a new war file is added the war gets deployed to the local 
instance,
  +and then deployed to the other instances in the cluster.
  +When a war file is deleted from the watchDir the war is undeployed 
locally 
  +and cluster wide
   -->
   
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[fhanik]

fhanik  2004/05/14 07:59:13

  Modified:catalina/src/conf server.xml
  Log:
  Added in TTL and so timeout for multicast sockets
  
  Revision  ChangesPath
  1.32  +6 -0  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- server.xml5 Feb 2004 16:00:29 -   1.31
  +++ server.xml14 May 2004 14:59:13 -  1.32
  @@ -230,6 +230,12 @@
mcastAddr = the multicast address, has to be the same for all the nodes
   
mcastPort = the multicast port, has to be the same for all the nodes
  + 
  + mcastBindAddr = bind the multicast socket to a specific address
  + 
  + mcastTTL = the multicast TTL if you want to limit your broadcast
  + 
  + mcastSoTimeout = the multicast readtimeout 
   
mcastFrequency = the number of milliseconds in between sending a "I'm 
alive" heartbeat
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2004/02/05 08:00:29

  Modified:catalina/src/conf server.xml
  Log:
  - Remove the Context example.
  
  Revision  ChangesPath
  1.31  +0 -10 jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- server.xml5 Feb 2004 05:27:31 -   1.30
  +++ server.xml5 Feb 2004 16:00:29 -   1.31
  @@ -353,16 +353,6 @@
directory="logs"  prefix="localhost_log." suffix=".txt"
   timestamp="true"/>
   
  -
  -
  -
  -
  -
 
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[markt]

markt   2004/01/21 15:50:03

  Modified:catalina/src/conf server.xml
  Log:
  - Fix bug 11042. Comment in server.xml now shows that connectionTimeout should be 
set to 0 rather than -1 to disable timeout.
  - Reported by Timofei Bolshakov.
  
  Revision  ChangesPath
  1.29  +1 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- server.xml9 Jan 2004 23:36:33 -   1.28
  +++ server.xml21 Jan 2004 23:50:03 -  1.29
  @@ -95,7 +95,7 @@
  debug="0" connectionTimeout="2" 
  disableUploadTimeout="true" />
   
  + to 0 -->

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[fhanik]

fhanik  2004/01/09 15:28:23

  Modified:catalina/src/conf server.xml
  Log:
  Added the 'pooled' replication setting.
  
  Revision  ChangesPath
  1.27  +2 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- server.xml25 Nov 2003 19:14:46 -  1.26
  +++ server.xml9 Jan 2004 23:28:23 -   1.27
  @@ -258,7 +258,8 @@
   HashMap map = (HashMap)session.getAttribute("map");
   map.put("key","value");
   %>
  - replicationMode = can be either 'synchronous' or 'asynchronous'.
  + replicationMode = can be either 'pooled', 'synchronous' or 
'asynchronous'.
  +   * Pooled means that the replication happens using 
several sockets in a synchronous way. Ie, the data gets replicated, then the request 
return. This is the same as the 'synchronous' setting except it uses a pool of 
sockets, hence it is multithreaded. This is the fastest and safest configuration. To 
use this, also increase the nr of tcp threads that you have dealing with replication.
  * Synchronous means that the thread that executes 
the request, is also the
  thread the replicates the data to the other nodes, 
and will not return until all
  nodes have received the information.
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[yoavs]

yoavs   2003/11/25 11:14:47

  Modified:catalina/src/conf server.xml
  Log:
  Corrected typo and grammar error in XML validation warning.
  
  Revision  ChangesPath
  1.26  +1 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- server.xml7 Oct 2003 14:38:12 -   1.25
  +++ server.xml25 Nov 2003 19:14:46 -  1.26
  @@ -209,7 +209,7 @@
 -->
   
 
 

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[jfarcand]

jfarcand2003/10/07 07:38:12

  Modified:catalina/src/conf server.xml
  Log:
  Make the xmlValidation more visible so people (meaning I) don't forget to turn on 
those attributes when testing.
  
  Revision  ChangesPath
  1.25  +4 -13 jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- server.xml1 Oct 2003 09:45:06 -   1.24
  +++ server.xml7 Oct 2003 14:38:12 -   1.25
  @@ -208,21 +208,12 @@
 userRoleTable="user_roles" roleNameCol="role_name" />
 -->
   
  -  
  -  
  -
  -  
  -  
 
  -  -->
  +   xmlValidation="false" xmlNamespaceAware="false">
   
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[hgomez]

hgomez  2003/10/01 02:45:06

  Modified:catalina/src/conf server.xml
  Log:
  Add comments about gzip settings and back port timeout note from 4.1
  
  Revision  ChangesPath
  1.24  +10 -0 jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- server.xml4 Aug 2003 05:15:07 -   1.23
  +++ server.xml1 Oct 2003 09:45:06 -   1.24
  @@ -94,6 +94,16 @@
  enableLookups="false" redirectPort="8443" acceptCount="100"
  debug="0" connectionTimeout="2" 
  disableUploadTimeout="true" />
  +
  + 
  + 
   
   
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[billbarker]

billbarker2003/08/03 22:15:07

  Modified:catalina/src/conf server.xml
  Log:
  Fix typo.
  
  Revision  ChangesPath
  1.23  +1 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- server.xml3 Aug 2003 10:31:26 -   1.22
  +++ server.xml4 Aug 2003 05:15:07 -   1.23
  @@ -101,7 +101,7 @@
  maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
  enableLookups="false" disableUploadTimeout="true"
  acceptCount="100" debug="0" scheme="https" secure="true"
  -   clientAuth="false" sSLprotocol="TLS" />
  +   clientAuth="false" sslProtocol="TLS" />
   -->
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2003/08/03 03:31:26

  Modified:catalina/src/conf server.xml
  Log:
  - Typo fix, submitted by Liu Kang (bug 21999).
  
  Revision  ChangesPath
  1.22  +1 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- server.xml3 Aug 2003 03:21:58 -   1.21
  +++ server.xml3 Aug 2003 10:31:26 -   1.22
  @@ -125,7 +125,7 @@
on to the appropriate Host (virtual host). -->
   


   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[billbarker]

billbarker2003/08/02 20:21:58

  Modified:catalina/src/conf server.xml
  Log:
  Removing the Factory element in the default SSL configuration.
  
  Revision  ChangesPath
  1.21  +2 -3  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- server.xml29 Jul 2003 15:26:43 -  1.20
  +++ server.xml3 Aug 2003 03:21:58 -   1.21
  @@ -100,9 +100,8 @@
   
  -  
  -
  +   acceptCount="100" debug="0" scheme="https" secure="true"
  +   clientAuth="false" sSLprotocol="TLS" />
   -->
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2003/07/29 08:26:44

  Modified:catalina/src/conf server.xml
  Log:
  - Some JK parameters should be configured in jk2.properties.
  
  Revision  ChangesPath
  1.20  +1 -3  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- server.xml28 Jul 2003 15:50:37 -  1.19
  +++ server.xml29 Jul 2003 15:26:43 -  1.20
  @@ -107,9 +107,7 @@
   
   
   
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2003/07/28 08:50:37

  Modified:catalina/src/conf server.xml
  Log:
  - Use the same default values as Apache 2.0 for the HTTP/1.1 connector,
as submitted by Henri.
  
  Revision  ChangesPath
  1.19  +3 -5  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- server.xml28 Jul 2003 11:25:44 -  1.18
  +++ server.xml28 Jul 2003 15:50:37 -  1.19
  @@ -90,17 +90,15 @@
   
   
   
  -
   
   
   
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2003/07/28 04:25:45

  Modified:catalina/src/conf server.xml
  Log:
  - Beautify the connectors default configuration (note: old configurations are
of course still valid).
  
  Revision  ChangesPath
  1.18  +15 -16jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- server.xml18 Apr 2003 02:50:38 -  1.17
  +++ server.xml28 Jul 2003 11:25:44 -  1.18
  @@ -89,9 +89,9 @@
   -->
   
   
  -
   
   
   
   
  -
  +   protocol="AJP/1.3" />
   
   
   
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[fhanik]

fhanik  2003/04/12 18:29:20

  Modified:catalina/src/conf server.xml
  Log:
  oops, forgot the remove the old cluster declaration
  
  Revision  ChangesPath
  1.16  +0 -6  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- server.xml13 Apr 2003 01:28:04 -  1.15
  +++ server.xml13 Apr 2003 01:29:20 -  1.16
  @@ -220,12 +220,6 @@
  xmlValidation="true" xmlNamespaceAware="true">
 -->
   
  -
  -
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[fhanik]

fhanik  2003/04/12 18:28:04

  Modified:catalina/src/conf server.xml
  Log:
  added in the correct cluster configuration
  
  Revision  ChangesPath
  1.15  +88 -2 jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- server.xml17 Mar 2003 19:12:24 -  1.14
  +++ server.xml13 Apr 2003 01:28:04 -  1.15
  @@ -102,7 +102,7 @@
   
  +   acceptCount="100" debug="0" scheme="https" secure="true">
 
   
  @@ -226,7 +226,93 @@
   
  + 
  +
  +
  +
  +
   
   
  +timestamp="true"/>
   
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[costin]

costin  2003/03/17 11:12:24

  Modified:catalina/src/conf server.xml
  Log:
  Match the service and engine names.
  
  Use "Catalina" - /admin hardcodes this name ( this is a temp workaround to
  get the admin kind-of-working so the rest of the things can be tested )
  
  Revision  ChangesPath
  1.14  +2 -2  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- server.xml8 Dec 2002 07:23:05 -   1.13
  +++ server.xml17 Mar 2003 19:12:24 -  1.14
  @@ -60,7 +60,7 @@
  -->
   
 
  -  
  +  
   


   
  -
  +
   
 

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[billbarker]

billbarker2002/12/07 23:23:05

  Modified:catalina/src/conf server.xml
  Log:
  Porting from TC 4.
  
  Revision  ChangesPath
  1.13  +7 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- server.xml5 Dec 2002 16:02:54 -   1.12
  +++ server.xml8 Dec 2002 07:23:05 -   1.13
  @@ -13,7 +13,13 @@
   
   
   
  -  
  +  
  +  
 
 mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2002/12/05 08:02:54

  Modified:catalina/src/conf server.xml
  Log:
  - Add JG cluster example.
  
  Revision  ChangesPath
  1.12  +7 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- server.xml3 Dec 2002 18:44:51 -   1.11
  +++ server.xml5 Dec 2002 16:02:54 -   1.12
  @@ -201,7 +201,6 @@
 
 
  - 
   
 
  +
  +
  +
   
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2002/12/03 10:44:51

  Modified:catalina/src/conf server.xml
  Log:
  - Oops ...
  
  Revision  ChangesPath
  1.11  +1 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- server.xml3 Dec 2002 18:41:21 -   1.10
  +++ server.xml3 Dec 2002 18:44:51 -   1.11
  @@ -85,7 +85,7 @@
   
   
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2002/12/03 10:41:21

  Modified:catalina/src/conf server.xml
  Log:
  - Modify the default configuration:
- the upload timeout control is IMO a great feature in specific cases, but isn't
  useful in many others. As I think JNI calls are far from beiing free, I would 
disable
  it by default.
- the pool used now is symetrical (ie, it doesn't have a dedicated thread dedicated
  to accepting), so I need it could need a higher socket backlog. The default
  value is now the default value specified in the endpoint class (I hope it wasn't
  selected randomly ;-) )
  
  Revision  ChangesPath
  1.10  +9 -11 jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- server.xml22 Oct 2002 09:48:15 -  1.9
  +++ server.xml3 Dec 2002 18:41:21 -   1.10
  @@ -84,10 +84,10 @@
   
   
   
  +   port="8080" minProcessors="5" maxProcessors="100"
  +   enableLookups="true"redirectPort="8443" acceptCount="100"
  +   debug="0" connectionTimeout="2" 
  +   disableUploadTimeout="true" />
   
   
  @@ -95,9 +95,8 @@
   
  @@ -117,8 +115,8 @@
   
  +   acceptCount="100" debug="0" connectionTimeout="2"
  +   proxyPort="80" disableUploadTimeout="true" />
   -->
   
   

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[hgomez]

hgomez  2002/10/22 02:48:15

  Modified:catalina/src/conf server.xml
  Log:
  Add comment about jvmroute in Engine to use jk/jk2 load-balancing
  
  Revision  ChangesPath
  1.9   +4 -0  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- server.xml11 Oct 2002 08:54:12 -  1.8
  +++ server.xml22 Oct 2002 09:48:15 -  1.9
  @@ -126,6 +126,10 @@
analyzes the HTTP headers included with the request, and passes them
on to the appropriate Host (virtual host). -->
   
  + 
  + 
   
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[remm]

remm2002/10/11 01:54:12

  Modified:catalina/src/conf server.xml
  Log:
  - Update based on current components.
  
  Revision  ChangesPath
  1.8   +1 -165jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- server.xml7 Oct 2002 18:20:23 -   1.7
  +++ server.xml11 Oct 2002 08:54:12 -  1.8
  @@ -111,13 +111,6 @@
  useURIValidationHack="false"
  protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
   
  -
  -
  -
   
   
   
   
  -
  -
  -
  -
  -
  -
   
   
   
  -
  -
  -  
  -  
  -
  -  
  -
  -
  -
  -  
  -   
  -  
  -  
  -  
  -  
  -usernamesa
  -password
  -driverClassName
  -  org.hsql.jdbcDriver
  -url
  -  jdbc:HypersonicSQL:database
  -  
  -  
  -  
  -
  -  mail.smtp.host
  -  localhost
  -
  -  
  -  
  -
  -
 
   
   
   
 
  -
  -  
  -
  -  
  -
   
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[jfarcand]

jfarcand2002/10/07 11:20:23

  Modified:catalina/src/conf server.xml
  Log:
  Add a note describing which Xerces version should be used when validation is turned 
on
  
  Revision  ChangesPath
  1.7   +5 -1  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- server.xml19 Sep 2002 16:37:36 -  1.6
  +++ server.xml7 Oct 2002 18:20:23 -   1.7
  @@ -225,7 +225,11 @@

   
 
  +   on. Remember to comment the Host element above. 
  +   
  +   Note: XML Schema validationn will works with Xerces 2.0.1 or 
  +   Xerces 2.1. Xerces 2.0.2 and Xerces 2.2 have bugs that prevent 
  +   their use with Tomcat-->
 

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[bobh]

bobh2002/09/19 09:37:36

  Modified:catalina/src/conf server.xml
  Log:
  - jdk1.4 includes the JSSE package, update comment to reflect this
  
  Revision  ChangesPath
  1.6   +2 -2  jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- server.xml22 Aug 2002 12:48:56 -  1.5
  +++ server.xml19 Sep 2002 16:37:36 -  1.6
  @@ -66,8 +66,8 @@
entry.  SSL support requires the following steps (see the SSL Config
HOWTO in the Tomcat 5 documentation bundle for more detailed
instructions):
  - * Download and install JSSE 1.0.2 or later, and put the JAR files
  -   into "$JAVA_HOME/jre/lib/ext".
  + * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
  +   later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
* Execute:
%JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
$JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml

[amyroh]

amyroh  2002/08/16 14:04:26

  Modified:catalina/src/conf server.xml
  Log:
  Update the JNDI datasource sample configuration following the current DBCP
implementation - "username" instead of "user".
  
  Revision  ChangesPath
  1.4   +12 -12jakarta-tomcat-catalina/catalina/src/conf/server.xml
  
  Index: server.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/conf/server.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- server.xml4 Aug 2002 19:41:06 -   1.3
  +++ server.xml16 Aug 2002 21:04:26 -  1.4
  @@ -88,7 +88,7 @@
  enableLookups="true" redirectPort="8443"
  acceptCount="10" debug="0" connectionTimeout="2"
  useURIValidationHack="false" />
  -
   
   
  @@ -220,7 +220,7 @@
 -->
   
 
  -  
   
   
   
   
  -