Author: husted Date: Mon Feb 13 17:32:25 2006 New Revision: 377564 URL: http://svn.apache.org/viewcvs?rev=377564&view=rev Log: Cancellable * Refine test page for cancellable property
Modified: struts/apps/trunk/examples/src/java/org/apache/struts/webapp/exercise/MessageResources.properties struts/apps/trunk/examples/src/webapp/WEB-INF/exercise/struts-config.xml Modified: struts/apps/trunk/examples/src/java/org/apache/struts/webapp/exercise/MessageResources.properties URL: http://svn.apache.org/viewcvs/struts/apps/trunk/examples/src/java/org/apache/struts/webapp/exercise/MessageResources.properties?rev=377564&r1=377563&r2=377564&view=diff ============================================================================== --- struts/apps/trunk/examples/src/java/org/apache/struts/webapp/exercise/MessageResources.properties (original) +++ struts/apps/trunk/examples/src/java/org/apache/struts/webapp/exercise/MessageResources.properties Mon Feb 13 17:32:25 2006 @@ -6,7 +6,7 @@ errors.footer=</table> errors.prefix=<tr><td> errors.suffix=</td></tr> -errors.cancel=Cancellable not set for this action: {0} +errors.invalidCancel=Cancel is a not an valid operation for this Action. property1error1=Property 1, Error 1 property2error1=Property 2, Error 1 Modified: struts/apps/trunk/examples/src/webapp/WEB-INF/exercise/struts-config.xml URL: http://svn.apache.org/viewcvs/struts/apps/trunk/examples/src/webapp/WEB-INF/exercise/struts-config.xml?rev=377564&r1=377563&r2=377564&view=diff ============================================================================== --- struts/apps/trunk/examples/src/webapp/WEB-INF/exercise/struts-config.xml (original) +++ struts/apps/trunk/examples/src/webapp/WEB-INF/exercise/struts-config.xml Mon Feb 13 17:32:25 2006 @@ -25,13 +25,14 @@ <action path="/welcome" forward="/index.html" /> <action path="/bean-write-2" forward="/bean-write-2.jsp" /> <action path="/html-cancel" forward="/html-cancel.jsp"/> - <!-- --> - <action path="/html-cancel-submit" name="testbean" input="/html-cancel.jsp" cancellable="false" validate="true" forward="/welcome.do"> - <exception - key="errors.cancel" - type="org.apache.struts.action.InvalidCancelException" - path="/html-cancel.jsp"/> - </action> + <action path="/html-cancel-true" name="testbean" input="/html-cancel.jsp" cancellable="true" validate="true" forward="/welcome.do"/> + <action path="/html-cancel-false" name="testbean" input="/html-cancel.jsp" cancellable="false" validate="true" forward="/welcome.do"> + <exception + key="errors.invalidCancel" + type="org.apache.struts.action.InvalidCancelException" + path="/html-cancel.jsp"/> + </action> + <action path="/html-img" forward="/html-img.jsp" /> <!-- :FIXME: ImageAction should compute module prefix --> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]