dwinterfeldt 02/01/14 19:57:40
Modified: contrib/validator INSTALL
contrib/validator/dist struts-validator.tld
contrib/validator/web/example/WEB-INF struts-config.xml
validation.xml web.xml
Removed: contrib/validator build-test.xml
Log:
Package names have changed and dependencies have been added on the Commons Validator.
Revision Changes Path
1.2 +5 -4 jakarta-struts/contrib/validator/INSTALL
Index: INSTALL
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/validator/INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- INSTALL 7 Jul 2001 05:31:18 -0000 1.1
+++ INSTALL 15 Jan 2002 03:57:40 -0000 1.2
@@ -1,13 +1,14 @@
Struts Validator
==================
-The Struts Validator Jar (dist/Struts_Validator-{date}.jar) and version 1.2 of the
-Jakarta Regular Expression Package (http://jakarta.apache.org/regexp) needs to be
-added to /WEB-INF/lib.
+The Struts Validator Jar (dist/struts-validator.jar),
+Jakarta Commons Validator (http://jakarta.apache.org/commons) ,
+and version 1.2 of the Jakarta Regular Expression Package
+(http://jakarta.apache.org/regexp) needs to be added to /WEB-INF/lib.
This needs to be added to the web.xml file to load the ValidatorServlet.
<servlet>
<servlet-name>validator</servlet-name>
- <servlet-class>com.wintecinc.struts.action.ValidatorServlet</servlet-class>
+ <servlet-class>org.apache.struts.action.ValidatorServlet</servlet-class>
<init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/validation.xml</param-value>
1.2 +1 -101 jakarta-struts/contrib/validator/dist/struts-validator.tld
Index: struts-validator.tld
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/validator/dist/struts-validator.tld,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-validator.tld 9 Jul 2001 02:48:50 -0000 1.1
+++ struts-validator.tld 15 Jan 2002 03:57:40 -0000 1.2
@@ -7,7 +7,7 @@
<shortname>Struts Form Validator Tags</shortname>
<tag>
<name>javascript</name>
- <tagclass>com.wintecinc.struts.taglib.html.JavascriptValidatorTag</tagclass>
+
<tagclass>org.apache.struts.validator.taglib.html.JavascriptValidatorTag</tagclass>
<attribute>
<name>formName</name>
<required>false</required>
@@ -35,106 +35,6 @@
</attribute>
<attribute>
<name>src</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>errors</name>
- <tagclass>com.wintecinc.struts.taglib.html.ErrorsTag</tagclass>
- <teiclass>com.wintecinc.struts.taglib.html.ErrorsTei</teiclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>bundle</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>locale</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>property</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>header</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>footer</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>errorsExist</name>
- <tagclass>com.wintecinc.struts.taglib.html.ErrorsExistTag</tagclass>
- <attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>property</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>messages</name>
- <tagclass>com.wintecinc.struts.taglib.html.MessagesTag</tagclass>
- <teiclass>com.wintecinc.struts.taglib.html.MessagesTei</teiclass>
- <bodycontent>JSP</bodycontent>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>bundle</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>locale</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>header</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>footer</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>messagesExist</name>
- <tagclass>com.wintecinc.struts.taglib.html.MessagesExistTag</tagclass>
- <attribute>
- <name>name</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
1.2 +8 -8
jakarta-struts/contrib/validator/web/example/WEB-INF/struts-config.xml
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/web/example/WEB-INF/struts-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-config.xml 9 Jul 2001 02:30:58 -0000 1.1
+++ struts-config.xml 15 Jan 2002 03:57:40 -0000 1.2
@@ -23,19 +23,19 @@
<!-- Registration form bean -->
<form-bean name="registrationForm"
- type="com.wintecinc.struts.example.validator.RegistrationForm"/>
+ type="org.apache.struts.validator.example.RegistrationForm"/>
<!-- Multi-Part Registration form bean -->
<form-bean name="multiRegistrationForm"
- type="com.wintecinc.struts.example.validator.RegistrationForm"/>
+ type="org.apache.struts.validator.example.RegistrationForm"/>
<!-- Type form bean -->
<form-bean name="typeForm"
- type="com.wintecinc.struts.example.validator.TypeForm"/>
+ type="org.apache.struts.validator.example.TypeForm"/>
<!-- JavaScript Type form bean -->
<form-bean name="jsTypeForm"
- type="com.wintecinc.struts.example.validator.TypeForm"/>
+ type="org.apache.struts.validator.example.TypeForm"/>
</form-beans>
@@ -49,7 +49,7 @@
<!-- Registration Form -->
<action path="/registration"
- type="com.wintecinc.struts.example.validator.RegistrationAction"
+ type="org.apache.struts.validator.example.RegistrationAction"
name="registrationForm"
scope="request"
validate="true"
@@ -59,7 +59,7 @@
<!-- Multi-Part Registration Form -->
<action path="/multiRegistration"
- type="com.wintecinc.struts.example.validator.MultiRegistrationAction"
+ type="org.apache.struts.validator.example.MultiRegistrationAction"
name="multiRegistrationForm"
scope="request"
validate="false">
@@ -70,7 +70,7 @@
<!-- Type Form -->
<action path="/type"
- type="com.wintecinc.struts.example.validator.TypeAction"
+ type="org.apache.struts.validator.example.TypeAction"
name="typeForm"
scope="request"
validate="true"
@@ -80,7 +80,7 @@
<!-- JavaScript Type Form -->
<action path="/jsType"
- type="com.wintecinc.struts.example.validator.TypeAction"
+ type="org.apache.struts.validator.example.TypeAction"
name="jsTypeForm"
scope="request"
validate="true"
1.5 +14 -14
jakarta-struts/contrib/validator/web/example/WEB-INF/validation.xml
Index: validation.xml
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/web/example/WEB-INF/validation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- validation.xml 17 Oct 2001 20:37:05 -0000 1.4
+++ validation.xml 15 Jan 2002 03:57:40 -0000 1.5
@@ -4,7 +4,7 @@
<constant name="zip" value="^\d{5}\d*$" />
<validator name="required"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateRequired"
msg="errors.required">
<javascript><![CDATA[
@@ -37,7 +37,7 @@
</validator>
<validator name="minlength"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateMinLength"
depends="required"
msg="errors.minlength">
@@ -75,7 +75,7 @@
</validator>
<validator name="maxlength"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateMaxLength"
depends="required"
msg="errors.maxlength">
@@ -113,7 +113,7 @@
</validator>
<validator name="mask"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateMask"
depends="required"
msg="errors.invalid">
@@ -158,7 +158,7 @@
</validator>
<validator name="byte"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateByte"
depends="required"
msg="errors.byte"
@@ -197,7 +197,7 @@
</validator>
<validator name="short"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateShort"
depends="required"
msg="errors.short"
@@ -236,7 +236,7 @@
</validator>
<validator name="integer"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateInteger"
depends="required"
msg="errors.integer"
@@ -275,13 +275,13 @@
</validator>
<validator name="long"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateLong"
depends="required"
msg="errors.long"
/>
<validator name="float"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateFloat"
depends="required"
msg="errors.float"
@@ -320,13 +320,13 @@
</validator>
<validator name="double"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateDouble"
depends="required"
msg="errors.double"/>
<validator name="date"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateDate"
depends="required"
msg="errors.date"
@@ -493,7 +493,7 @@
</validator>
<validator name="range"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateRange"
depends="required,integer"
msg="errors.range">
@@ -533,7 +533,7 @@
</validator>
<validator name="creditCard"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateCreditCard"
depends="required"
msg="errors.creditcard">
@@ -602,7 +602,7 @@
</validator>
<validator name="email"
- classname="com.wintecinc.struts.validation.StrutsValidator"
+ classname="org.apache.struts.validator.util.StrutsValidator"
method="validateEmail"
depends="required"
msg="errors.email">
1.2 +2 -2 jakarta-struts/contrib/validator/web/example/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/validator/web/example/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 9 Jul 2001 02:30:58 -0000 1.1
+++ web.xml 15 Jan 2002 03:57:40 -0000 1.2
@@ -8,7 +8,7 @@
<!-- Validator Initialization Servlet Configuration -->
<servlet>
<servlet-name>validator</servlet-name>
- <servlet-class>com.wintecinc.struts.action.ValidatorServlet</servlet-class>
+
<servlet-class>org.apache.struts.validator.action.ValidatorServlet</servlet-class>
<init-param>
<param-name>config</param-name>
<param-value>/WEB-INF/validation.xml</param-value>
@@ -26,7 +26,7 @@
<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
<init-param>
<param-name>application</param-name>
-
<param-value>com.wintecinc.struts.example.validator.ApplicationResources</param-value>
+
<param-value>org.apache.struts.validator.example.ApplicationResources</param-value>
</init-param>
<init-param>
<param-name>config</param-name>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
