Author: tchemit Date: 2012-05-18 01:29:28 +0200 (Fri, 18 May 2012) New Revision: 3367 Url: http://chorem.org/repositories/revision/pollen/3367 Log: clean strusts mappings Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml trunk/pollen-ui-struts2/src/main/resources/struts.xml Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-05-15 16:03:51 UTC (rev 3366) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-05-17 23:29:28 UTC (rev 3367) @@ -71,9 +71,7 @@ <!-- delete user --> <action name="deleteUser" class="org.chorem.pollen.ui.actions.admin.DeleteUser"> - <!--<result name="input">/WEB-INF/jsp/admin/usersList.jsp</result>--> <result type="redirect2"/> - <!--<result>/WEB-INF/jsp/admin/usersList.jsp</result>--> </action> </package> Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-05-15 16:03:51 UTC (rev 3366) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-05-17 23:29:28 UTC (rev 3367) @@ -95,9 +95,7 @@ <action name="deleteFavoriteList" class="org.chorem.pollen.ui.actions.user.DeleteFavoriteList"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> - <!--<result name="input">/WEB-INF/jsp/user/favoriteLists.jsp</result>--> <result type="redirect2"/> - <!--<result>/WEB-INF/jsp/user/favoriteLists.jsp</result>--> </action> <!-- edit favorite list --> @@ -133,8 +131,6 @@ <action name="deletePollAccount" class="org.chorem.pollen.ui.actions.user.DeletePollAccount"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> - <!--<result name="input">/WEB-INF/jsp/user/favoriteList.jsp</result>--> - <!--<result>/WEB-INF/jsp/user/favoriteList.jsp</result>--> <result type="redirect2"/> </action> Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-05-15 16:03:51 UTC (rev 3366) +++ trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-05-17 23:29:28 UTC (rev 3367) @@ -78,31 +78,23 @@ <interceptor-stack name="pollenBasicStack"> <interceptor-ref name="i18n"/> <interceptor-ref name="basicStack"/> -<!-- <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref>--> </interceptor-stack> <!-- params stack with params--> <interceptor-stack name="pollenParamsPrepareParamsStack"> <interceptor-ref name="i18n"/> - <!--<interceptor-ref name="paramsPrepareParamsStack"/>--> <interceptor-ref name="exception"/> <interceptor-ref name="alias"/> <interceptor-ref name="i18n"/> <interceptor-ref name="checkbox"/> <interceptor-ref name="multiselect"/> <interceptor-ref name="pollenFileUpload"/> -<!-- <interceptor-ref name="params"> - <param name="excludeParams">dojo\..*,^struts\..*</param> - </interceptor-ref>--> <interceptor-ref name="servletConfig"/> <interceptor-ref name="staticParams"/> <interceptor-ref name="prepare"/> <interceptor-ref name="chain"/> <interceptor-ref name="modelDriven"/> - <!--<interceptor-ref name="staticParams"/>--> <interceptor-ref name="actionMappingParams"/> <interceptor-ref name="params"> <param name="excludeParams">dojo\..*,^struts\..*</param> @@ -114,9 +106,6 @@ <interceptor-ref name="workflow"> <param name="excludeMethods">input,back,cancel,browse</param> </interceptor-ref> -<!-- <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref>--> </interceptor-stack> </interceptors> @@ -144,9 +133,6 @@ <result>/WEB-INF/jsp/home.jsp</result> <interceptor-ref name="i18n"/> <interceptor-ref name="basicStack"/> -<!-- <interceptor-ref name="store"> - <param name="operationMode">RETRIEVE</param> - </interceptor-ref>--> </action> <!-- change lang--> @@ -160,9 +146,6 @@ <interceptor-ref name="paramRemover"> <param name="paramNames">request_locale</param> </interceptor-ref> -<!-- <interceptor-ref name="store"> - <param name="operationMode">STORE</param> - </interceptor-ref>--> </action> </package>