Author: tchemit Date: 2013-10-20 17:28:07 +0200 (Sun, 20 Oct 2013) New Revision: 856 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/856 Log: fixes #3552: Updates struts to 2.3.15.3 Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/struts.xml trunk/pom.xml Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2013-10-20 13:45:37 UTC (rev 855) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2013-10-20 15:28:07 UTC (rev 856) @@ -31,6 +31,14 @@ <package name="user" extends="loggued" namespace="/user"> + <!-- Login Input --> + <action name="loginInput" class="fr.ifremer.echobase.ui.actions.user.Login" + method="input"> + <result name="input">/WEB-INF/jsp/user/login.jsp</result> + <result name="redirect" type="redirect">${redirectAction}</result> + <interceptor-ref name="echobaseDefaultStack"/> + </action> + <!-- Login --> <action name="login" class="fr.ifremer.echobase.ui.actions.user.Login" method="execute"> @@ -55,8 +63,7 @@ </action> <!-- CRUD on user --> - <action name="user-*" - class="fr.ifremer.echobase.ui.actions.user.{1}"> + <action name="user-*" class="fr.ifremer.echobase.ui.actions.user.{1}"> <interceptor-ref name="checkUserIsAdmin"/> <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/user/{1}.jsp</result> Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2013-10-20 13:45:37 UTC (rev 855) +++ trunk/echobase-ui/src/main/resources/struts.xml 2013-10-20 15:28:07 UTC (rev 856) @@ -38,6 +38,9 @@ name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider"/> + <constant name="struts.enable.DynamicMethodInvocation" value="true"/> + <constant name="struts.mapper.action.prefix.enabled" value="true"/> + <constant name="struts.xworkTextProvider" value="i18nTextProvider"/> <constant name="struts.ognl.allowStaticMethodAccess" value="true"/> @@ -81,7 +84,7 @@ <!-- to check if user is loggued --> <interceptor name="checkUserLoggued" class="fr.ifremer.echobase.ui.interceptors.CheckLogguedInterceptor"> - <param name="loginAction">user/login!input</param> + <param name="loginAction">user/loginInput</param> <param name="redirectAction">/home</param> </interceptor> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-10-20 13:45:37 UTC (rev 855) +++ trunk/pom.xml 2013-10-20 15:28:07 UTC (rev 856) @@ -145,7 +145,7 @@ <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonWebVersion>1.14</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.15.1</struts2Version> + <struts2Version>2.3.15.3</struts2Version> <jqueryPluginVersion>3.6.0</jqueryPluginVersion> <h2Version>1.3.173</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>