Author: echatellier Date: 2014-04-25 16:35:14 +0200 (Fri, 25 Apr 2014) New Revision: 49 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/49 Log: Fix web ui start Modified: trunk/faxtomail-ui-web/src/main/resources/struts.xml trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml Modified: trunk/faxtomail-ui-web/src/main/resources/struts.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/struts.xml 2014-04-25 13:43:04 UTC (rev 48) +++ trunk/faxtomail-ui-web/src/main/resources/struts.xml 2014-04-25 14:35:14 UTC (rev 49) @@ -36,7 +36,7 @@ <constant name="struts.multipart.maxSize" value="10485760" /> - <package name="faxtomail" namespace="/" extends="json-default"> + <package name="faxtomail" namespace="/" extends="struts-default"> <interceptors> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml 2014-04-25 13:43:04 UTC (rev 48) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/web.xml 2014-04-25 14:35:14 UTC (rev 49) @@ -36,7 +36,7 @@ <session-timeout>600</session-timeout> </session-config> - <!-- prevent excessive caching of js files --> + <!-- prevent excessive caching of js files <filter> <filter-name>ExpiresFilter</filter-name> <filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class> @@ -52,14 +52,9 @@ <param-name>ExpiresByType application/javascript</param-name> <param-value>access plus 10 minutes</param-value> </init-param> - </filter> + </filter> --> <filter> - <filter-name>shiro</filter-name> - <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> - </filter> - - <filter> <filter-name>struts-prepare</filter-name> <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class> </filter> @@ -75,15 +70,6 @@ </filter> <filter-mapping> - <filter-name>shiro</filter-name> - <url-pattern>/*</url-pattern> - <dispatcher>REQUEST</dispatcher> - <dispatcher>FORWARD</dispatcher> - <dispatcher>INCLUDE</dispatcher> - <dispatcher>ERROR</dispatcher> - </filter-mapping> - - <filter-mapping> <filter-name>struts-prepare</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> @@ -103,14 +89,10 @@ <listener-class>com.franciaflex.faxtomail.web.FaxToMailApplicationListener</listener-class> </listener> - <listener> - <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> - </listener> - - <filter-mapping> + <!-- <filter-mapping> <filter-name>ExpiresFilter</filter-name> <url-pattern>/*</url-pattern> <dispatcher>REQUEST</dispatcher> - </filter-mapping> + </filter-mapping> --> </web-app>