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

2005-05-27 Thread 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 codeLifecycleListener/code 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[] = 

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

2005-01-12 Thread 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 --
 Listener className=org.apache.catalina.mbeans.ServerLifecycleListener /
 Listener 
className=org.apache.catalina.mbeans.GlobalResourcesLifecycleListener /
  +  Listener 
className=org.apache.catalina.storeconfig.StoreConfigLifecycleListener/
   
 !-- Global JNDI resources --
 GlobalNamingResources
  
  
  
  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 --
 Listener className=org.apache.catalina.mbeans.ServerLifecycleListener /
 Listener 
className=org.apache.catalina.mbeans.GlobalResourcesLifecycleListener /
  +  Listener 
className=org.apache.catalina.storeconfig.StoreConfigLifecycleListener/
   
 !-- Global JNDI resources --
 GlobalNamingResources
  
  
  

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



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

2004-10-25 Thread 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 @@
   
 attribute name=className required=true
   pJava class name of the implementation to use.  This MUST be set to
  -strongorg.apache.catalina.valves.AccessLogValve/strong./p
  +strongorg.apache.catalina.valves.AccessLogValve/strong 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 
  +strongorg.apache.catalina.valves.FastCommonAccessLogValve/strong.
  +In this case, only the codecommon/code and codecombined/code
  +patterns are supported./p
 /attribute
   
 attribute name=directory required=false
  @@ -76,7 +81,9 @@
   from the request and response to be logged, or the word
   codecommon/code or codecombined/code to select a
   standard format.  See below for more information on configuring
  -this attribute./p
  +this attribute. Note that the optimized access does only support
  +codecommon/code and codecombined/code as the value for this
  +attribute./p
 /attribute
   
 attribute name=prefix required=false
  
  
  
  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.
--
   
  -Server port=8005 shutdown=SHUTDOWN debug=0
  +Server port=8005 shutdown=SHUTDOWN
   
  -
  -  !-- 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
  -debug=0/
  +  !-- Comment these entries out to disable JMX MBeans support used for the 
  +   administration web application --
  +  Listener className=org.apache.catalina.mbeans.ServerLifecycleListener /
  +  Listener className=org.apache.catalina.mbeans.GlobalResourcesLifecycleListener 
/
   
 !-- Global JNDI resources --
 GlobalNamingResources
  @@ -80,4 +72,4 @@
   --
   
   !-- Define a non-SSL HTTP/1.1 Connector on port 8080 --
  -Connector 
  +Connector
  
  
  
  1.17  +31 -21jakarta-tomcat-5/resources/confinstall/server_2.xml
  
  Index: server_2.xml
  ===
  RCS file: /home/cvs/jakarta-tomcat-5/resources/confinstall/server_2.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- server_2.xml  26 Aug 2004 17:03:34 -  1.16
  +++ server_2.xml  25 Oct 2004 15:29:41 -  1.17
  @@ -1,7 +1,6 @@
  maxThreads=150 minSpareThreads=25 maxSpareThreads=75
  enableLookups=false redirectPort=8443 acceptCount=100
  -   debug=0 connectionTimeout=2 
  -   disableUploadTimeout=true /
  +   connectionTimeout=2 disableUploadTimeout=true /
   !-- Note : To disable connection timeouts, set connectionTimeout value
to 0 --

  @@ -18,22 +17,20 @@
   Connector port=8443 
  maxThreads=150 minSpareThreads=25 maxSpareThreads=75
  enableLookups=false disableUploadTimeout=true
  -   acceptCount=100 debug=0 scheme=https secure=true
  +   acceptCount=100 scheme=https secure=true
  clientAuth=false sslProtocol=TLS /
   --
   
   !-- Define an AJP 1.3 

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

2004-10-19 Thread 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

2004-10-06 Thread 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.
--
   
  -Server port=8005 shutdown=SHUTDOWN debug=0
  +Server port=8005 shutdown=SHUTDOWN
   
  -
  -  !-- 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
  -debug=0/
  +  !-- Comment these entries out to disable JMX MBeans support used for the 
  +   administration web application --
  +  Listener className=org.apache.catalina.mbeans.ServerLifecycleListener /
  +  Listener className=org.apache.catalina.mbeans.GlobalResourcesLifecycleListener 
