adjust web.xml for lastaflute, has several todo

src/main/webapp/WEB-INF/web.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
- * Copyright 2004-2006 the Seasar Foundation and the Others.
+ * Copyright 2009-2015 the CodeLibs Project and the Others.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,17 +14,15 @@
  * either express or implied. See the License for the specific language
  * governing permissions and limitations under the License.
 -->
-<web-app
-    xmlns="http://java.sun.com/xml/ns/j2ee"
+<?xml version="1.0"?>
+<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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-    version="2.4">
-
-  <context-param>
-    <param-name>sastruts.VIEW_PREFIX</param-name>
-    <param-value>/WEB-INF/view</param-value>
-  </context-param>
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+    version="3.0">
 
+  <!-- ================================================================================= -->
+  <!--                                                                    Servlet Filter -->
+  <!--                                                                    ============== -->
   <filter>
     <filter-name>encodingfilter</filter-name>
     <filter-class>org.codelibs.fess.filter.FessEncodingFilter</filter-class>
@@ -38,16 +36,6 @@
     </init-param>
   </filter>
 
-  <filter>
-    <filter-name>s2filter</filter-name>
-    <filter-class>org.seasar.framework.container.filter.S2ContainerFilter</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>hotdeployfilter</filter-name>
-    <filter-class>org.seasar.framework.container.hotdeploy.HotdeployFilter</filter-class>
-  </filter>
-
   <filter>
     <filter-name>authenticationFilter</filter-name>
     <filter-class>org.codelibs.fess.filter.AdminAuthFilter</filter-class>
@@ -71,20 +59,8 @@
   </filter>
 
   <filter>
-    <filter-name>routingfilter</filter-name>
-    <filter-class>org.seasar.struts.filter.RoutingFilter</filter-class>
-    <!-- 
-    <filter-class>org.dbflute.saflute.web.servlet.filter.RequestRoutingFilter</filter-class>
-     -->
-    <init-param>
-      <param-name>jspDirectAccess</param-name>
-      <param-value>false</param-value>
-    </init-param>
-  </filter>
-
-  <filter>
-    <filter-name>requestLoggingFilter</filter-name>
-    <filter-class>org.dbflute.saflute.web.servlet.filter.RequestLoggingFilter</filter-class>
+    <filter-name>lastaFilter</filter-name>
+    <filter-class>org.lastaflute.web.LastaFilter</filter-class>
   </filter>
 
   <!--
@@ -169,6 +145,9 @@
   </filter>
 -->
 
