You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@apache.org on 2001/07/23 15:43:59 UTC

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

pier        01/07/23 06:43:59

  Modified:    catalina/src/conf server.xml
  Log:
  Fixed small configuration problem and wrong documentation. Thanks to
  Muminur Rashid Choudhury <mu...@talk21.com>
  
  Revision  Changes    Path
  1.26      +8 -17     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.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- server.xml	2001/05/09 23:42:04	1.25
  +++ server.xml	2001/07/23 13:43:59	1.26
  @@ -277,27 +277,18 @@
     </Service>
   
     <!-- The MOD_WEBAPP connector is used to connect Apache 1.3 with Tomcat 4.0
  -       as its servlet container.  This is built by following these steps:
  +       as its servlet container. Please read the README.txt file coming with
  +       the WebApp Module distribution on how to build it.
   
  -       - cd {TOMCAT-SRC-HOME}/connectors
  -       - make
  -       - (Edit "Makedefs" as needed for your installation)
  -       - make
  -       - su root
  -       - cp connectors/apache-1.3/mod_webapp.so {APACHE_HOME}/libexec
  -       - exit
  -
  -       To configure the Apache side, you must ensure that you have a
  -       "ServerName" directive defined in "httpd.conf".  Then, lines like
  -       these to the bottom of your "httpd.conf" file:
  +       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
  -         WebAppMount examples warpConnection /examples/
  +         WebAppDeploy examples warpConnection /examples/
   
  -       Finally, modify the "defaultHost" attribute in the "Engine" directive
  -       below to match the "ServerName" setting defined in "https.conf".  The
  -       next time you restart Apache (after restarting Tomcat, if needed)
  +       The next time you restart Apache (after restarting Tomcat, if needed)
          the connection will be established, and all applications you make
          visible via "WebAppMount" directives can be accessed through Apache.
     -->
  @@ -313,7 +304,7 @@
   
       <!-- Replace "localhost" with what your Apache "ServerName" is set to -->
       <Engine className="org.apache.catalina.connector.warp.WarpEngine"
  -     name="Apache" defaultHost="localhost" debug="0" appBase="webapps">
  +     name="Apache" debug="0" appBase="webapps">
   
         <!-- Global logger unless overridden at lower levels -->
         <Logger className="org.apache.catalina.logger.FileLogger"