/
   
 !-- Global JNDI resources --
 GlobalNamingResources
  @@ -83,8 +75,7 @@
   Connector port=8080
  maxThreads=150 minSpareThreads=25 maxSpareThreads=75
  enableLookups=false redirectPort=8443 acceptCount=100
  -   debug=0 connectionTimeout=2 
  -   disableUploadTimeout=true /
  +   connectionTimeout=2 disableUploadTimeout=true /
   !-- Note : To disable connection timeouts, set connectionTimeout value
to 0 --

  @@ -101,22 +92,20 @@
   Connector port=8443 
  maxThreads=150 minSpareThreads=25 maxSpareThreads=75
  enableLookups=false disableUploadTimeout=true
  -   acceptCount=100 debug=0 scheme=https secure=true
  +   acceptCount=100 scheme=https secure=true
  clientAuth=false sslProtocol=TLS /
   --
   
   !-- Define an AJP 1.3 Connector on port 8009 --
   Connector port=8009 
  -   enableLookups=false redirectPort=8443 debug=0
  -   protocol=AJP/1.3 /
  +   enableLookups=false redirectPort=8443 protocol=AJP/1.3 /
   
   !-- Define a Proxied HTTP/1.1 Connector on port 8082 --
   !-- See proxy documentation for more information about using this. --
   !--
   Connector port=8082 
  maxThreads=150 minSpareThreads=25 maxSpareThreads=75
  -   enableLookups=false
  -   acceptCount=100 debug=0 connectionTimeout=2
  +   enableLookups=false acceptCount=100 connectionTimeout=2
  proxyPort=80 disableUploadTimeout=true /
   --
   
  @@ -126,11 +115,11 @@
on to the appropriate Host (virtual host). --
   
   !-- You should set jvmRoute to support load-balancing via AJP ie :
  -Engine name=Standalone defaultHost=localhost debug=0 jvmRoute=jvm1
 
  +Engine name=Standalone defaultHost=localhost jvmRoute=jvm1 
   -- 

   !-- Define the top level container in our container hierarchy --
  -Engine name=Catalina defaultHost=localhost debug=0
  +Engine name=Catalina defaultHost=localhost
   
 !-- The request dumper valve dumps useful debugging information about
  the request headers and cookies that were received, and the response
  @@ -157,7 +146,7 @@
  that are performed against this UserDatabase are immediately
  available for use by the Realm.  --
 Realm className=org.apache.catalina.realm.UserDatabaseRealm
  - debug=0 resourceName=UserDatabase/
  + resourceName=UserDatabase/
   
 !-- Comment out the old realm but leave here for now in case we
  need to go back quickly --
  @@ -169,7 +158,7 @@
  stored in a database and accessed via JDBC --
   
 !--
  -  Realm  className=org.apache.catalina.realm.JDBCRealm debug=99
  +  Realm  className=org.apache.catalina.realm.JDBCRealm
driverName=org.gjt.mm.mysql.Driver
 connectionURL=jdbc:mysql://localhost/authority
connectionName=test connectionPassword=test
  @@ -178,7 +167,7 @@
 --
   
 !--
  -  Realm  

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

2004-09-29 Thread 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 @@
   Cluster className=org.apache.catalina.cluster.tcp.SimpleTcpCluster
managerClassName=org.apache.catalina.cluster.session.DeltaManager
expireSessionsOnShutdown=false
  - useDirtyFlag=true
  + useDirtyFlag=true
  + notifyListenersOnReplication=true
   
   Membership 
   className=org.apache.catalina.cluster.mcast.McastService
  
  
  

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



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