+  <!-- ================================================================================= -->
+  <!--                                                                    Filter Mapping -->
+  <!--                                                                    ============== -->
   <filter-mapping>
     <filter-name>encodingfilter</filter-name>
     <url-pattern>/*</url-pattern>
@@ -176,32 +155,6 @@
     <dispatcher>FORWARD</dispatcher>
   </filter-mapping>
 
-  <filter-mapping>
-    <filter-name>s2filter</filter-name>
-    <url-pattern>/*</url-pattern>
-    <dispatcher>REQUEST</dispatcher>
-    <dispatcher>FORWARD</dispatcher>
-    <dispatcher>INCLUDE</dispatcher>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>hotdeployfilter</filter-name>
-    <url-pattern>/*</url-pattern>
-    <dispatcher>REQUEST</dispatcher>
-    <dispatcher>FORWARD</dispatcher>
-    <dispatcher>INCLUDE</dispatcher>
-  </filter-mapping>
-
-  <!--
-   basically you should set original filters after Seasar's basic filters
-   because request and session might be filtered by the filters
-   (e.g. session attributes are wrapped in holder when hot-deploy)
-   -->
-  <filter-mapping>
-    <filter-name>requestLoggingFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-
   <filter-mapping>
     <filter-name>authenticationFilter</filter-name>
     <url-pattern>/*</url-pattern>
@@ -214,9 +167,8 @@
   </filter-mapping>
 
   <filter-mapping>
-    <filter-name>routingfilter</filter-name>
+    <filter-name>lastaFilter</filter-name>
     <url-pattern>/*</url-pattern>
-    <dispatcher>REQUEST</dispatcher>
   </filter-mapping>
 
   <!--
@@ -232,71 +184,46 @@
   </filter-mapping>
 -->
 
-  <servlet>
-    <servlet-name>action</servlet-name>
-    <servlet-class>org.codelibs.fess.struts.servlet.SSCActionServlet</servlet-class>
-    <init-param>
-      <param-name>config</param-name>
-      <param-value>/WEB-INF/struts-config.xml</param-value>
-    </init-param>
-    <init-param>
-      <param-name>configFactory</param-name>
-      <param-value>org.seasar.struts.config.S2ModuleConfigFactory</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-<!-- BEGIN: H2 -->
-  <servlet>
-    <servlet-name>h2ConfigServlet</servlet-name>
-    <servlet-class>org.codelibs.fess.servlet.H2ConfigServlet</servlet-class>
-    <init-param>
-      <param-name>tcpPort</param-name>
-      <param-value>19092</param-value>
-    </init-param>
-    <load-on-startup>2</load-on-startup>
-  </servlet>
- <!-- END: H2 -->
-
+  <!-- ================================================================================= -->
+  <!--                                                                           Servlet -->
+  <!--                                                                           ======= -->
   <servlet>
     <servlet-name>tomcat7ConfigServlet</servlet-name>
     <servlet-class>org.codelibs.fess.servlet.Tomcat7ConfigServlet</servlet-class>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
-
-  <servlet>
-    <servlet-name>s2container</servlet-name>
-    <servlet-class>org.dbflute.saflute.web.servlet.ContainerManagementServlet</servlet-class>
-    <load-on-startup>4</load-on-startup>
+    <load-on-startup>1</load-on-startup>
   </servlet>
 
-  <servlet-mapping>
-    <servlet-name>action</servlet-name>
-    <url-pattern>*.do</url-pattern>
-  </servlet-mapping>
-
-<!--
-  <servlet-mapping>
-    <servlet-name>s2container</servlet-name>
-    <url-pattern>/s2container</url-pattern>
-  </servlet-mapping>
--->
+  <!-- ================================================================================= -->
+  <!--                                                                   Servlet Mapping -->
+  <!--                                                                   =============== -->
 
+  <!-- ================================================================================= -->
+  <!--                                                                  Servlet Listener -->
+  <!--                                                                  ================ -->
   <listener>
   	<listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class>
   </listener>
 
+  <!-- ================================================================================= -->
+  <!--                                                                    Session Config -->
+  <!--                                                                    ============== -->
 <!--
     <session-config>
         <session-timeout>1</session-timeout>
     </session-config>
 	-->
 
+  <!-- ================================================================================= -->
+  <!--                                                                      Welcome File -->
+  <!--                                                                      ============ -->
 <!--
     <welcome-file-list>
     </welcome-file-list>
 	-->
 
+  <!-- ================================================================================= -->
+  <!--                                                                        JSP Config -->
+  <!--                                                                        ========== -->
   <jsp-config>
     <jsp-property-group>
       <url-pattern>*.jsp</url-pattern>
@@ -307,6 +234,9 @@
     </jsp-property-group>
   </jsp-config>
 
+  <!-- ================================================================================= -->
+  <!--                                                                          Security -->
+  <!--                                                                          ======== -->
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>Fess Authentication</web-resource-name>
@@ -332,6 +262,9 @@
     </form-login-config>
   </login-config>
 
+  <!-- ================================================================================= -->
+  <!--                                                                        Error Page -->
+  <!--                                                                        ========== -->
   <error-page>
   	<error-code>400</error-code>
   	<location>/WEB-INF/view/error/redirect.jsp?type=badRequest</location>
@@ -352,5 +285,4 @@
   	<error-code>500</error-code>
   	<location>/WEB-INF/view/error/redirect.jsp?type=systemError</location>
   </error-page>
-
 </web-app>