Author: tchemit Date: 2014-04-22 16:51:05 +0200 (Tue, 22 Apr 2014) New Revision: 1015 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1015 Log: clean config Modified: trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2014-04-22 14:50:28 UTC (rev 1014) +++ trunk/echobase-ui/src/main/resources/struts.xml 2014-04-22 14:51:05 UTC (rev 1015) @@ -108,6 +108,7 @@ <interceptor-stack name="echobaseBasicStack"> <interceptor-ref name="exception"/> <interceptor-ref name="servletConfig"/> + <interceptor-ref name="i18n"/> <interceptor-ref name="echobaseInjector"/> <interceptor-ref name="prepare"/> <interceptor-ref name="checkbox"/> @@ -148,53 +149,12 @@ <interceptor-ref name="debugging"/> </interceptor-stack> - <!--interceptor-stack name="echobaseParamsPrepareParamsStack"> - <interceptor-ref name="exception"/> - <interceptor-ref name="alias"/> - <interceptor-ref name="i18n"/> - <interceptor-ref name="checkbox"/> - <interceptor-ref name="multiselect"/> - <interceptor-ref name="echobaseInjector"/> - <interceptor-ref name="params"> - <param name="excludeParams">dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,parameters\...*</param> - </interceptor-ref> - <interceptor-ref name="servletConfig"/> - <interceptor-ref name="prepare"/> - <interceptor-ref name="chain"/> - <interceptor-ref name="modelDriven"/> - <interceptor-ref name="fileUpload"/> - <interceptor-ref name="staticParams"/> - <interceptor-ref name="actionMappingParams"/> - <interceptor-ref name="params"> - <param name="excludeParams">dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,parameters\...*</param> - </interceptor-ref> - <interceptor-ref name="conversionError"/> - <interceptor-ref name="validation"> - <param name="excludeMethods">input,back,cancel,browse</param> - </interceptor-ref> - <interceptor-ref name="workflow"> - <param name="excludeMethods">input,back,cancel,browse</param> - </interceptor-ref> - </interceptor-stack--> - </interceptors> <!-- default action to use everywhere (fix i18n when not translated) --> <default-class-ref class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"/> - <!--global-results> - <result name="TechinicalException"> - /WEB-INF/jsp/technicalException.jsp - </result> - </global-results> - - <global-exception-mappings> - <exception-mapping - exception="fr.ifremer.echobase.EchoBaseTechnicalException" - result="TechinicalException"/> - </global-exception-mappings--> - </package> <package name="loggued" extends="default" abstract="true"> @@ -205,7 +165,6 @@ <interceptor-stack name="basicStackLoggued"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> - <!--<interceptor-ref name="basicStack"/>--> <interceptor-ref name="echobaseBasicStack"/> </interceptor-stack> @@ -213,9 +172,7 @@ <interceptor-stack name="prepareParamsStackLoggued"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> - <!--<interceptor-ref name="defaultStack"/>--> <interceptor-ref name="echobaseDefaultStack"/> - </interceptor-stack> <!-- basic authenticated stack --> @@ -223,7 +180,6 @@ <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> <interceptor-ref name="checkWorkingDbSelected"/> - <!--<interceptor-ref name="basicStack"/>--> <interceptor-ref name="echobaseBasicStack"/> </interceptor-stack> @@ -232,7 +188,6 @@ <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> <interceptor-ref name="checkWorkingDbSelected"/> - <!--<interceptor-ref name="defaultStack"/>--> <interceptor-ref name="echobaseDefaultStack"/> </interceptor-stack>