2004-06-04 Thread 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
   --
   
   !--
  @@ -321,6 +330,12 @@
   
   Valve className=org.apache.catalina.cluster.tcp.ReplicationValve
  filter=.*\.gif;.*\.js;.*\.jpg;.*\.htm;.*\.html;.*\.txt;/
  +   
  +Deployer className=org.apache.catalina.cluster.deploy.FarmWarDeployer
  +  tempDir=/tmp/war-temp/
  +  deployDir=/tmp/war-deploy/
  +  watchDir=/tmp/war-listen/
  +  watchEnabled=false/
   /Cluster
   --
   
  
  
  

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



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

2004-05-14 Thread 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

2004-02-05 Thread 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/
   
  -!-- Define properties for each web application.  This is only needed
  - if you want to set non-default properties, or have web application
  - document roots in places other than the virtual host's appBase
  - directory.  --
  -
  -!-- Tomcat Root Context --
  -!--
  -  Context path= docBase=ROOT debug=0
  ---
  -
 /Host
   
   /Engine
  
  
  

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



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

2004-01-21 Thread 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 /
   !-- Note : To disable connection timeouts, set connectionTimeout value
  - to -1 --
  + to 0 --

!-- Note : To use gzip compression you could set the following properties :

  
  
  

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



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

2004-01-09 Thread 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

2003-11-25 Thread 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 @@
 --
   
 !-- Define the default virtual host
  -   Note: XML Schema validationn will not works with Xerces 2.2.
  +   Note: XML Schema validation will not work with Xerces 2.2.
  --
 Host name=localhost debug=0 appBase=webapps
  unpackWARs=true autoDeploy=true
  
  
  

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



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

2003-10-07 Thread 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 /
 --
   
  -  !-- Define the default virtual host --
  -  Host name=localhost debug=0 appBase=webapps
  -   unpackWARs=true autoDeploy=true
  -
  -  !-- Add the following attributes if you want to turn XML validation
  -   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--
  -  !--
  +  !-- Define the default virtual host
  +   Note: XML Schema validationn will not works with Xerces 2.2.
  +   --
 Host name=localhost debug=0 appBase=webapps
  unpackWARs=true autoDeploy=true
  -   xmlValidation=true xmlNamespaceAware=true
  -  --
  +   xmlValidation=false xmlNamespaceAware=false
   
   !-- Defines a cluster for this node,
By defining this element, means that every manager will be changed.
  
  
  

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



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

2003-10-01 Thread 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 /
  +!-- Note : To disable connection timeouts, set connectionTimeout value
  + to -1 --
  + 
  + !-- Note : To use gzip compression you could set the following properties :
  + 
  +compression=on 
  +compressionMinSize=2048 
  +noCompressionUserAgents=gozilla, traviata 
  +compressableMimeType=text/html,text/xml
  + --
   
   !-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --
   !--
  
  
  

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



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

2003-08-03 Thread 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). --
   
   !-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
  -Engine name=Standalone defaultHost=localhost debug=0 jmvRoute=jvm1
 
  +Engine name=Standalone defaultHost=localhost debug=0 jvmRoute=jvm1
 
   -- 

   !-- Define the top level container in our container hierarchy --
  
  
  

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



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

2003-08-03 Thread 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 /
   --
   
   !-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 --
  
  
  

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



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

2003-08-02 Thread 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 @@
   Connector port=8443 
  maxThreads=150 minSpareThreads=25 maxSpareThreads=75
  enableLookups=false disableUploadTimeout=true
  -   acceptCount=100 debug=0 scheme=https secure=true
  -  Factory clientAuth=false protocol=TLS /
  -/Connector
  +   acceptCount=100 debug=0 scheme=https secure=true
  +   clientAuth=false sSLprotocol=TLS /
   --
   
   !-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 --
  
  
  

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



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

2003-07-29 Thread 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 @@
   
   !-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 --
   Connector port=8009 
  -   maxThreads=100 minSpareThreads=1 maxSpareThreads=10
  -   enableLookups=false redirectPort=8443
  -   acceptCount=10 debug=0
  +   enableLookups=false redirectPort=8443 debug=0
  protocol=AJP/1.3 /
   
   !-- Define a Proxied HTTP/1.1 Connector on port 8082 --
  
  
  

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



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

