You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by dg...@apache.org on 2004/01/17 20:46:16 UTC
cvs commit: jakarta-commons/validator/src/test/org/apache/commons/validator validator-type.xml validator-name-required.xml validator-regexp.xml validator-locale.xml validator-multiple-config-2.xml validator-requiredif.xml validator-numeric.xml validator-multipletest.xml
dgraham 2004/01/17 11:46:16
Modified: validator/src/test/org/apache/commons/validator
validator-type.xml validator-name-required.xml
validator-regexp.xml validator-locale.xml
validator-multiple-config-2.xml
validator-requiredif.xml validator-numeric.xml
validator-multipletest.xml
Log:
Simplified XML to make it easier to read.
Revision Changes Path
1.4 +7 -19 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-type.xml
Index: validator-type.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-type.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- validator-type.xml 12 Aug 2003 00:29:34 -0000 1.3
+++ validator-type.xml 17 Jan 2004 19:46:16 -0000 1.4
@@ -42,25 +42,13 @@
</global>
<formset>
- <form name="typeForm">
- <field property="byte"
- depends="byte">
- </field>
- <field property="short"
- depends="short">
- </field>
- <field property="integer"
- depends="int">
- </field>
- <field property="long"
- depends="long">
- </field>
- <field property="float"
- depends="float">
- </field>
- <field property="double"
- depends="double">
- </field>
+ <form name="typeForm">
+ <field property="byte" depends="byte"/>
+ <field property="short" depends="short"/>
+ <field property="integer" depends="int"/>
+ <field property="long" depends="long"/>
+ <field property="float" depends="float"/>
+ <field property="double" depends="double"/>
</form>
</formset>
</form-validation>
1.6 +5 -7 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-name-required.xml
Index: validator-name-required.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-name-required.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- validator-name-required.xml 12 Aug 2003 00:29:34 -0000 1.5
+++ validator-name-required.xml 17 Jan 2004 19:46:16 -0000 1.6
@@ -11,14 +11,12 @@
msg=""/>
</global>
<formset>
- <form name="nameForm">
- <field property="firstName"
- depends="required">
- <arg key="nameForm.firstname.displayname" position="0" bundle="test"/>
+ <form name="nameForm">
+ <field property="firstName" depends="required">
+ <arg key="nameForm.firstname.displayname" position="0" bundle="test"/>
</field>
- <field property="lastName"
- depends="required">
- <arg key="nameForm.lastname.displayname"/>
+ <field property="lastName" depends="required">
+ <arg key="nameForm.lastname.displayname"/>
</field>
</form>
</formset>
1.3 +2 -4 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-regexp.xml
Index: validator-regexp.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-regexp.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- validator-regexp.xml 12 Aug 2003 00:29:34 -0000 1.2
+++ validator-regexp.xml 17 Jan 2004 19:46:16 -0000 1.3
@@ -11,10 +11,8 @@
msg=""/>
</global>
<formset>
- <form name="emailForm">
- <field property="value"
- depends="email">
- </field>
+ <form name="emailForm">
+ <field property="value" depends="email"/>
</form>
</formset>
</form-validation>
1.4 +20 -24 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-locale.xml
Index: validator-locale.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-locale.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- validator-locale.xml 12 Aug 2003 00:29:34 -0000 1.3
+++ validator-locale.xml 17 Jan 2004 19:46:16 -0000 1.4
@@ -11,46 +11,42 @@
msg=""/>
</global>
<formset>
- <form name="nameForm" >
- <field property="firstName" depends="required">
- <arg key="nameForm.firstname.displayname"/>
+ <form name="nameForm">
+ <field property="firstName" depends="required">
+ <arg key="nameForm.firstname.displayname"/>
</field>
- <field property="lastName"
- depends="required">
- <arg key="nameForm.lastname.displayname"/>
+ <field property="lastName" depends="required">
+ <arg key="nameForm.lastname.displayname"/>
</field>
</form>
</formset>
<formset language="en" country="US" variant="TEST1">
- <form name="nameForm" >
- <field property="firstName" depends="required">
- <arg key="nameForm.firstname.displayname"/>
+ <form name="nameForm">
+ <field property="firstName" depends="required">
+ <arg key="nameForm.firstname.displayname"/>
</field>
- <field property="lastName"
- depends="required">
- <arg key="nameForm.lastname.displayname"/>
+ <field property="lastName" depends="required">
+ <arg key="nameForm.lastname.displayname"/>
</field>
</form>
</formset>
<formset language="en" country="US" variant="TEST2">
- <form name="nameForm" >
- <field property="firstName" depends="">
- <arg key="nameForm.firstname.displayname"/>
+ <form name="nameForm" >
+ <field property="firstName" depends="">
+ <arg key="nameForm.firstname.displayname"/>
</field>
- <field property="lastName"
- depends="required">
- <arg key="nameForm.lastname.displayname"/>
+ <field property="lastName" depends="required">
+ <arg key="nameForm.lastname.displayname"/>
</field>
</form>
</formset>
<formset language="en" country="UK">
- <form name="nameForm" >
- <field property="firstName" depends="required">
- <arg key="nameForm.firstname.displayname"/>
+ <form name="nameForm">
+ <field property="firstName" depends="required">
+ <arg key="nameForm.firstname.displayname"/>
</field>
- <field property="lastName"
- depends="">
- <arg key="nameForm.lastname.displayname"/>
+ <field property="lastName" depends="">
+ <arg key="nameForm.lastname.displayname"/>
</field>
</form>
</formset>
1.5 +5 -6 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-multiple-config-2.xml
Index: validator-multiple-config-2.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-multiple-config-2.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- validator-multiple-config-2.xml 12 Aug 2003 00:29:34 -0000 1.4
+++ validator-multiple-config-2.xml 17 Jan 2004 19:46:16 -0000 1.5
@@ -7,13 +7,12 @@
-->
<form-validation>
<formset>
- <form name="nameForm">
- <field property="firstName" depends="required">
- <arg key="nameForm.firstname.displayname"/>
+ <form name="nameForm">
+ <field property="firstName" depends="required">
+ <arg key="nameForm.firstname.displayname"/>
</field>
- <field property="lastName"
- depends="required,int">
- <arg key="nameForm.lastname.displayname"/>
+ <field property="lastName" depends="required,int">
+ <arg key="nameForm.lastname.displayname"/>
</field>
</form>
</formset>
1.5 +21 -22 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-requiredif.xml
Index: validator-requiredif.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-requiredif.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- validator-requiredif.xml 12 Aug 2003 00:29:34 -0000 1.4
+++ validator-requiredif.xml 17 Jan 2004 19:46:16 -0000 1.5
@@ -11,29 +11,28 @@
msg=""/>
</global>
<formset>
- <form name="nameForm">
- <field property="firstName" depends="requiredif">
- <arg key="nameForm.firstname.displayname"/>
- <var>
- <var-name>field[0]</var-name>
- <var-value>lastName</var-value>
- </var>
- <var>
- <var-name>fieldTest[0]</var-name>
- <var-value>NOTNULL</var-value>
- </var>
+ <form name="nameForm">
+ <field property="firstName" depends="requiredif">
+ <arg key="nameForm.firstname.displayname"/>
+ <var>
+ <var-name>field[0]</var-name>
+ <var-value>lastName</var-value>
+ </var>
+ <var>
+ <var-name>fieldTest[0]</var-name>
+ <var-value>NOTNULL</var-value>
+ </var>
</field>
- <field property="lastName"
- depends="requiredif">
- <arg key="nameForm.lastname.displayname"/>
- <var>
- <var-name>field[0]</var-name>
- <var-value>firstName</var-value>
- </var>
- <var>
- <var-name>fieldTest[0]</var-name>
- <var-value>NOTNULL</var-value>
- </var>
+ <field property="lastName" depends="requiredif">
+ <arg key="nameForm.lastname.displayname"/>
+ <var>
+ <var-name>field[0]</var-name>
+ <var-value>firstName</var-value>
+ </var>
+ <var>
+ <var-name>fieldTest[0]</var-name>
+ <var-value>NOTNULL</var-value>
+ </var>
</field>
</form>
</formset>
1.3 +12 -24 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-numeric.xml
Index: validator-numeric.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-numeric.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- validator-numeric.xml 12 Aug 2003 00:29:34 -0000 1.2
+++ validator-numeric.xml 17 Jan 2004 19:46:16 -0000 1.3
@@ -42,35 +42,23 @@
</global>
<formset>
- <form name="byteForm">
- <field property="value"
- depends="byte">
- </field>
+ <form name="byteForm">
+ <field property="value" depends="byte"/>
</form>
- <form name="shortForm">
- <field property="value"
- depends="short">
- </field>
+ <form name="shortForm">
+ <field property="value" depends="short"/>
</form>
- <form name="intForm">
- <field property="value"
- depends="int">
- </field>
+ <form name="intForm">
+ <field property="value" depends="int"/>
</form>
- <form name="longForm">
- <field property="value"
- depends="long">
- </field>
+ <form name="longForm">
+ <field property="value" depends="long"/>
</form>
- <form name="floatForm">
- <field property="value"
- depends="float">
- </field>
+ <form name="floatForm">
+ <field property="value" depends="float"/>
</form>
- <form name="doubleForm">
- <field property="value"
- depends="double">
- </field>
+ <form name="doubleForm">
+ <field property="value" depends="double"/>
</form>
</formset>
</form-validation>
1.5 +9 -10 jakarta-commons/validator/src/test/org/apache/commons/validator/validator-multipletest.xml
Index: validator-multipletest.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/validator/src/test/org/apache/commons/validator/validator-multipletest.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- validator-multipletest.xml 26 Aug 2003 15:18:56 -0000 1.4
+++ validator-multipletest.xml 17 Jan 2004 19:46:16 -0000 1.5
@@ -24,16 +24,15 @@
</global>
<formset>
- <form name="nameForm">
- <field property="firstName" depends="required">
- <arg key="nameForm.firstname.displayname"/>
- </field>
- <field property="middleName" depends="positive">
- <arg0 key="nameForm.middlename.displayname"/>
- </field>
- <field property="lastName"
- depends="required,int">
- <arg key="nameForm.lastname.displayname"/>
+ <form name="nameForm">
+ <field property="firstName" depends="required">
+ <arg key="nameForm.firstname.displayname"/>
+ </field>
+ <field property="middleName" depends="positive">
+ <arg0 key="nameForm.middlename.displayname"/>
+ </field>
+ <field property="lastName" depends="required,int">
+ <arg key="nameForm.lastname.displayname"/>
</field>
</form>
</formset>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org