Author: niallp
Date: Mon Mar 6 16:01:21 2006
New Revision: 383713
URL: http://svn.apache.org/viewcvs?rev=383713&view=rev
Log:
Correct the order in the validator's module struts-config.xml (logs a SAX
exception if <set-property> is after <forward> in an Action)
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/struts-config.xml
Modified:
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/struts-config.xml
URL:
http://svn.apache.org/viewcvs/struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/struts-config.xml?rev=383713&r1=383712&r2=383713&view=diff
==============================================================================
---
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/struts-config.xml
(original)
+++
struts/action/branches/STRUTS_1_2_BRANCH/web/examples/WEB-INF/validator/struts-config.xml
Mon Mar 6 16:01:21 2006
@@ -48,25 +48,25 @@
<!-- Registration Action -->
<action path="/registration" forward="/registration.jsp" />
<action path="/registration-submit"
type="org.apache.struts.webapp.validator.RegistrationAction"
name="registrationForm" scope="request" validate="true" input="input">
+ <set-property property="cancellable" value="true"/>
<forward name="input" path="/registration.do" />
<forward name="success" path="/index.jsp" />
- <set-property property="cancellable" value="true"/>
</action>
<action path="/jsRegistration" forward="/jsRegistration.jsp" />
<!-- Multi-Part Registration Action -->
<action path="/multiRegistration" forward="/multiRegistration1.jsp" />
<action path="/multiRegistration-submit"
type="org.apache.struts.webapp.validator.MultiRegistrationAction"
name="multiRegistrationForm" scope="request" validate="false">
+ <set-property property="cancellable" value="true"/>
<forward name="success" path="/welcome.do" />
<forward name="input1" path="/multiRegistration1.jsp" />
<forward name="input2" path="/multiRegistration2.jsp" />
- <set-property property="cancellable" value="true"/>
</action>
<!-- Type Action -->
<action path="/type" forward="/type.jsp" />
<action path="/type-submit"
type="org.apache.struts.webapp.validator.TypeAction" name="typeForm"
scope="request" validate="true" input="input">
+ <set-property property="cancellable" value="true"/>
<forward name="input" path="/type.do" />
<forward name="success" path="/welcome.do" />
- <set-property property="cancellable" value="true"/>
</action>
<!-- JavaScript Type Action -->
<action path="/editJsType"
type="org.apache.struts.webapp.validator.EditTypeAction" scope="request"
validate="false">
@@ -74,32 +74,32 @@
</action>
<action path="/jsType" forward="/jsType.jsp" />
<action path="/jsType-submit"
type="org.apache.struts.webapp.validator.TypeAction" name="jsTypeForm"
scope="request" validate="true" input="/jsType.jsp">
- <forward name="success" path="/welcome.do" />
<set-property property="cancellable" value="true"/>
+ <forward name="success" path="/welcome.do" />
</action>
<!-- Bundles Examples -->
<action path="/viewBundleExamples" forward="/bundleExamples.jsp" />
<action path="/validateBundleExamples"
type="org.apache.struts.actions.ForwardAction" name="bundlesForm"
scope="request"
parameter="/validator/welcome.do" validate="true" input="input" >
- <forward name="input" path="/viewBundleExamples.do" />
<set-property property="cancellable" value="true"/>
+ <forward name="input" path="/viewBundleExamples.do" />
</action>
<!-- JavaScript Bundles Examples -->
<action path="/viewJsBundleExamples" forward="/bundleExamplesJS.jsp" />
<action path="/validateJsBundleExamples"
type="org.apache.struts.actions.ForwardAction" name="bundlesForm"
scope="request"
parameter="/validator/welcome.do" validate="true" input="input" >
- <forward name="input" path="/viewJsBundleExamples.do" />
<set-property property="cancellable" value="true"/>
+ <forward name="input" path="/viewJsBundleExamples.do" />
</action>
<!-- validwhen Examples -->
<action path="/viewValidWhenExamples" forward="/validWhenExamples.jsp" />
<action path="/validateValidWhenExamples"
type="org.apache.struts.actions.ForwardAction" name="validWhenForm"
scope="request"
parameter="/validator/welcome.do" validate="true" input="input" >
- <forward name="input" path="/viewValidWhenExamples.do" />
<set-property property="cancellable" value="true"/>
+ <forward name="input" path="/viewValidWhenExamples.do" />
</action>
<!-- Locale Action -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