2003-07-28 Thread 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 @@
   --
   
   !-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 --
  -Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  -   port=8080 minProcessors=5 maxProcessors=100
  -   enableLookups=true redirectPort=8443 acceptCount=100
  +Connector port=8080
  +   maxThreads=100 minSpareThreads=1 maxSpareThreads=10
  +   enableLookups=false redirectPort=8443 acceptCount=100
  debug=0 connectionTimeout=2 
  disableUploadTimeout=true /
   !-- Note : To disable connection timeouts, set connectionTimeout value
  @@ -99,28 +99,27 @@
   
   !-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --
   !--
  -Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  -   port=8443 minProcessors=5 maxProcessors=75
  -   enableLookups=true disableUploadTimeout=true
  -   acceptCount=100 debug=0 scheme=https secure=true
  -  Factory className=org.apache.coyote.tomcat5.CoyoteServerSocketFactory
  -   clientAuth=false protocol=TLS /
  +Connector port=8443 
  +   maxThreads=50 minSpareThreads=1 maxSpareThreads=5
  +   enableLookups=false disableUploadTimeout=true
  +   acceptCount=100 debug=0 scheme=https secure=true
  +  Factory clientAuth=false protocol=TLS /
   /Connector
   --
   
   !-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 --
  -Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  -   port=8009 minProcessors=5 maxProcessors=75
  -   enableLookups=true redirectPort=8443
  +Connector port=8009 
  +   maxThreads=100 minSpareThreads=1 maxSpareThreads=10
  +   enableLookups=false redirectPort=8443
  acceptCount=10 debug=0
  -   protocolHandlerClassName=org.apache.jk.server.JkCoyoteHandler/
  +   protocol=AJP/1.3 /
   
   !-- Define a Proxied HTTP/1.1 Connector on port 8082 --
   !-- See proxy documentation for more information about using this. --
   !--
  -Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  -   port=8082 minProcessors=5 maxProcessors=75
  -   enableLookups=true
  +Connector port=8082 
  +   maxThreads=100 minSpareThreads=1 maxSpareThreads=10
  +   enableLookups=false
  acceptCount=100 debug=0 connectionTimeout=2
  proxyPort=80 disableUploadTimeout=true /
   --
  
  
  

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



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

2003-07-28 Thread 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 @@
   
   !-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 --
   Connector port=8080
  -   maxThreads=100 minSpareThreads=1 maxSpareThreads=10
  +   maxThreads=150 minSpareThreads=25 maxSpareThreads=75
  enableLookups=false redirectPort=8443 acceptCount=100
  debug=0 connectionTimeout=2 
  disableUploadTimeout=true /
  -!-- Note : To disable connection timeouts, set connectionTimeout value
  - to -1 --
   
   !-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --
   !--
   Connector port=8443 
  -   maxThreads=50 minSpareThreads=1 maxSpareThreads=5
  +   maxThreads=150 minSpareThreads=25 maxSpareThreads=75
  enableLookups=false disableUploadTimeout=true
  acceptCount=100 debug=0 scheme=https secure=true
 Factory clientAuth=false protocol=TLS /
  @@ -118,7 +116,7 @@
   !-- See proxy documentation for more information about using this. --
   !--
   Connector port=8082 
  -   maxThreads=100 minSpareThreads=1 maxSpareThreads=10
  +   maxThreads=150 minSpareThreads=25 maxSpareThreads=75
  enableLookups=false
  acceptCount=100 debug=0 connectionTimeout=2
  proxyPort=80 disableUploadTimeout=true /
  
  
  

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



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

2003-04-12 Thread 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 @@
   Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  port=8443 minProcessors=5 maxProcessors=75
  enableLookups=true disableUploadTimeout=true
  -acceptCount=100 debug=0 scheme=https secure=true
  +   acceptCount=100 debug=0 scheme=https secure=true
 Factory className=org.apache.coyote.tomcat5.CoyoteServerSocketFactory
  clientAuth=false protocol=TLS /
   /Connector
  @@ -226,7 +226,93 @@
   !--
   Cluster className=org.apache.catalina.cluster.JGCluster/
   --
  +!-- Defines a cluster for this node,
  + By defining this element, means that every manager will be changed.
  + So when running a cluster, only make sure that you have webapps in 
