tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/conf server.xml
Date Wed, 06 Oct 2004 15:24:59 GMT
remm        2004/10/06 08:24:59

  Modified:    catalina/src/conf server.xml
  Log:
  - Cleanup: remove all "debug" attributes.
  
  Revision  Changes    Path
  1.39      +17 -31    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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- server.xml	29 Sep 2004 18:23:55 -0000	1.38
  +++ server.xml	6 Oct 2004 15:24:59 -0000	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="20000" 
  -               disableUploadTimeout="true" />
  +               connectionTimeout="20000" 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="20000"
  +               enableLookups="false" acceptCount="100" connectionTimeout="20000"
                  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  className="org.apache.catalina.realm.JDBCRealm" debug="99"
  +      <Realm  className="org.apache.catalina.realm.JDBCRealm"
                driverName="oracle.jdbc.driver.OracleDriver"
             connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
            connectionName="scott" connectionPassword="tiger"
  @@ -187,7 +176,7 @@
         -->
   
         <!--
  -      <Realm  className="org.apache.catalina.realm.JDBCRealm" debug="99"
  +      <Realm  className="org.apache.catalina.realm.JDBCRealm"
                driverName="sun.jdbc.odbc.JdbcOdbcDriver"
             connectionURL="jdbc:odbc:CATALINA"
                 userTable="users" userNameCol="user_name" userCredCol="user_pass"
  @@ -197,7 +186,7 @@
         <!-- Define the default virtual host
              Note: XML Schema validation will not work with Xerces 2.2.
          -->
  -      <Host name="localhost" debug="0" appBase="webapps"
  +      <Host name="localhost" appBase="webapps"
          unpackWARs="true" autoDeploy="true"
          xmlValidation="false" xmlNamespaceAware="false">
   
  @@ -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. -->
           <!--
  -        <Valve className="org.apache.catalina.authenticator.SingleSignOn"
  -                   debug="0"/>
  +        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
           -->
   
           <!-- Access log processes all requests for this virtual host.  By
  
  
  

---------------------------------------------------------------------
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