svn commit: r418085 - in /cocoon/trunk/core: cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java cocoon-webapp/src/main/webapp/WEB-INF/web.xml

[da...@apache.org]

Author: danielf
Date: Thu Jun 29 10:11:33 2006
New Revision: 418085

URL: http://svn.apache.org/viewvc?rev=418085&view=rev
Log:
Bug fix for the RequestProcessor and use the context listener setup of the Cocoon Spring bean factory as default. I know that it is a little bit early to use it as default, but it seem to work, and I think it deserves to get more heavy testing.

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java
    cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java?rev=418085&r1=418084&r2=418085&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestProcessor.java Thu Jun 29 10:11:33 2006
@@ -414,6 +414,7 @@
     protected boolean process(Environment environment) throws Exception {
         environment.startingProcessing();
         final int environmentDepth = EnvironmentHelper.markEnvironment();
+        EnvironmentHelper.enterProcessor(this.rootProcessor, environment);
         try {
             boolean result;
 

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=418085&r1=418084&r2=418085&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 Thu Jun 29 10:11:33 2006
@@ -38,6 +38,17 @@
     <param-value>/some/path/to/your/webapp</param-value>
     <description>An override of the session cookie path</description>
    </context-param-->
+   
+  <!-- Servlet Context Listener ======================================= -->
+  
+  <!--+
+      | Declare a context listener that sets up the Cocoon Spring bean factory
+      | and makes it available as a context parameter.
+      +-->
+  
+  <listener>
+  	<listener-class>org.apache.cocoon.servlet.CocoonServletListener</listener-class>
+  </listener>
 
   <!-- Servlet Configuration ========================================== -->
 
@@ -46,7 +57,7 @@
     <display-name>Cocoon</display-name>
     <description>Cocoon demo web application</description>
 
-    <servlet-class>org.apache.cocoon.servlet.CocoonServlet</servlet-class>
+    <servlet-class>org.apache.cocoon.servlet.SimpleServlet</servlet-class>
 
     <!--
       Set encoding used by the container. If not set the ISO-8859-1 encoding