Title: [waffle-scm] [619] trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml: Updated to webapp version 2.5.
Revision
619
Author
mauro
Date
2008-04-17 14:25:49 -0500 (Thu, 17 Apr 2008)

Log Message

Updated to webapp version 2.5.

Modified Paths


Diff

Modified: trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml (618 => 619)

--- trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml	2008-04-15 16:17:35 UTC (rev 618)
+++ trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml	2008-04-17 19:25:49 UTC (rev 619)
@@ -1,107 +1,106 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<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">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+  version="2.5">
 
-    <display-name>Waffle Freemarker/Sitemesh Example</display-name>
+  <display-name>Waffle Freemarker/Sitemesh Example</display-name>
 
-    <!-- 1. This is how an application registers its custom Registrar -->
-    <context-param>
-        <param-name>org.codehaus.waffle.registrar.Registrar</param-name>
-        <param-value>org.codehaus.waffle.example.freemarker.FreemarkerRegistrar</param-value>
-    </context-param>
-    <context-param>
-        <param-name>org.codehaus.waffle.action.MethodDefinitionFinder</param-name>
-        <param-value>org.codehaus.waffle.action.ParanamerMethodDefinitionFinder</param-value>
-    </context-param>
-    <context-param>  
-        <param-name>register:DateValueConverter</param-name>  
-        <param-value>org.codehaus.waffle.bind.converters.DateValueConverter</param-value>  
-    </context-param>      
-    <context-param>  
-    	<param-name>register:ListValueConverter</param-name>  
-    	<param-value>org.codehaus.waffle.bind.converters.ListValueConverter</param-value>  
-  	</context-param>  
+  <!-- 1. This is how an application registers its custom Registrar -->
+  <context-param>
+    <param-name>org.codehaus.waffle.registrar.Registrar</param-name>
+    <param-value>org.codehaus.waffle.example.freemarker.FreemarkerRegistrar</param-value>
+  </context-param>
+  <context-param>
+    <param-name>org.codehaus.waffle.action.MethodDefinitionFinder</param-name>
+    <param-value>org.codehaus.waffle.action.ParanamerMethodDefinitionFinder</param-value>
+  </context-param>
+  <context-param>
+    <param-name>register:DateValueConverter</param-name>
+    <param-value>org.codehaus.waffle.bind.converters.DateValueConverter</param-value>
+  </context-param>
+  <context-param>
+    <param-name>register:ListValueConverter</param-name>
+    <param-value>org.codehaus.waffle.bind.converters.ListValueConverter</param-value>
+  </context-param>
 
-    <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
-    <listener>
-        <listener-class>org.codehaus.waffle.context.pico.PicoWaffleContextListener</listener-class>
-    </listener>
+  <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
+  <listener>
+    <listener-class>org.codehaus.waffle.context.pico.PicoWaffleContextListener</listener-class>
+  </listener>
 
-    <!-- Sitemesh's filter -->
-    <filter>
-        <filter-name>sitemesh</filter-name>
-        <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
-    </filter>
+  <!-- Sitemesh's filter -->
+  <filter>
+    <filter-name>sitemesh</filter-name>
+    <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
+  </filter>
 
-    <!-- 4. Waffle request filter (responsible for request level context) -->
-    <filter>
-        <filter-name>WaffleRequestFilter</filter-name>
-        <filter-class>org.codehaus.waffle.context.WaffleRequestFilter</filter-class>
-    </filter>
+  <!-- 4. Waffle request filter (responsible for request level context) -->
+  <filter>
+    <filter-name>WaffleRequestFilter</filter-name>
+    <filter-class>org.codehaus.waffle.context.WaffleRequestFilter</filter-class>
+  </filter>
 
-    <!-- Sitemesh's filter mapping -->
-    <filter-mapping>
-        <filter-name>sitemesh</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
+  <!-- Sitemesh's filter mapping -->
+  <filter-mapping>
+    <filter-name>sitemesh</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
 
 
-    <!-- 4. Waffle request filter mapping -->
-    <filter-mapping>
-        <filter-name>WaffleRequestFilter</filter-name>
-        <url-pattern>*.foo</url-pattern>
-    </filter-mapping>
+  <!-- 4. Waffle request filter mapping -->
+  <filter-mapping>
+    <filter-name>WaffleRequestFilter</filter-name>
+    <url-pattern>*.foo</url-pattern>
+  </filter-mapping>
 
-    <!-- 5. Register Waffle's FrontController servlet -->
-    <servlet>
-        <servlet-name>waffle</servlet-name>
-        <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
-        <init-param>
-            <param-name>view.suffix</param-name>
-            <param-value>.htm</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
+  <!-- 5. Register Waffle's FrontController servlet -->
+  <servlet>
+    <servlet-name>waffle</servlet-name>
+    <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+    <init-param>
+      <param-name>view.suffix</param-name>
+      <param-value>.htm</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
 
-    <!-- Sitemesh's freemarker servlet -->
-    <servlet>
-        <servlet-name>sitemesh-freemarker</servlet-name>
-        <servlet-class>com.opensymphony.module.sitemesh.freemarker.FreemarkerDecoratorServlet</servlet-class>
-        <init-param>
-            <param-name>TemplatePath</param-name>
-            <param-value>/</param-value>
-        </init-param>
-        <init-param>
-            <param-name>default_encoding</param-name>
-            <param-value>ISO-8859-1</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
+  <!-- Sitemesh's freemarker servlet -->
+  <servlet>
+    <servlet-name>sitemesh-freemarker</servlet-name>
+    <servlet-class>com.opensymphony.module.sitemesh.freemarker.FreemarkerDecoratorServlet</servlet-class>
+    <init-param>
+      <param-name>TemplatePath</param-name>
+      <param-value>/</param-value>
+    </init-param>
+    <init-param>
+      <param-name>default_encoding</param-name>
+      <param-value>ISO-8859-1</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
 
-    <!-- Sitemesh's freemarker servlet mapping -->
-    <servlet-mapping>
-        <servlet-name>sitemesh-freemarker</servlet-name>
-        <url-pattern>*.htm</url-pattern>
-    </servlet-mapping>
+  <!-- Sitemesh's freemarker servlet mapping -->
+  <servlet-mapping>
+    <servlet-name>sitemesh-freemarker</servlet-name>
+    <url-pattern>*.htm</url-pattern>
+  </servlet-mapping>
 
-    <servlet-mapping>
-        <servlet-name>waffle</servlet-name>
-        <url-pattern>*.foo</url-pattern>
-    </servlet-mapping>
+  <servlet-mapping>
+    <servlet-name>waffle</servlet-name>
+    <url-pattern>*.foo</url-pattern>
+  </servlet-mapping>
 
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+  </welcome-file-list>
 
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name>no_access</web-resource-name>
-            <url-pattern>*.jspx</url-pattern>
-        </web-resource-collection>
-        <auth-constraint/>
-    </security-constraint>
-    
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>no_access</web-resource-name>
+      <url-pattern>*.jspx</url-pattern>
+    </web-resource-collection>
+    <auth-constraint />
+  </security-constraint>
+
 </web-app>


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to