Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 15:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #255 from JCgH4164838Gh792C124B5/localS2Branch

Browse Source 
Minor config fixes for the Showcase Application:
This commit is contained in:
Lukasz Lenart
2018-10-09 06:56:29 +02:00
committed by GitHub
parent 2ab2b9b240 50d57e118e
commit b7cc4b8c80
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/showcase/src/main/resources/struts-token.xml
+2 -2
View File
@@ -48,7 +48,7 @@
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="token"/>
<result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
<result name="success" type="redirect">/WEB-INF/token/transferDone.jsp</result>
<result name="success">/WEB-INF/token/transferDone.jsp</result>
</action>
@@ -62,7 +62,7 @@
<interceptor-ref name="defaultStack"/>
<interceptor-ref name="tokenSession"/>
<result name="invalid.token">/WEB-INF/token/doublePost.jsp</result>
<result name="success" type="redirect">/WEB-INF/token/transferDone.jsp</result>
<result name="success">/WEB-INF/token/transferDone.jsp</result>
</action>
apps/showcase/src/main/resources/struts-validation.xml
+9 -9
View File
@@ -34,28 +34,28 @@
<package name="validation" extends="json-default" namespace="/validation">
<action name="index">
<result>/WEB-INF/validation/index.jsp</result>
<result>index.jsp</result>
</action>
<action name="quizBasic" class="org.apache.struts2.showcase.validation.QuizAction">
<result name="input">quiz-basic.jsp</result>
<result>quiz-success.jsp</result>
<result name="input">/WEB-INF/validation/quiz-basic.jsp</result>
<result>/WEB-INF/validation/quiz-success.jsp</result>
</action>
<action name="quizClient" class="org.apache.struts2.showcase.validation.QuizAction">
<result name="input">quiz-client.jsp</result>
<result>quiz-success.jsp</result>
<result name="input">/WEB-INF/validation/quiz-client.jsp</result>
<result>/WEB-INF/validation/quiz-success.jsp</result>
</action>
<action name="quizClientCss" class="org.apache.struts2.showcase.validation.QuizAction">
<result name="input">quiz-client-css.jsp</result>
<result>quiz-success.jsp</result>
<result name="input">/WEB-INF/validation/quiz-client-css.jsp</result>
<result>/WEB-INF/validation/quiz-success.jsp</result>
</action>
<action name="quizAjax" class="org.apache.struts2.showcase.validation.QuizAction">
<interceptor-ref name="jsonValidationWorkflowStack"/>
<result name="input">quiz-ajax.jsp</result>
<result>quiz-success.jsp</result>
<result name="input">/WEB-INF/validation/quiz-ajax.jsp</result>
<result>/WEB-INF/validation/quiz-success.jsp</result>
</action>
<!-- =========================================== -->
apps/showcase/src/main/webapp/WEB-INF/token/example4.ftl
+1 -1
View File
@@ -50,7 +50,7 @@
<@s.form action="transfer4">
<@s.token/>
<@s.textfield label="Amount" name="amount" required="true" value="400"/>
<@s.textfield label="Amount" name="amount" required=true value="400"/>
<@s.submit value="Transfer money" cssClass="btn btn-primary"/>
</@s.form>
</div>