cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject cvs commit: xml-cocoon2/src/webapp/WEB-INF web.xml
Date Mon, 10 Feb 2003 17:30:21 GMT
stefano     2003/02/10 09:30:21

  Modified:    src/webapp/WEB-INF web.xml
  Log:
  cleaning up the deployment descriptor
  - moving startup log level to WARN (we don't need more verbosity than that to start)
  - change the servlet name to Cocoon (Cocoon2 should never be used since it was our previous
codename)
  - some pretty printing
  - remove reference to tomcat since we are servlet-engine agnostic
  
  Revision  Changes    Path
  1.25      +35 -26    xml-cocoon2/src/webapp/WEB-INF/web.xml
  
  Index: web.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/web.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- web.xml	3 Feb 2003 19:15:36 -0000	1.24
  +++ web.xml	10 Feb 2003 17:30:21 -0000	1.25
  @@ -1,40 +1,33 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   
  -<!--
  -  This is the web-app configurations that allow Cocoon to work under
  -  Apache Tomcat. Please, follow the installation section of the
  -  documentation for more information about installing Cocoon on Tomcat
  --->
  +<!--+
  +    | This is the Cocoon web-app configurations file
  +    +-->
   
   <!DOCTYPE web-app
       PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
       "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
   
   <web-app>
  -  <display-name>Cocoon2 Demo</display-name>
  -  <description>Demo application for Cocoon2</description>
  + 
  +  <!-- Servlet Configuration ========================================== -->
  +
     <servlet>
  -    <servlet-name>Cocoon2</servlet-name>
  -    <display-name>Cocoon2</display-name>
  -    <description>The main Cocoon2 servlet</description>
  +    <servlet-name>Cocoon</servlet-name>
  +    <display-name>Cocoon</display-name>
  +    <description>Cocoon</description>
   
       <!--
  -      In cases you're facing class loader problems you can alternatively
  -      use the following servlet-class instead of the normal one
  -
  -      <servlet-class>org.apache.cocoon.servlet.ParanoidCocoonServlet</servlet-class>
  -    -->
  +      The regular servlet class (trusts the servlet container classloader)
  +      -->
       <servlet-class>org.apache.cocoon.servlet.CocoonServlet</servlet-class>
   
       <!--
  -      This parameter points to the main configuration file for Cocoon.
  -      Note that the path is specified in absolute notation but it will be
  -      resolved relative to the servlets webapp context path
  +      In cases you're facing class loading problems, you can alternatively
  +      use the following servlet-class instead of the above one
  +      
  +      <servlet-class>org.apache.cocoon.servlet.ParanoidCocoonServlet</servlet-class>
       -->
  -    <init-param>
  -      <param-name>configurations</param-name>
  -      <param-value>/WEB-INF/cocoon.xconf</param-value>
  -    </init-param>
   
       <!--
         This parameter tells cocoon to set the thread's context classloader to
  @@ -45,6 +38,16 @@
         <param-name>init-classloader</param-name>
         <param-value>false</param-value>
       </init-param>
  +    
  +    <!--
  +      This parameter points to the main configuration file for Cocoon.
  +      Note that the path is specified in absolute notation but it will be
  +      resolved relative to the servlets webapp context path
  +    -->
  +    <init-param>
  +      <param-name>configurations</param-name>
  +      <param-value>/WEB-INF/cocoon.xconf</param-value>
  +    </init-param>
   
       <!--
         This parameter indicates the configuration file of the LogKit management
  @@ -90,7 +93,7 @@
       -->
       <init-param>
         <param-name>log-level</param-name>
  -      <param-value>DEBUG</param-value>
  +      <param-value>WARN</param-value>
       </init-param>
   
       <!--
  @@ -319,6 +322,8 @@
       <load-on-startup>1</load-on-startup>
     </servlet>
   
  +  <!-- URL space mappings ============================================= -->
  +
     <!--
       Cocoon handles all the URL space assigned to the webapp using its sitemap.
       It is recommended to leave it unchanged. Under some circumstances though
  @@ -326,26 +331,30 @@
       to change this parameter.
     -->
     <servlet-mapping>
  -    <servlet-name>Cocoon2</servlet-name>
  +    <servlet-name>Cocoon</servlet-name>
       <url-pattern>/</url-pattern>
     </servlet-mapping>
  +  
     <!--
       Some servlet engines (Tomcat) have defaults which are not overriden
       by '/' mapping, but must be overriden explicitly.
     -->
     <servlet-mapping>
  -    <servlet-name>Cocoon2</servlet-name>
  +    <servlet-name>Cocoon</servlet-name>
       <url-pattern>*.jsp</url-pattern>
  +  
     </servlet-mapping>
     <!--
       Some servlet engines (WebLogic) have defaults which are not overriden
       by '/' mapping, but must be overriden explicitly.
     -->
     <servlet-mapping>
  -    <servlet-name>Cocoon2</servlet-name>
  +    <servlet-name>Cocoon</servlet-name>
       <url-pattern>*.html</url-pattern>
     </servlet-mapping>
   
  +  <!-- various MIME type mappings ====================================== -->
  +  
     <mime-mapping>
       <extension>css</extension>
       <mime-type>text/css</mime-type>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message