Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf?view=diff&r1=153877&r2=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/basicValidation/basicValidationController.jpf Mon Feb 14 17:11:54 2005 @@ -26,158 +26,12 @@ /** * @jpf:controller nested="true" * @jpf:message-resources resources="validation.basic.Messages" - * @jpf:view-properties view-properties:: - * <!-- This data is auto-generated. Hand-editing this section is not recommended. --> - * <view-properties> - * <pageflow-object id="pageflow:/validation/basicValidation/basicValidationController.jpf"/> - * <pageflow-object id="action:begin.do"> - * <property value="80" name="x"/> - * <property value="240" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:submitForm.do#validation.basicValidation.basicValidationController.Form"> - * <property value="280" name="x"/> - * <property value="400" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:exit.do"> - * <property value="280" name="x"/> - * <property value="80" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:exit.do@"> - * <property value="280,280,280,280" name="elbowsX"/> - * <property value="196,160,160,124" name="elbowsY"/> - * <property value="North_1" name="fromPort"/> - * <property value="South_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:submitForm.do#validation.basicValidation.basicValidationController.Form@"> - * <property value="280,280,280,280" name="elbowsX"/> - * <property value="284,320,320,356" name="elbowsY"/> - * <property value="South_1" name="fromPort"/> - * <property value="North_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="page:formPage.jsp"> - * <property value="280" name="x"/> - * <property value="240" name="y"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@"> - * <property value="116,180,180,244" name="elbowsX"/> - * <property value="232,232,232,232" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="formPage" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:submitForm.do#validation.basicValidation.basicValidationController.Form@"> - * <property value="244,180,180,116" name="elbowsX"/> - * <property value="392,392,392,392" name="elbowsY"/> - * <property value="West_1" name="fromPort"/> - * <property value="East_1" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="exit:begin"> - * <property value="480" name="x"/> - * <property value="80" name="y"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:exit.do@"> - * <property value="316,380,380,444" name="elbowsX"/> - * <property value="72,72,72,72" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="previousPageFlowBegin" name="label"/> - * </pageflow-object> - * <pageflow-object id="formbeanprop:validation.basicValidation.basicValidationController.Form#email#java.lang.String"/> - * <pageflow-object id="formbeanprop:validation.basicValidation.basicValidationController.Form#zipCode#java.lang.String"/> - * <pageflow-object id="formbean:validation.basicValidation.basicValidationController.Form"/> - * <pageflow-object id="page:success.jsp"> - * <property value="80" name="x"/> - * <property value="400" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:begin.do@"> - * <property value="80,80,80,80" name="elbowsX"/> - * <property value="356,320,320,284" name="elbowsY"/> - * <property value="North_1" name="fromPort"/> - * <property value="South_1" name="toPort"/> - * </pageflow-object> - * </view-properties> - * :: - * */ @Jpf.Controller( nested = true, messageBundles = { @Jpf.MessageBundle( bundlePath = "validation.basic.Messages") - }) [EMAIL PROTECTED]( - value = { - "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->", - "<view-properties>", - "<pageflow-object id='pageflow:/validation/basicValidation/basicValidationController.jpf'/>", - "<pageflow-object id='action:begin.do'>", - " <property value='80' name='x'/>", - " <property value='240' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:submitForm.do#validation.basicValidation.basicValidationController.Form'>", - " <property value='280' name='x'/>", - " <property value='400' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:exit.do'>", - " <property value='280' name='x'/>", - " <property value='80' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:exit.do@'>", - " <property value='280,280,280,280' name='elbowsX'/>", - " <property value='196,160,160,124' name='elbowsY'/>", - " <property value='North_1' name='fromPort'/>", - " <property value='South_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:submitForm.do#validation.basicValidation.basicValidationController.Form@'>", - " <property value='280,280,280,280' name='elbowsX'/>", - " <property value='284,320,320,356' name='elbowsY'/>", - " <property value='South_1' name='fromPort'/>", - " <property value='North_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='page:formPage.jsp'>", - " <property value='280' name='x'/>", - " <property value='240' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>", - " <property value='116,180,180,244' name='elbowsX'/>", - " <property value='232,232,232,232' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='formPage' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:submitForm.do#validation.basicValidation.basicValidationController.Form@'>", - " <property value='244,180,180,116' name='elbowsX'/>", - " <property value='392,392,392,392' name='elbowsY'/>", - " <property value='West_1' name='fromPort'/>", - " <property value='East_1' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='exit:begin'>", - " <property value='480' name='x'/>", - " <property value='80' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:exit.do@'>", - " <property value='316,380,380,444' name='elbowsX'/>", - " <property value='72,72,72,72' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='previousPageFlowBegin' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='formbeanprop:validation.basicValidation.basicValidationController.Form#email#java.lang.String'/>", - "<pageflow-object id='formbeanprop:validation.basicValidation.basicValidationController.Form#zipCode#java.lang.String'/>", - "<pageflow-object id='formbean:validation.basicValidation.basicValidationController.Form'/>", - "<pageflow-object id='page:success.jsp'>", - " <property value='80' name='x'/>", - " <property value='400' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:begin.do@'>", - " <property value='80,80,80,80' name='elbowsX'/>", - " <property value='356,320,320,284' name='elbowsY'/>", - " <property value='North_1' name='fromPort'/>", - " <property value='South_1' name='toPort'/>", - "</pageflow-object>", - "</view-properties>" }) public class basicValidationController extends PageFlowController {
Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/Controller.jpf?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/Controller.jpf (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/Controller.jpf Mon Feb 14 17:11:54 2005 @@ -0,0 +1,156 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * $Header:$ + */ +package validation.messages.args; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionMapping; +import org.apache.beehive.netui.pageflow.annotations.Jpf; +import org.apache.beehive.netui.pageflow.FormData; +import org.apache.beehive.netui.pageflow.Forward; +import org.apache.beehive.netui.pageflow.PageFlowController; + +import validation.messages.ValidatableFormData; + [EMAIL PROTECTED]( + messageBundles = { + @Jpf.MessageBundle(bundlePath = "validation.messages.messages") + }, + validatableBeans = { + @Jpf.ValidatableBean( + type = validation.messages.ValidatableFormData.class, + validatableProperties = { + @Jpf.ValidatableProperty( + propertyName = "item1", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 2, + message = "minimum length for {0} is {1} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "item1" + ), + @Jpf.MessageArg( + arg = "two" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item2", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 4, + messageKey = "minlength.msg", + messageArgs = { + @Jpf.MessageArg( + argKey = "item2.minlength.name" + ), + @Jpf.MessageArg( + argKey = "item2.minlength.length" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item3", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 6, + message = "{0} {1} for {2} is {3} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "Min", + position = 0 + ), + @Jpf.MessageArg( + arg = "length" + ), + @Jpf.MessageArg( + arg = "item3" + ), + @Jpf.MessageArg( + arg = "six" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item4", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 8, + messageKey = "minlength.msg", + messageArgs = { + @Jpf.MessageArg( + argKey = "item4.minlength.length", + position = 1 + ), + @Jpf.MessageArg( + argKey = "item4.minlength.name", + position = 0 + ) + } + ) + ) + } + ) + } +) +public class Controller extends PageFlowController +{ + @Jpf.Action( + forwards={ + @Jpf.Forward(name="index", path="index.jsp") + } + ) + protected Forward begin() + { + return new Forward("index"); + } + + + /** + * Callback that is invoked when this controller instance is created. + */ + protected void onCreate() + { + } + + /** + * Callback that is invoked when this controller instance is destroyed. + */ + protected void onDestroy(HttpSession session) + { + } + + + @Jpf.Action( + forwards = { + @Jpf.Forward(name = "success", path = "index.jsp") + }, + validationErrorForward = @Jpf.Forward(name = "errors", + path = "index.jsp") + ) + protected Forward validate(ValidatableFormData form) + { + Forward forward = new Forward( "success" ); + return forward; + } +} + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/Controller.jpf ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/index.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/index.jsp?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/index.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/index.jsp Mon Feb 14 17:11:54 2005 @@ -0,0 +1,58 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%> + +<netui:html> + <head> + <netui:base/> + </head> + <netui:body> + <h3>Declarative Validation Test</h3> + + <netui:form action="validate"> + <table> + <tr valign="top"> + <td>item1:</td> + <td> + <netui:textBox dataSource="actionForm.item1"></netui:textBox> + </td> + <td> + <netui:error key="item1"/> + </td> + </tr> + <tr valign="top"> + <td>item2:</td> + <td> + <netui:textBox dataSource="actionForm.item2"></netui:textBox> + </td> + <td> + <netui:error key="item2"/> + </td> + </tr> + <tr valign="top"> + <td>item3:</td> + <td> + <netui:textBox dataSource="actionForm.item3"></netui:textBox> + </td> + <td> + <netui:error key="item3"/> + </td> + </tr> + <tr valign="top"> + <td>item4:</td> + <td> + <netui:textBox dataSource="actionForm.item4"></netui:textBox> + </td> + <td> + <netui:error key="item4"/> + </td> + </tr> + </table> + <br/> + + <netui:button action="validate"></netui:button> + </netui:form> + <hr> + <netui:errors/> + </netui:body> +</netui:html> + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args/index.jsp ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/Controller.jpf?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/Controller.jpf (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/Controller.jpf Mon Feb 14 17:11:54 2005 @@ -0,0 +1,175 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * $Header:$ + */ +package validation.messages.args11; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionMapping; +import org.apache.beehive.netui.pageflow.annotations.Jpf; +import org.apache.beehive.netui.pageflow.FormData; +import org.apache.beehive.netui.pageflow.Forward; +import org.apache.beehive.netui.pageflow.PageFlowController; + +import validation.messages.ValidatableFormData; + [EMAIL PROTECTED]( + messageBundles = { + @Jpf.MessageBundle(bundlePath = "validation.messages.messages") + }, + validatorVersion = Jpf.ValidatorVersion.oneOne, + validatableBeans = { + @Jpf.ValidatableBean( + type = validation.messages.ValidatableFormData.class, + validatableProperties = { + @Jpf.ValidatableProperty( + propertyName = "item1", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 2, + message = "minimum length for {0} is {1} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "item1" + ), + @Jpf.MessageArg( + arg = "two" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item2", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 4, + messageKey = "minlength.msg", + messageArgs = { + @Jpf.MessageArg( + argKey = "item2.minlength.name" + ), + @Jpf.MessageArg( + argKey = "item2.minlength.length" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item3", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 6, + message = "{0} {1} for {2} is {3} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "Min", + position = 0 + ), + @Jpf.MessageArg( + arg = "length" + ), + @Jpf.MessageArg( + arg = "item3" + ), + @Jpf.MessageArg( + arg = "six" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item4", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 8, + messageKey = "minlength.msg", + messageArgs = { + @Jpf.MessageArg( + argKey = "item4.minlength.length", + position = 1 + ), + @Jpf.MessageArg( + argKey = "item4.minlength.name", + position = 0 + ) + } + ) + ) + } + ) + } +) +public class Controller extends PageFlowController +{ + @Jpf.Action( + forwards={ + @Jpf.Forward(name="index", path="index.jsp") + } + ) + protected Forward begin() + { + return new Forward("index"); + } + + + /** + * Callback that is invoked when this controller instance is created. + */ + protected void onCreate() + { + } + + /** + * Callback that is invoked when this controller instance is destroyed. + */ + protected void onDestroy(HttpSession session) + { + } + + + @Jpf.Action( + forwards = { + @Jpf.Forward(name = "success", path = "index.jsp") + }, + validatableProperties={ + @Jpf.ValidatableProperty( + propertyName = "item1", + validateMaxLength = + @Jpf.ValidateMaxLength( + chars = 4, + message = "maximum length for {0} is {1} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "item1" + ), + @Jpf.MessageArg( + arg = "four" + ) + } + ) + ) + }, + validationErrorForward = @Jpf.Forward(name = "errors", + path = "index.jsp") + ) + protected Forward validate(ValidatableFormData form) + { + Forward forward = new Forward( "success" ); + return forward; + } +} + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/Controller.jpf ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/index.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/index.jsp?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/index.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/index.jsp Mon Feb 14 17:11:54 2005 @@ -0,0 +1,58 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%> + +<netui:html> + <head> + <netui:base/> + </head> + <netui:body> + <h3>Declarative Validation Test</h3> + + <netui:form action="validate"> + <table> + <tr valign="top"> + <td>item1:</td> + <td> + <netui:textBox dataSource="actionForm.item1"></netui:textBox> + </td> + <td> + <netui:error key="item1"/> + </td> + </tr> + <tr valign="top"> + <td>item2:</td> + <td> + <netui:textBox dataSource="actionForm.item2"></netui:textBox> + </td> + <td> + <netui:error key="item2"/> + </td> + </tr> + <tr valign="top"> + <td>item3:</td> + <td> + <netui:textBox dataSource="actionForm.item3"></netui:textBox> + </td> + <td> + <netui:error key="item3"/> + </td> + </tr> + <tr valign="top"> + <td>item4:</td> + <td> + <netui:textBox dataSource="actionForm.item4"></netui:textBox> + </td> + <td> + <netui:error key="item4"/> + </td> + </tr> + </table> + <br/> + + <netui:button action="validate"></netui:button> + </netui:form> + <hr> + <netui:errors/> + </netui:body> +</netui:html> + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/args11/index.jsp ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/Controller.jpf?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/Controller.jpf (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/Controller.jpf Mon Feb 14 17:11:54 2005 @@ -0,0 +1,132 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * $Header:$ + */ +package validation.messages.merge; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionMapping; +import org.apache.beehive.netui.pageflow.annotations.Jpf; +import org.apache.beehive.netui.pageflow.FormData; +import org.apache.beehive.netui.pageflow.Forward; +import org.apache.beehive.netui.pageflow.PageFlowController; + +import validation.messages.ValidatableFormData; + [EMAIL PROTECTED]( + messageBundles = { + @Jpf.MessageBundle(bundlePath = "validation.messages.messages") + }, + validatorMerge = "merge-validation.xml", + validatableBeans = { + @Jpf.ValidatableBean( + type = validation.messages.ValidatableFormData.class, + validatableProperties = { + @Jpf.ValidatableProperty( + propertyName = "item1", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 2, + message = "minimum length for {0} is {1} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "item1" + ), + @Jpf.MessageArg( + arg = "two" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item2", + validateMaxLength = + @Jpf.ValidateMaxLength( + chars = 8, + message = "maximum length for {0} is {1} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "item2" + ), + @Jpf.MessageArg( + arg = "eight" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item4", + validateMaxLength = + @Jpf.ValidateMaxLength( + chars = 16, + message = "maximum length for {0} is {1} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "item4" + ), + @Jpf.MessageArg( + arg = "sixteen" + ) + } + ) + ) + } + ) + } +) +public class Controller extends PageFlowController +{ + @Jpf.Action( + forwards={ + @Jpf.Forward(name="index", path="index.jsp") + } + ) + protected Forward begin() + { + return new Forward("index"); + } + + + /** + * Callback that is invoked when this controller instance is created. + */ + protected void onCreate() + { + } + + /** + * Callback that is invoked when this controller instance is destroyed. + */ + protected void onDestroy(HttpSession session) + { + } + + + @Jpf.Action( + forwards = { + @Jpf.Forward(name = "success", path = "index.jsp") + }, + validationErrorForward = @Jpf.Forward(name = "errors", + path = "index.jsp") + ) + protected Forward validate(ValidatableFormData form) + { + Forward forward = new Forward( "success" ); + return forward; + } +} + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/Controller.jpf ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/index.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/index.jsp?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/index.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/index.jsp Mon Feb 14 17:11:54 2005 @@ -0,0 +1,58 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%> + +<netui:html> + <head> + <netui:base/> + </head> + <netui:body> + <h3>Declarative Validation Test</h3> + + <netui:form action="validate"> + <table> + <tr valign="top"> + <td>item1:</td> + <td> + <netui:textBox dataSource="actionForm.item1"></netui:textBox> + </td> + <td> + <netui:error key="item1"/> + </td> + </tr> + <tr valign="top"> + <td>item2:</td> + <td> + <netui:textBox dataSource="actionForm.item2"></netui:textBox> + </td> + <td> + <netui:error key="item2"/> + </td> + </tr> + <tr valign="top"> + <td>item3:</td> + <td> + <netui:textBox dataSource="actionForm.item3"></netui:textBox> + </td> + <td> + <netui:error key="item3"/> + </td> + </tr> + <tr valign="top"> + <td>item4:</td> + <td> + <netui:textBox dataSource="actionForm.item4"></netui:textBox> + </td> + <td> + <netui:error key="item4"/> + </td> + </tr> + </table> + <br/> + + <netui:button action="validate"></netui:button> + </netui:form> + <hr> + <netui:errors/> + </netui:body> +</netui:html> + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/index.jsp ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/merge-validation.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/merge-validation.xml?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/merge-validation.xml (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/merge-validation.xml Mon Feb 14 17:11:54 2005 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN" "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd";> +<form-validation> + <formset> + <form name="validatableFormData"> + <field property="item2" depends="minlength"> + <msg name="minlength" key="minlength.msg" resource="true"/> + <var> + <var-name>minlength</var-name> + <var-value>4</var-value> + </var> + <arg0 key="item2.minlength.name" resource="true" name="minlength"/> + <arg1 key="item2.minlength.length" resource="true" name="minlength"/> + </field> + <field property="item4" depends="minlength"> + <msg name="minlength" key="minlength.msg" resource="true"/> + <var> + <var-name>minlength</var-name> + <var-value>8</var-value> + </var> + <arg0 key="item4.minlength.name" resource="true" name="minlength"/> + <arg1 key="item4.minlength.length" resource="true" name="minlength"/> + </field> + </form> + </formset> +</form-validation> Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge/merge-validation.xml ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/Controller.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/Controller.jpf?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/Controller.jpf (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/Controller.jpf Mon Feb 14 17:11:54 2005 @@ -0,0 +1,133 @@ +/* + * Copyright 2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * $Header:$ + */ +package validation.messages.merge11; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import org.apache.struts.action.ActionMapping; +import org.apache.beehive.netui.pageflow.annotations.Jpf; +import org.apache.beehive.netui.pageflow.FormData; +import org.apache.beehive.netui.pageflow.Forward; +import org.apache.beehive.netui.pageflow.PageFlowController; + +import validation.messages.ValidatableFormData; + [EMAIL PROTECTED]( + messageBundles = { + @Jpf.MessageBundle(bundlePath = "validation.messages.messages") + }, + validatorVersion = Jpf.ValidatorVersion.oneOne, + validatorMerge = "merge-validation.xml", + validatableBeans = { + @Jpf.ValidatableBean( + type = validation.messages.ValidatableFormData.class, + validatableProperties = { + @Jpf.ValidatableProperty( + propertyName = "item1", + validateMinLength = + @Jpf.ValidateMinLength( + chars = 2, + message = "minimum length for {0} is {1} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "item1" + ), + @Jpf.MessageArg( + arg = "two" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item2", + validateMaxLength = + @Jpf.ValidateMaxLength( + chars = 8, + message = "maximum length for {0} is {1} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "item2" + ), + @Jpf.MessageArg( + arg = "eight" + ) + } + ) + ), + @Jpf.ValidatableProperty( + propertyName = "item4", + validateMaxLength = + @Jpf.ValidateMaxLength( + chars = 16, + message = "maximum length for {0} is {1} chars", + messageArgs = { + @Jpf.MessageArg( + arg = "item4" + ), + @Jpf.MessageArg( + arg = "sixteen" + ) + } + ) + ) + } + ) + } +) +public class Controller extends PageFlowController +{ + @Jpf.Action( + forwards={ + @Jpf.Forward(name="index", path="index.jsp") + } + ) + protected Forward begin() + { + return new Forward("index"); + } + + + /** + * Callback that is invoked when this controller instance is created. + */ + protected void onCreate() + { + } + + /** + * Callback that is invoked when this controller instance is destroyed. + */ + protected void onDestroy(HttpSession session) + { + } + + + @Jpf.Action( + forwards = { + @Jpf.Forward(name = "success", path = "index.jsp") + }, + validationErrorForward = @Jpf.Forward(name = "errors", + path = "index.jsp") + ) + protected Forward validate(ValidatableFormData form) + { + Forward forward = new Forward( "success" ); + return forward; + } +} + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/Controller.jpf ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/index.jsp URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/index.jsp?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/index.jsp (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/index.jsp Mon Feb 14 17:11:54 2005 @@ -0,0 +1,58 @@ +<%@ page language="java" contentType="text/html;charset=UTF-8"%> +<%@ taglib prefix="netui" uri="http://beehive.apache.org/netui/tags-html-1.0"%> + +<netui:html> + <head> + <netui:base/> + </head> + <netui:body> + <h3>Declarative Validation Test</h3> + + <netui:form action="validate"> + <table> + <tr valign="top"> + <td>item1:</td> + <td> + <netui:textBox dataSource="actionForm.item1"></netui:textBox> + </td> + <td> + <netui:error key="item1"/> + </td> + </tr> + <tr valign="top"> + <td>item2:</td> + <td> + <netui:textBox dataSource="actionForm.item2"></netui:textBox> + </td> + <td> + <netui:error key="item2"/> + </td> + </tr> + <tr valign="top"> + <td>item3:</td> + <td> + <netui:textBox dataSource="actionForm.item3"></netui:textBox> + </td> + <td> + <netui:error key="item3"/> + </td> + </tr> + <tr valign="top"> + <td>item4:</td> + <td> + <netui:textBox dataSource="actionForm.item4"></netui:textBox> + </td> + <td> + <netui:error key="item4"/> + </td> + </tr> + </table> + <br/> + + <netui:button action="validate"></netui:button> + </netui:form> + <hr> + <netui:errors/> + </netui:body> +</netui:html> + Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/index.jsp ------------------------------------------------------------------------------ svn:eol-style = native Added: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/merge-validation.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/merge-validation.xml?view=auto&rev=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/merge-validation.xml (added) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/merge-validation.xml Mon Feb 14 17:11:54 2005 @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd";> +<form-validation> + <formset> + <form name="validatableFormData"> + <field property="item2" depends="minlength"> + <msg name="minlength" key="minlength.msg" resource="true"/> + <var> + <var-name>minlength</var-name> + <var-value>4</var-value> + </var> + <arg key="item2.minlength.name" resource="true" position="0" name="minlength"/> + <arg key="item2.minlength.length" resource="true" position="1" name="minlength"/> + </field> + <field property="item4" depends="minlength"> + <msg name="minlength" key="minlength.msg" resource="true"/> + <var> + <var-name>minlength</var-name> + <var-value>8</var-value> + </var> + <arg key="item4.minlength.name" resource="true" position="0" name="minlength"/> + <arg key="item4.minlength.length" resource="true" position="1" name="minlength"/> + </field> + </form> + </formset> +</form-validation> Propchange: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/messages/merge11/merge-validation.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf?view=diff&r1=153877&r2=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/strutsValidator/strutsValidatorController.jpf Mon Feb 14 17:11:54 2005 @@ -23,162 +23,12 @@ import javax.servlet.http.*; -/** - * @jpf:controller nested="true" struts-merge="/WEB-INF/strutsValidator-merge-config.xml" - * @jpf:message-resources resources="validation.validator.Messages" - * @jpf:view-properties view-properties:: - * <!-- This data is auto-generated. Hand-editing this section is not recommended. --> - * <view-properties> - * <pageflow-object id="pageflow:/validation/strutsValidator/strutsValidatorController.jpf"/> - * <pageflow-object id="action:begin.do"> - * <property value="80" name="x"/> - * <property value="240" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:submitForm.do#validation.strutsValidator.strutsValidatorController.MyForm"> - * <property value="280" name="x"/> - * <property value="400" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:exit.do"> - * <property value="280" name="x"/> - * <property value="80" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:submitForm.do#validation.strutsValidator.strutsValidatorController.MyForm@"> - * <property value="280,280,280,280" name="elbowsX"/> - * <property value="284,320,320,356" name="elbowsY"/> - * <property value="South_1" name="fromPort"/> - * <property value="North_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:exit.do@"> - * <property value="280,280,280,280" name="elbowsX"/> - * <property value="196,160,160,124" name="elbowsY"/> - * <property value="North_1" name="fromPort"/> - * <property value="South_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="page:formPage.jsp"> - * <property value="280" name="x"/> - * <property value="240" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:begin.do@"> - * <property value="80,80,80,80" name="elbowsX"/> - * <property value="356,320,320,284" name="elbowsY"/> - * <property value="North_1" name="fromPort"/> - * <property value="South_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="page:success.jsp"> - * <property value="80" name="x"/> - * <property value="400" name="y"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@"> - * <property value="116,180,180,244" name="elbowsX"/> - * <property value="232,232,232,232" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="formPage" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:submitForm.do#validation.strutsValidator.strutsValidatorController.MyForm@"> - * <property value="244,180,180,116" name="elbowsX"/> - * <property value="392,392,392,392" name="elbowsY"/> - * <property value="West_1" name="fromPort"/> - * <property value="East_1" name="toPort"/> - * <property value="success" name="label"/> - * </pageflow-object> - * <pageflow-object id="exit:begin"> - * <property value="480" name="x"/> - * <property value="80" name="y"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:exit.do@"> - * <property value="316,380,380,444" name="elbowsX"/> - * <property value="72,72,72,72" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="previousPageFlowBegin" name="label"/> - * </pageflow-object> - * <pageflow-object id="formbeanprop:validation.strutsValidator.strutsValidatorController.MyForm#email#java.lang.String"/> - * <pageflow-object id="formbeanprop:validation.strutsValidator.strutsValidatorController.MyForm#age#java.lang.String"/> - * <pageflow-object id="formbean:validation.strutsValidator.strutsValidatorController.MyForm"/> - * </view-properties> - * :: - * - */ @Jpf.Controller( nested = true, strutsMerge = "/WEB-INF/strutsValidator-merge-config.xml", messageBundles = { @Jpf.MessageBundle( bundlePath = "validation.validator.Messages") - }) [EMAIL PROTECTED]( - value = { - "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->", - "<view-properties>", - "<pageflow-object id='pageflow:/validation/strutsValidator/strutsValidatorController.jpf'/>", - "<pageflow-object id='action:begin.do'>", - " <property value='80' name='x'/>", - " <property value='240' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:submitForm.do#validation.strutsValidator.strutsValidatorController.MyForm'>", - " <property value='280' name='x'/>", - " <property value='400' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:exit.do'>", - " <property value='280' name='x'/>", - " <property value='80' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:submitForm.do#validation.strutsValidator.strutsValidatorController.MyForm@'>", - " <property value='280,280,280,280' name='elbowsX'/>", - " <property value='284,320,320,356' name='elbowsY'/>", - " <property value='South_1' name='fromPort'/>", - " <property value='North_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:exit.do@'>", - " <property value='280,280,280,280' name='elbowsX'/>", - " <property value='196,160,160,124' name='elbowsY'/>", - " <property value='North_1' name='fromPort'/>", - " <property value='South_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='page:formPage.jsp'>", - " <property value='280' name='x'/>", - " <property value='240' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:begin.do@'>", - " <property value='80,80,80,80' name='elbowsX'/>", - " <property value='356,320,320,284' name='elbowsY'/>", - " <property value='North_1' name='fromPort'/>", - " <property value='South_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='page:success.jsp'>", - " <property value='80' name='x'/>", - " <property value='400' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>", - " <property value='116,180,180,244' name='elbowsX'/>", - " <property value='232,232,232,232' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='formPage' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:submitForm.do#validation.strutsValidator.strutsValidatorController.MyForm@'>", - " <property value='244,180,180,116' name='elbowsX'/>", - " <property value='392,392,392,392' name='elbowsY'/>", - " <property value='West_1' name='fromPort'/>", - " <property value='East_1' name='toPort'/>", - " <property value='success' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='exit:begin'>", - " <property value='480' name='x'/>", - " <property value='80' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:exit.do@'>", - " <property value='316,380,380,444' name='elbowsX'/>", - " <property value='72,72,72,72' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='previousPageFlowBegin' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='formbeanprop:validation.strutsValidator.strutsValidatorController.MyForm#email#java.lang.String'/>", - "<pageflow-object id='formbeanprop:validation.strutsValidator.strutsValidatorController.MyForm#age#java.lang.String'/>", - "<pageflow-object id='formbean:validation.strutsValidator.strutsValidatorController.MyForm'/>", - "</view-properties>" }) public class strutsValidatorController extends PageFlowController { Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf?view=diff&r1=153877&r2=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/validation/validationController.jpf Mon Feb 14 17:11:54 2005 @@ -23,185 +23,10 @@ import javax.servlet.http.*; -/** - * @jpf:message-resources resources="validation.ValidationMessages" - * @jpf:view-properties view-properties:: - * <!-- This data is auto-generated. Hand-editing this section is not recommended. --> - * <view-properties> - * <pageflow-object id="pageflow:/validation/validationController.jpf"/> - * <pageflow-object id="action:begin.do"> - * <property value="80" name="x"/> - * <property value="300" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:doBasic.do"> - * <property value="420" name="x"/> - * <property value="400" name="y"/> - * </pageflow-object> - * <pageflow-object id="action:doValidator.do"> - * <property value="420" name="x"/> - * <property value="200" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:doBasic.do@"> - * <property value="420,420,420,420" name="elbowsX"/> - * <property value="344,350,350,356" name="elbowsY"/> - * <property value="South_1" name="fromPort"/> - * <property value="North_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:doValidator.do@"> - * <property value="420,420,420,420" name="elbowsX"/> - * <property value="256,250,250,244" name="elbowsY"/> - * <property value="North_1" name="fromPort"/> - * <property value="South_1" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="page:index.jsp"> - * <property value="420" name="x"/> - * <property value="300" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@external-jpf:basicValidation/[EMAIL PROTECTED]@action:begin.do@"> - * <property value="384,250,250,116" name="elbowsX"/> - * <property value="512,512,303,303" name="elbowsY"/> - * <property value="West_1" name="fromPort"/> - * <property value="East_2" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="external-jpf:basicValidation/basicValidationController.jpf"> - * <property value="420" name="x"/> - * <property value="520" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@external-jpf:strutsValidator/[EMAIL PROTECTED]@action:begin.do@"> - * <property value="384,250,250,116" name="elbowsX"/> - * <property value="72,72,281,281" name="elbowsY"/> - * <property value="West_1" name="fromPort"/> - * <property value="East_0" name="toPort"/> - * </pageflow-object> - * <pageflow-object id="external-jpf:strutsValidator/strutsValidatorController.jpf"> - * <property value="420" name="x"/> - * <property value="80" name="y"/> - * </pageflow-object> - * <pageflow-object id="forward:[EMAIL PROTECTED]:begin.do@"> - * <property value="116,250,250,384" name="elbowsX"/> - * <property value="292,292,292,292" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * <property value="index" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:path#basicValidationPageFlow#basicValidation/[EMAIL PROTECTED]:doBasic.do@"> - * <property value="420,420,420,420" name="elbowsX"/> - * <property value="444,460,460,476" name="elbowsY"/> - * <property value="South_1" name="fromPort"/> - * <property value="North_1" name="toPort"/> - * <property value="basicValidationPageFlow" name="label"/> - * </pageflow-object> - * <pageflow-object id="forward:path#validatorPageFlow#strutsValidator/[EMAIL PROTECTED]:doValidator.do@"> - * <property value="420,420,420,420" name="elbowsX"/> - * <property value="156,140,140,124" name="elbowsY"/> - * <property value="North_1" name="fromPort"/> - * <property value="South_1" name="toPort"/> - * <property value="validatorPageFlow" name="label"/> - * </pageflow-object> - * <pageflow-object id="action:goMain.do"> - * <property value="620" name="x"/> - * <property value="300" name="y"/> - * </pageflow-object> - * <pageflow-object id="action-call:@page:[EMAIL PROTECTED]@action:goMain.do@"> - * <property value="456,520,520,585" name="elbowsX"/> - * <property value="292,292,292,292" name="elbowsY"/> - * <property value="East_1" name="fromPort"/> - * <property value="West_1" name="toPort"/> - * </pageflow-object> - * </view-properties> - * :: - * - */ @Jpf.Controller( messageBundles = { @Jpf.MessageBundle( bundlePath = "validation.ValidationMessages") - }) [EMAIL PROTECTED]( - value = { - "<!-- This data is auto-generated. Hand-editing this section is not recommended. -->", - "<view-properties>", - "<pageflow-object id='pageflow:/validation/validationController.jpf'/>", - "<pageflow-object id='action:begin.do'>", - " <property value='80' name='x'/>", - " <property value='300' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:doBasic.do'>", - " <property value='420' name='x'/>", - " <property value='400' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action:doValidator.do'>", - " <property value='420' name='x'/>", - " <property value='200' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:doBasic.do@'>", - " <property value='420,420,420,420' name='elbowsX'/>", - " <property value='344,350,350,356' name='elbowsY'/>", - " <property value='South_1' name='fromPort'/>", - " <property value='North_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:doValidator.do@'>", - " <property value='420,420,420,420' name='elbowsX'/>", - " <property value='256,250,250,244' name='elbowsY'/>", - " <property value='North_1' name='fromPort'/>", - " <property value='South_1' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='page:index.jsp'>", - " <property value='420' name='x'/>", - " <property value='300' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@external-jpf:basicValidation/[EMAIL PROTECTED]@action:begin.do@'>", - " <property value='384,250,250,116' name='elbowsX'/>", - " <property value='512,512,303,303' name='elbowsY'/>", - " <property value='West_1' name='fromPort'/>", - " <property value='East_2' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='external-jpf:basicValidation/basicValidationController.jpf'>", - " <property value='420' name='x'/>", - " <property value='520' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@external-jpf:strutsValidator/[EMAIL PROTECTED]@action:begin.do@'>", - " <property value='384,250,250,116' name='elbowsX'/>", - " <property value='72,72,281,281' name='elbowsY'/>", - " <property value='West_1' name='fromPort'/>", - " <property value='East_0' name='toPort'/>", - "</pageflow-object>", - "<pageflow-object id='external-jpf:strutsValidator/strutsValidatorController.jpf'>", - " <property value='420' name='x'/>", - " <property value='80' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='forward:[EMAIL PROTECTED]:begin.do@'>", - " <property value='116,250,250,384' name='elbowsX'/>", - " <property value='292,292,292,292' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - " <property value='index' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:path#basicValidationPageFlow#basicValidation/[EMAIL PROTECTED]:doBasic.do@'>", - " <property value='420,420,420,420' name='elbowsX'/>", - " <property value='444,460,460,476' name='elbowsY'/>", - " <property value='South_1' name='fromPort'/>", - " <property value='North_1' name='toPort'/>", - " <property value='basicValidationPageFlow' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='forward:path#validatorPageFlow#strutsValidator/[EMAIL PROTECTED]:doValidator.do@'>", - " <property value='420,420,420,420' name='elbowsX'/>", - " <property value='156,140,140,124' name='elbowsY'/>", - " <property value='North_1' name='fromPort'/>", - " <property value='South_1' name='toPort'/>", - " <property value='validatorPageFlow' name='label'/>", - "</pageflow-object>", - "<pageflow-object id='action:goMain.do'>", - " <property value='620' name='x'/>", - " <property value='300' name='y'/>", - "</pageflow-object>", - "<pageflow-object id='action-call:@page:[EMAIL PROTECTED]@action:goMain.do@'>", - " <property value='456,520,520,585' name='elbowsX'/>", - " <property value='292,292,292,292' name='elbowsY'/>", - " <property value='East_1' name='fromPort'/>", - " <property value='West_1' name='toPort'/>", - "</pageflow-object>", - "</view-properties>" }) public class validationController extends PageFlowController { Modified: incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?view=diff&r1=153877&r2=153878 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml Mon Feb 14 17:11:54 2005 @@ -6842,6 +6842,56 @@ </features> </test> <test> + <name>ValidatorMerge</name> + <description>Test the validatorMerge attribute for the Controller annotation.</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>bvt.struts11</category> + <category>corePageFlow</category> + </categories> + <features> + <feature>Validation</feature> + </features> + </test> + <test> + <name>ValidatorMerge11</name> + <description>Test the validatorMerge attribute for the Controller annotation with version 1.1 of the validator.</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>corePageFlow</category> + </categories> + <features> + <feature>Validation</feature> + </features> + </test> + <test> + <name>ValidatorMsgArgs</name> + <description>Test the support for rule messages and args in the declarative validation annotations.</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>bvt.struts11</category> + <category>corePageFlow</category> + </categories> + <features> + <feature>Validation</feature> + </features> + </test> + <test> + <name>ValidatorMsgArgs11</name> + <description>Test the support for rule messages and args in the declarative validation annotations with version 1.1 of the validator.</description> + <webapp>coreWeb</webapp> + <categories> + <category>bvt</category> + <category>corePageFlow</category> + </categories> + <features> + <feature>Validation</feature> + </features> + </test> + <test> <name>VariantValidation</name> <description>Test support of locale variant in the validation locale rules and creation of the validation rules XML file.</description> <webapp>coreWeb</webapp>
