tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From funk...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/conf server.xml
Date Mon, 02 Jun 2003 01:29:22 GMT
funkman     2003/06/01 18:29:22

  Modified:    catalina/src/conf server.xml
  Log:
  Remove warp/webapp declaration since it is deprecated.
  
  Revision  Changes    Path
  1.68      +21 -61    jakarta-tomcat-4.0/catalina/src/conf/server.xml
  
  Index: server.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server.xml,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- server.xml	9 Dec 2002 13:22:40 -0000	1.67
  +++ server.xml	2 Jun 2003 01:29:22 -0000	1.68
  @@ -14,8 +14,8 @@
   
   
     <!-- 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 
  +  <!-- 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"
  @@ -94,7 +94,7 @@
                  enableLookups="true" redirectPort="8443"
                  acceptCount="100" debug="0" connectionTimeout="20000"
                  useURIValidationHack="false" disableUploadTimeout="true" />
  -    <!-- 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 -->
  @@ -102,7 +102,7 @@
       <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
                  port="8443" minProcessors="5" maxProcessors="75"
                  enableLookups="true"
  -	       acceptCount="100" debug="0" scheme="https" secure="true"
  +           acceptCount="100" debug="0" scheme="https" secure="true"
                  useURIValidationHack="false" disableUploadTimeout="true">
         <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
                  clientAuth="false" protocol="TLS" />
  @@ -157,9 +157,9 @@
            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" jmvRoute="jvm1">
  +    -->
  +
       <!-- Define the top level container in our container hierarchy -->
       <Engine name="Standalone" defaultHost="localhost" debug="0">
   
  @@ -231,7 +231,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
  @@ -265,7 +265,7 @@
                directory.-->
           <Logger className="org.apache.catalina.logger.FileLogger"
                    directory="logs"  prefix="localhost_log." suffix=".txt"
  -	        timestamp="true"/>
  +            timestamp="true"/>
   
           <!-- Define properties for each web application.  This is only needed
                if you want to set non-default properties, or have web application
  @@ -282,7 +282,7 @@
                    reloadable="true" crossContext="true">
             <Logger className="org.apache.catalina.logger.FileLogger"
                        prefix="localhost_examples_log." suffix=".txt"
  -        	  timestamp="true"/>
  +              timestamp="true"/>
             <Ejb   name="ejb/EmplRecord" type="Entity"
                    home="com.wombat.empl.EmployeeRecordHome"
                  remote="com.wombat.empl.EmployeeRecord"/>
  @@ -304,22 +304,22 @@
   -->
   
   
  -          <!-- PersistentManager: Uncomment the section below to test Persistent 
  -		       Sessions.
  -                         
  +          <!-- 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 or 0 means unlimited sessions are allowed.
                    If it is not possible to swap sessions new sessions will
                    be rejected.
                    This avoids thrashing when the site is highly active.
                  minIdleSwap: Sessions must be idle for at least this long
  -                 (in seconds) before they will be swapped out due to 
  +                 (in seconds) before they will be swapped out due to
                    activity.
                    0 means sessions will almost always be swapped out after
                    use - this will be noticeably slow for your users.
  @@ -331,16 +331,16 @@
                    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.
             -->
  -		  <!--
  +          <!--
             <Manager className="org.apache.catalina.session.PersistentManager"
                 debug="0"
                 saveOnRestart="true"
  @@ -350,7 +350,7 @@
                 maxIdleBackup="-1">
                   <Store className="org.apache.catalina.session.FileStore"/>
             </Manager>
  -		  -->
  +          -->
             <Environment name="maxExemptions" type="java.lang.Integer"
                         value="15"/>
             <Parameter name="context.param.name" value="context.param.value"
  @@ -373,7 +373,7 @@
                 <value>localhost</value>
               </parameter>
             </ResourceParams>
  -          <ResourceLink name="linkToGlobalResource" 
  +          <ResourceLink name="linkToGlobalResource"
                       global="simpleValue"
                       type="java.lang.Integer"/>
           </Context>
  @@ -384,45 +384,5 @@
   
     </Service>
   
  -  <!-- The MOD_WEBAPP connector is used to connect Apache 1.3 with Tomcat 4.0
  -       as its servlet container. Please read the README.txt file coming with
  -       the WebApp Module distribution on how to build it.
  -       (Or check out the "jakarta-tomcat-connectors/webapp" CVS repository)
  -
  -       To configure the Apache side, you must ensure that you have the
  -       "ServerName" and "Port" directives defined in "httpd.conf".  Then,
  -       lines like these to the bottom of your "httpd.conf" file:
  -
  -         LoadModule webapp_module libexec/mod_webapp.so
  -         WebAppConnection warpConnection warp localhost:8008
  -         WebAppDeploy examples warpConnection /examples/
  -
  -       The next time you restart Apache (after restarting Tomcat, if needed)
  -       the connection will be established, and all applications you make
  -       visible via "WebAppDeploy" directives can be accessed through Apache.
  -  -->
  -
  -  <!-- Define an Apache-Connector Service -->
  -<!--
  -  <Service name="Tomcat-Apache">
  -
  -    <Connector className="org.apache.catalina.connector.warp.WarpConnector"
  -     port="8008" minProcessors="5" maxProcessors="75"
  -     enableLookups="true" appBase="webapps"
  -     acceptCount="10" debug="0"/>
  -
  -    <Engine className="org.apache.catalina.connector.warp.WarpEngine"
  -     name="Apache" debug="0">
  -
  -      <Logger className="org.apache.catalina.logger.FileLogger"
  -              prefix="apache_log." suffix=".txt"
  -              timestamp="true"/>
  -
  -      <Realm className="org.apache.catalina.realm.MemoryRealm" />
  -
  -    </Engine>
  -
  -  </Service>
  --->
   
   </Server>
  
  
  

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


Mime
View raw message