there
  + that need to be clustered and remove the other ones.
  + A cluster has the following parameters:
  +
  + className = the fully qualified name of the cluster class
  +
  + 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
  +
  + mcastFrequency = the number of milliseconds in between sending a I'm 
alive heartbeat
  +
  + mcastDropTime = the number a milliseconds before a node is considered 
dead if no heartbeat is received
  +
  + tcpThreadCount = the number of threads to handle incoming replication 
requests, optimal would be the same amount of threads as nodes 
  +
  + tcpListenAddress = the listen address (bind address) for TCP cluster 
request on this host, 
  +in case of multiple ethernet cards.
  +auto means that address becomes
  +InetAddress.getLocalHost().getHostAddress()
  +
  + tcpListenPort = the tcp listen port
  +
  + tcpSelectorTimeout = the timeout (ms) for the Selector.select() method 
in case the OS
  +  has a wakup bug in java.nio. Set to 0 for no 
timeout
  +
  + printToScreen = true means that managers will also print to std.out
  +
  + expireSessionsOnShutdown = true means that 
  +
  + 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:
  +%
  +HashMap map = (HashMap)session.getAttribute(map);
  +map.put(key,value);
  +%
  +-- 
  +
  +!-- When uncommenting the cluster, REMEMBER to uncomment the replication 
Valve below as well
  +
  +
  +Cluster  className=org.apache.catalina.cluster.tcp.SimpleTcpCluster
  +  name=FilipsCluster
  +  debug=10
  +  serviceclass=org.apache.catalina.cluster.mcast.McastService
  +  mcastAddr=228.0.0.4
  +  mcastPort=45564
  +  mcastFrequency=500
  +  mcastDropTime=3000
  +  tcpThreadCount=2
  +  tcpListenAddress=auto
  +  tcpListenPort=4001
  +  tcpSelectorTimeout=100
  +  printToScreen=false
  +  expireSessionsOnShutdown=false
  +  useDirtyFlag=true
  +/
  +--
  +!--
  +When configuring for clustering, you also add in a valve to catch all 
the requests
  +coming in, at the end of the request, the session may or may not be 
replicated.
  +A session is replicated if and only if all the conditions are met:
  +1. useDirtyFlag is true or setAttribute or removeAttribute has been 
called AND
  +2. a session exists (has been created)
  +3. the request is not trapped by the filter attribute
  

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

