You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/12/22 19:23:22 UTC
svn commit: r489714 - in /cocoon/trunk:
core/cocoon-webapp/src/main/webapp/WEB-INF/
tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/
tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/...
Author: cziegeler
Date: Fri Dec 22 10:23:22 2006
New Revision: 489714
URL: http://svn.apache.org/viewvc?view=rev&rev=489714
Log:
Update to servlet api 2.4 and add Spring request listener to support custom spring scopes
Modified:
cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml
cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/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?view=diff&rev=489714&r1=489713&r2=489714
==============================================================================
--- 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 Dec 22 10:23:22 2006
@@ -15,16 +15,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
<!--+
| This is the Cocoon web-app configurations file
+-->
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<web-app version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<!-- Context Configuration ========================================== -->
@@ -47,9 +44,9 @@
+-->
<filter>
- <filter-name>CocoonMultipartFilter</filter-name>
- <display-name>Cocoon multipart filter</display-name>
<description>Multipart MIME handling filter for Cocoon</description>
+ <display-name>Cocoon multipart filter</display-name>
+ <filter-name>CocoonMultipartFilter</filter-name>
<filter-class>org.apache.cocoon.servlet.multipart.MultipartFilter</filter-class>
</filter>
@@ -58,9 +55,9 @@
+-->
<filter>
- <filter-name>CocoonDebugFilter</filter-name>
- <display-name>Cocoon debug filter</display-name>
<description>Log debug information about each request</description>
+ <display-name>Cocoon debug filter</display-name>
+ <filter-name>CocoonDebugFilter</filter-name>
<filter-class>org.apache.cocoon.servlet.DebugFilter</filter-class>
</filter>
@@ -88,18 +85,27 @@
<!--+
| Declare Spring context listener which sets up the Spring Application Context
- | containing all Cocoon components (and user defined as well).
+ | containing all Cocoon components (and user defined beans as well).
+-->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
+ <!--+
+ | Declare Spring request listener which sets up the required RequestAttributes
+ | to support Springs and Cocoon custom bean scopes like the request scope or the
+ | session scope.
+ +-->
+ <listener>
+ <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+ </listener>
+
<!-- Servlet Configuration ========================================== -->
<servlet>
- <servlet-name>Cocoon</servlet-name>
- <display-name>Cocoon</display-name>
<description>Cocoon demo web application</description>
+ <display-name>Cocoon</display-name>
+ <servlet-name>Cocoon</servlet-name>
<servlet-class>org.apache.cocoon.servlet.SitemapServlet</servlet-class>
@@ -112,9 +118,9 @@
<!-- Experimental servlet that dispatch to Spring managed block servlets -->
<servlet>
- <servlet-name>DispatcherServlet</servlet-name>
- <display-name>DispatcherServlet</display-name>
<description>Cocoon blocks dispatcher</description>
+ <display-name>DispatcherServlet</display-name>
+ <servlet-name>DispatcherServlet</servlet-name>
<servlet-class>org.apache.cocoon.blocks.DispatcherServlet</servlet-class>
@@ -204,8 +210,8 @@
<!-- Sample environment entry for the NamingInputModule -->
<env-entry>
<env-entry-name>greeting</env-entry-name>
- <env-entry-value>Hello, World</env-entry-value>
<env-entry-type>java.lang.String</env-entry-type>
+ <env-entry-value>Hello, World</env-entry-value>
</env-entry>
</web-app>
Modified: cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml?view=diff&rev=489714&r1=489713&r2=489714
==============================================================================
--- cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (original)
+++ cocoon/trunk/tools/archetypes/cocoon-22-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml Fri Dec 22 10:23:22 2006
@@ -19,12 +19,10 @@
<!--+
| This is the Cocoon web-app configurations file
+-->
-
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<web-app version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<!-- Servlet Filters ================================================ -->
@@ -32,9 +30,9 @@
| Declare a filter for multipart MIME handling
+-->
<filter>
- <filter-name>CocoonMultipartFilter</filter-name>
- <display-name>Cocoon multipart filter</display-name>
<description>Multipart MIME handling filter for Cocoon</description>
+ <display-name>Cocoon multipart filter</display-name>
+ <filter-name>CocoonMultipartFilter</filter-name>
<filter-class>org.apache.cocoon.servlet.multipart.MultipartFilter</filter-class>
</filter>
@@ -42,9 +40,9 @@
| Declare a filter for debugging incoming request
+-->
<filter>
- <filter-name>CocoonDebugFilter</filter-name>
- <display-name>Cocoon debug filter</display-name>
<description>Log debug information about each request</description>
+ <display-name>Cocoon debug filter</display-name>
+ <filter-name>CocoonDebugFilter</filter-name>
<filter-class>org.apache.cocoon.servlet.DebugFilter</filter-class>
</filter>
@@ -71,16 +69,25 @@
<!--+
| Declare Spring context listener which sets up the Spring Application Context
- | containing all Cocoon components (and user defined as well).
+ | containing all Cocoon components (and user defined beans as well).
+-->
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
+ <!--+
+ | Declare Spring request listener which sets up the required RequestAttributes
+ | to support Springs and Cocoon custom bean scopes like the request scope or the
+ | session scope.
+ +-->
+ <listener>
+ <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+ </listener>
+
<servlet>
- <servlet-name>DispatcherServlet</servlet-name>
- <display-name>DispatcherServlet</display-name>
<description>Cocoon blocks dispatcher</description>
+ <display-name>DispatcherServlet</display-name>
+ <servlet-name>DispatcherServlet</servlet-name>
<servlet-class>org.apache.cocoon.blocks.DispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
Modified: cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/web.xml?view=diff&rev=489714&r1=489713&r2=489714
==============================================================================
--- cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/web.xml (original)
+++ cocoon/trunk/tools/cocoon-block-deployer/cocoon-deployer-plugin/src/main/resources/org/apache/cocoon/maven/deployer/monolithic/WEB-INF/web.xml Fri Dec 22 10:23:22 2006
@@ -18,11 +18,11 @@
<!--+
| This is the Cocoon web-app configurations file
+-->
- <!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
- <web-app>
+<web-app version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+
<!-- Context Configuration ========================================== -->
<!--+
| Set a context property useful to allow you to ProxyPass your
@@ -41,9 +41,9 @@
| Declare a filter for multipart MIME handling
+-->
<filter>
- <filter-name>CocoonMultipartFilter</filter-name>
- <display-name>Cocoon multipart filter</display-name>
<description>Multipart MIME handling filter for Cocoon</description>
+ <display-name>Cocoon multipart filter</display-name>
+ <filter-name>CocoonMultipartFilter</filter-name>
<filter-class>org.apache.cocoon.servlet.multipart.MultipartFilter</filter-class>
</filter>
@@ -51,9 +51,9 @@
| Declare a filter for debugging incomming request
+-->
<filter>
- <filter-name>CocoonDebugFilter</filter-name>
- <display-name>Cocoon debug filter</display-name>
<description>Log debug information about each request</description>
+ <display-name>Cocoon debug filter</display-name>
+ <filter-name>CocoonDebugFilter</filter-name>
<filter-class>org.apache.cocoon.servlet.DebugFilter</filter-class>
</filter>
@@ -76,22 +76,31 @@
<!-- Servlet Context Listener ======================================= -->
- <!--+
- | Declare Spring context listener which sets up the Spring Application Context
- | containing all Cocoon components (and user defined as well).
- +-->
- <listener>
- <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
+ <!--+
+ | Declare Spring context listener which sets up the Spring Application Context
+ | containing all Cocoon components (and user defined beans as well).
+ +-->
+ <listener>
+ <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+ </listener>
+
+ <!--+
+ | Declare Spring request listener which sets up the required RequestAttributes
+ | to support Springs and Cocoon custom bean scopes like the request scope or the
+ | session scope.
+ +-->
+ <listener>
+ <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
+ </listener>
<!-- Servlet Configuration ========================================== -->
<!--+
| Cocoon blocks servlet that dispatch to Spring managed block servlets
+-->
<servlet>
- <servlet-name>DispatcherServlet</servlet-name>
- <display-name>DispatcherServlet</display-name>
<description>Cocoon blocks dispatcher</description>
+ <display-name>DispatcherServlet</display-name>
+ <servlet-name>DispatcherServlet</servlet-name>
<servlet-class>org.apache.cocoon.blocks.DispatcherServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>