cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From reinh...@apache.org
Subject svn commit: r407804 - /cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml
Date Fri, 19 May 2006 14:27:22 GMT
Author: reinhard
Date: Fri May 19 07:27:21 2006
New Revision: 407804

URL: http://svn.apache.org/viewvc?rev=407804&view=rev
Log:
document Carsten's latest changes to classloading

Modified:
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml

Modified: cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml?rev=407804&r1=407803&r2=407804&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml Fri May 19 07:27:21 2006
@@ -44,22 +44,16 @@
   <servlet>
     <servlet-name>Cocoon</servlet-name>
     <display-name>Cocoon</display-name>
-    <description>Cocoon</description>
+    <description>Cocoon demo web application</description>
 
-    <!--
-      The paranoid servlet class, to be used instead of regular one when
-      having conflicts between libraries used by Cocoon and the servlet
-      container.
-    -->
     <servlet-class>org.apache.cocoon.servlet.CocoonServlet</servlet-class>
+    <!-- If you don't want to use the ParanoidClassLoader and want to rely
+         on the normal context classloader, remove the classloader-class
+         parameter -->
     <init-param>
       <param-name>classloader-class</param-name>
       <param-value>org.apache.cocoon.servlet.ParanoidClassLoader</param-value>
     </init-param>
-    <!--
-      The regular servlet class (trusts the servlet container classloader)
-    <servlet-class>org.apache.cocoon.servlet.CocoonServlet</servlet-class>
-      -->
 
     <!--
       Set encoding used by the container. If not set the ISO-8859-1 encoding



Mime
View raw message