Return-Path: 
 <tomcat-dev-return-29675-apmail-jakarta-tomcat-dev-archive=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org
Received: (qmail 93107 invoked by uid 500); 12 Oct 2001 20:09:35 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:tomcat-dev-help@jakarta.apache.org>
list-unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
list-post: <mailto:tomcat-dev@jakarta.apache.org>
Reply-To: tomcat-dev@jakarta.apache.org
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 93091 invoked by uid 500); 12 Oct 2001 20:09:35 -0000
Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org
Date: 12 Oct 2001 20:04:47 -0000
Message-ID: <20011012200447.73435.qmail@icarus.apache.org>
From: remm@apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/conf web.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

remm        01/10/12 13:04:47

  Modified:    catalina/src/conf web.xml
  Log:
  - Port the packaging changes to the HEAD branch.
  
  Revision  Changes    Path
  1.26      +12 -4     jakarta-tomcat-4.0/catalina/src/conf/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/web.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- web.xml	2001/10/11 04:11:55	1.25
  +++ web.xml	2001/10/12 20:04:47	1.26
  @@ -158,6 +158,11 @@
     <!--                       relative to the context root, instead of       -->
     <!--                       the server root?  (0=false, 1=true) [0]        -->
   
  +  <!-- IMPORTANT: To use the SSI servlet, you also need to rename the       -->
  +  <!--            $CATALINA_HOME/server/lib/servlets-ssi.renametojar file   -->
  +  <!--            to $CATALINA_HOME/server/lib/servlets-ssi.jar             -->
  +
  +<!--
     <servlet>
       <servlet-name>ssi</servlet-name>
       <servlet-class>org.apache.catalina.servlets.SsiInvokerServlet</servlet-class>
  @@ -177,10 +182,9 @@
         <param-name>isVirtualWebappRelative</param-name>
         <param-value>0</param-value>
       </init-param>
  -<!--
       <load-on-startup>4</load-on-startup>
  --->
     </servlet>
  +-->
   
   
     <!-- Common Gateway Includes (CGI) processing servlet, which supports     -->
  @@ -202,6 +206,11 @@
     <!--   debug               Debugging detail level for messages logged     -->
     <!--                       by this servlet.  [0]                          -->
   
  +  <!-- IMPORTANT: To use the CGI servlet, you also need to rename the       -->
  +  <!--            $CATALINA_HOME/server/lib/servlets-cgi.renametojar file   -->
  +  <!--            to $CATALINA_HOME/server/lib/servlets-cgi.jar             -->
  +
  +<!--
     <servlet>
       <servlet-name>cgi</servlet-name>
       <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
  @@ -217,10 +226,9 @@
         <param-name>cgiPathPrefix</param-name>
         <param-value>WEB-INF/cgi</param-value>
       </init-param>
  -<!--
        <load-on-startup>5</load-on-startup>
  --->
      </servlet>
  +-->
   
   
     <!-- ================ Built In Servlet Mappings ========================= -->