2003-04-12 Thread 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
 --
   
  -!-- Uncomment this to cluster this host using JavaGroups. The
  - protocol attribute can be used to configure the JavaGroups
  - network stack (the defaults are used if it's not specified). --
  -!--
  -Cluster className=org.apache.catalina.cluster.JGCluster/
  ---
   !-- Defines a cluster for this node,
By defining this element, means that every manager will be changed.
So when running a cluster, only make sure that you have webapps in 
there
  
  
  

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



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

2002-12-07 Thread 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 @@
   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
  
  
  

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




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

2002-12-03 Thread 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 @@
   
   !-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 --
   Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  -   port=8080 minProcessors=5 maxProcessors=75
  -   enableLookups=true redirectPort=8443
  -   acceptCount=10 debug=0 connectionTimeout=2
  -   useURIValidationHack=false /
  +   port=8080 minProcessors=5 maxProcessors=100
  +   enableLookups=trueredirectPort=8443 acceptCount=100
  +   debug=0 connectionTimeout=2 
  +   disableUploadTimeout=true /
   !-- Note : To disable connection timeouts, set connectionTimeout value
to -1 --
   
  @@ -95,9 +95,8 @@
   !--
   Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  port=8443 minProcessors=5 maxProcessors=75
  -   enableLookups=true
  -acceptCount=10 debug=0 scheme=https secure=true
  -   useURIValidationHack=false
  +   enableLookups=true disableUploadTimeout=true
  +acceptCount=100 debug=0 scheme=https secure=true
 Factory className=org.apache.coyote.tomcat5.CoyoteServerSocketFactory
  clientAuth=false protocol=TLS /
   /Connector
  @@ -107,8 +106,7 @@
   Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  port=8009 minProcessors=5 maxProcessors=75
  enableLookups=true redirectPort=8443
  -   acceptCount=10 debug=0 connectionTimeout=2
  -   useURIValidationHack=false
  +   acceptCount=10 debug=0
  protocolHandlerClassName=org.apache.jk.server.JkCoyoteHandler/
   
   !-- Define a Proxied HTTP/1.1 Connector on port 8082 --
  @@ -117,8 +115,8 @@
   Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  port=8082 minProcessors=5 maxProcessors=75
  enableLookups=true
  -   acceptCount=10 debug=0 connectionTimeout=2
  -   proxyPort=80 useURIValidationHack=false /
  +   acceptCount=100 debug=0 connectionTimeout=2
  +   proxyPort=80 disableUploadTimeout=true /
   --
   
   !-- An Engine represents the entry point (within Catalina) that processes
  
  
  

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




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

2002-12-03 Thread 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 @@
   !-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 --
   Connector className=org.apache.coyote.tomcat5.CoyoteConnector
  port=8080 minProcessors=5 maxProcessors=100
  -   enableLookups=trueredirectPort=8443 acceptCount=100
  +   enableLookups=true redirectPort=8443 acceptCount=100
  debug=0 connectionTimeout=2 
  disableUploadTimeout=true /
   !-- Note : To disable connection timeouts, set connectionTimeout value
  
  
  

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




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

2002-10-22 Thread 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). --
   
  +!-- You should set jvmRoute to support load-balancing via JK/JK2 ie :
  +Engine name=Standalone defaultHost=localhost debug=0 jmvRoute=jvm1
 
  +-- 
  + 
   !-- Define the top level container in our container hierarchy --
   Engine name=Standalone defaultHost=localhost debug=0
   
  
  
  

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




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

2002-10-11 Thread 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/
   
  -!-- 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. --
   !--
  @@ -128,22 +121,6 @@
  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
  @@ -276,154 +253,13 @@
   
   !-- Tomcat Root Context --
   !--
  -  Context path= docBase=ROOT debug=0/
  +  Context path= docBase=ROOT debug=0
   --
   
  -!-- Tomcat Examples Context --
  -Context path=/examples docBase=examples debug=0
  - reloadable=true crossContext=true
  -  Logger className=org.apache.catalina.logger.FileLogger
  - prefix=localhost_examples_log. suffix=.txt
  -   timestamp=true/
  -  Ejb   name=ejb/EmplRecord type=Entity
  - home=com.wombat.empl.EmployeeRecordHome
  -   remote=com.wombat.empl.EmployeeRecord/
  -
  -  !-- If you wanted the examples app to be able to edit the
  -   user database, you would uncomment the following entry.
  -   Of course, you would want to enable security on the
  -   application as well, so this is not done by default!
  -   The database object could be accessed like this:
  -
  -   Context initCtx = new InitialContext();
  -   Context envCtx = (Context) initCtx.lookup(java:comp/env);
  -   UserDatabase database =
  -(UserDatabase) envCtx.lookup(userDatabase);
  -  --
  -!--
  -  ResourceLink name=userDatabase global=UserDatabase
  -type=org.apache.catalina.UserDatabase/
  ---
  -
  -
  -  !-- PersistentManager: Uncomment the section below to test Persistent
  -Sessions.
  -
  -   saveOnRestart: If true, all active sessions will be saved
  - to the Store when Catalina is shutdown, regardless of
  - other settings. All Sessions found in the Store will be
  - loaded on startup. Sessions past their expiration are
  - ignored in both cases.
  -   maxActiveSessions: If 0 or greater, having too many active
  - sessions will result in some being swapped out. minIdleSwap
  - limits this. -1 means unlimited sessions are allowed.
  - 0 means sessions will almost always be swapped out after
  - use - this will be noticeably slow for your users.
  -   minIdleSwap: Sessions must be idle for at least this long
  - (in seconds) before they will be swapped out due to
  -   maxActiveSessions. This avoids thrashing when the site is
  - highly active. -1 or 0 means there is no minimum - sessions
  - can be swapped out at any time.
  -   maxIdleSwap: Sessions will be swapped out if idle for this
  - long (in seconds). If minIdleSwap is higher, then it will
  - override this. 

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

