Author: tchemit Date: 2012-04-03 13:37:06 +0200 (Tue, 03 Apr 2012) New Revision: 476 Url: http://forge.codelutin.com/repositories/revision/echobase/476 Log: avoid to use a params-prepare-params stack Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -44,7 +44,7 @@ <!-- Load db editor main page --> <action name="dbeditor" method="input" class="fr.ifremer.echobase.ui.actions.dbeditor.LoadEntities"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action> @@ -75,7 +75,7 @@ <!-- Import some entities from a csv file --> <action name="doImport" class="fr.ifremer.echobase.ui.actions.dbeditor.ImportTable"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result>/WEB-INF/jsp/dbeditor/csvImportResult.jsp</result> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> <result name="error">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> @@ -84,7 +84,7 @@ <!-- Export a selected entity type to a csv file --> <action name="doExport" class="fr.ifremer.echobase.ui.actions.dbeditor.ExportTable"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -35,7 +35,7 @@ <!-- Configure embedded application archive --> <action name="configure" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Configure"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input"> /WEB-INF/jsp/embeddedApplication/configure.jsp </result> @@ -58,7 +58,7 @@ <!-- Download embedded application archive --> <action name="download" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Download"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -33,7 +33,7 @@ <!-- Configure export --> <action name="configure" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/exportDb</param> @@ -54,7 +54,7 @@ <!-- Download export --> <action name="download" class="fr.ifremer.echobase.ui.actions.exportDb.Download"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -41,6 +41,15 @@ </result-types> + <interceptors> + <!-- authenticated stack with params - prepare - params --> + <interceptor-stack name="paramsPrepareParamsStackLoggued"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="paramsPrepareParamsStack"/> + </interceptor-stack> + </interceptors> + <!-- Display export query main page --> <action name="manageExportQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -45,7 +45,7 @@ <!-- Configure import --> <action name="configure*-*" method="{2}" class="fr.ifremer.echobase.ui.actions.importData.Configure{1}Import"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importData/configure{1}Import.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> @@ -77,7 +77,7 @@ <!-- Create a new mission --> <action name="createMission" class="fr.ifremer.echobase.ui.actions.importData.CreateMission"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importData/createMission.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -33,7 +33,7 @@ <!-- Configure import --> <action name="configure" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/importDb</param> @@ -42,8 +42,7 @@ </action> <!-- Starts import --> - <action name="import" - class="fr.ifremer.echobase.ui.actions.importDb.Import" + <action name="import" class="fr.ifremer.echobase.ui.actions.importDb.Import" method="execute"> <interceptor-ref name="basicStackLoggued"/> <interceptor-ref name="execAndWait"/> Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -64,7 +64,7 @@ <!-- CRUD on user --> <action name="user-*" class="fr.ifremer.echobase.ui.actions.user.{1}"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLoggued"/> <interceptor-ref name="checkUserIsAdmin"/> <result name="input">/WEB-INF/jsp/user/{1}.jsp</result> <result>/WEB-INF/jsp/user/userList.jsp</result> Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:33:16 UTC (rev 475) +++ trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:37:06 UTC (rev 476) @@ -114,13 +114,6 @@ <interceptor-ref name="defaultStack"/> </interceptor-stack> - <!-- authenticated stack with params - prepare - params --> - <interceptor-stack name="paramsPrepareParamsStackLoggued"> - <interceptor-ref name="i18n"/> - <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="paramsPrepareParamsStack"/> - </interceptor-stack> - </interceptors> <!-- must be authenticated to perform any actions -->