2002-10-07 Thread 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 @@

   
 !-- Add the following attributes if you want to turn XML validation
  -   on.i remember to comment the Host element above. --
  +   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--
 !--
 Host name=localhost debug=0 appBase=webapps
  unpackWARs=true autoDeploy=true
  
  
  

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




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

2002-09-19 Thread 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:   mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]




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

2002-08-16 Thread 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 /
  -!-- Note : To disable connection timeouts, set connectionTimeout value 
  +!-- Note : To disable connection timeouts, set connectionTimeout value
to -1 --
   
   !-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --
  @@ -220,7 +220,7 @@
 --
   
 !-- Define the default virtual host --
  -  Host name=localhost debug=0 appBase=webapps 
  +  Host name=localhost debug=0 appBase=webapps
  unpackWARs=true autoDeploy=true
   
   !-- Normally, users must authenticate themselves to each web app
  @@ -293,22 +293,22 @@
   --
   
   
  -  !-- PersistentManager: Uncomment the section below to test Persistent 
  +  !-- PersistentManager: Uncomment the section below to test Persistent
   Sessions.
  - 
  +
  saveOnRestart: If true, all active sessions will be saved
to the Store when Catalina is shutdown, regardless of
  - other settings. All Sessions found in the Store will be 
  + other settings. All Sessions found in the Store will be
loaded on startup. Sessions past their expiration are
ignored in both cases.
  -   maxActiveSessions: If 0 or greater, having too many active 
  +   maxActiveSessions: If 0 or greater, having too many active
sessions will result in some being swapped out. minIdleSwap
limits this. -1 means unlimited sessions are allowed.
0 means sessions will almost always be swapped out after
use - this will be noticeably slow for your users.
  minIdleSwap: Sessions must be idle for at least this long
  - (in seconds) before they will be swapped out due to 
  -   maxActiveSessions. This avoids thrashing when the site is 
  + (in seconds) before they will be swapped out due to
  +   maxActiveSessions. This avoids thrashing when the site is
highly active. -1 or 0 means there is no minimum - sessions
can be swapped out at any time.
  maxIdleSwap: Sessions will be swapped out if idle for this
  @@ -319,13 +319,13 @@
If set to = 0, guarantees that all sessions found in the
Store will be loaded on startup.
  maxIdleBackup: Sessions will be backed up (saved to the Store,
  - but left in active memory) if idle for this long (in seconds), 
  + but left in active memory) if idle for this long (in seconds),
and all sessions found in the Store will be loaded on startup.
If set to -1 sessions will not be backed up, 0 means they
should be backed up shortly after being used.
   
  To clear sessions from the Store, set maxActiveSessions, maxIdleSwap,
  -   and minIdleBackup all to -1, saveOnRestart to false, then restart 
  +   and minIdleBackup all to -1, saveOnRestart to false, then restart
  Catalina.
 --
  !--
  @@ -346,7 +346,7 @@
 Resource name=jdbc/EmployeeAppDb auth=SERVLET
   type=javax.sql.DataSource/
 ResourceParams name=jdbc/EmployeeAppDb
  -parameternameuser/namevaluesa/value/parameter
  +parameternameusername/namevaluesa/value/parameter
   parameternamepassword/namevalue/value/parameter
   parameternamedriverClassName/name
 valueorg.hsql.jdbcDriver/value/parameter
  @@ -361,7 +361,7 @@
 valuelocalhost/value
   /parameter
 /ResourceParams
  -  ResourceLink name=linkToGlobalResource 
  +  ResourceLink name=linkToGlobalResource
   global=simpleValue
   type=java.lang.Integer/
   /Context
  
  
  

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