You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ni...@apache.org on 2006/12/03 05:48:49 UTC

svn commit: r481719 - in /struts/struts1/trunk: apps/examples/src/main/webapp/WEB-INF/validator/struts-config.xml core/pom.xml core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml

Author: niallp
Date: Sat Dec  2 20:48:48 2006
New Revision: 481719

URL: http://svn.apache.org/viewvc?view=rev&rev=481719
Log:
STR-2983 Upgrade to Validator 1.3.1 and provide "compressed" JavaScript version of validator-rules.xml

Modified:
    struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/validator/struts-config.xml
    struts/struts1/trunk/core/pom.xml
    struts/struts1/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml

Modified: struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/validator/struts-config.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/validator/struts-config.xml?view=diff&rev=481719&r1=481718&r2=481719
==============================================================================
--- struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/validator/struts-config.xml (original)
+++ struts/struts1/trunk/apps/examples/src/main/webapp/WEB-INF/validator/struts-config.xml Sat Dec  2 20:48:48 2006
@@ -100,7 +100,7 @@
        with a comma delimited list of resource files to load. 
     -->
   <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
-    <set-property property="pathnames" value="/org/apache/struts/validator/validator-rules.xml,
+    <set-property property="pathnames" value="/org/apache/struts/validator/validator-rules-compressed.xml,
                                               /WEB-INF/validator/validation.xml,
                                               /WEB-INF/validator/validation-bundles.xml,
                                               /WEB-INF/validator/validation-i18nVariables.xml,

Modified: struts/struts1/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/pom.xml?view=diff&rev=481719&r1=481718&r2=481719
==============================================================================
--- struts/struts1/trunk/core/pom.xml (original)
+++ struts/struts1/trunk/core/pom.xml Sat Dec  2 20:48:48 2006
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>xml-apis</groupId>

Modified: struts/struts1/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml?view=diff&rev=481719&r1=481718&r2=481719
==============================================================================
--- struts/struts1/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml (original)
+++ struts/struts1/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml Sat Dec  2 20:48:48 2006
@@ -60,7 +60,8 @@
                        org.apache.struts.action.ActionMessages,
                        org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
-                   msg="errors.required"/>
+                   msg="errors.required"
+                   jsFunction="org.apache.commons.validator.javascript.validateRequired-compress"/>
 
         <validator name="requiredif"
                    classname="org.apache.struts.validator.FieldChecks"
@@ -96,7 +97,7 @@
                        javax.servlet.http.HttpServletRequest"
                    depends=""
                    msg="errors.minlength"
-                   jsFunction="org.apache.commons.validator.javascript.validateMinLength"/>
+                   jsFunction="org.apache.commons.validator.javascript.validateMinLength-compress"/>
 
 
         <validator name="maxlength"
@@ -110,7 +111,7 @@
                        javax.servlet.http.HttpServletRequest"
                    depends=""
                    msg="errors.maxlength"
-                   jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/>
+                   jsFunction="org.apache.commons.validator.javascript.validateMaxLength-compress"/>
 
 
         <validator name="mask"
@@ -123,7 +124,8 @@
                        org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
                    depends=""
-                   msg="errors.invalid"/>
+                   msg="errors.invalid"
+                   jsFunction="org.apache.commons.validator.javascript.validateMask-compress"/>
 
 
         <validator name="byte"
@@ -137,7 +139,8 @@
                        javax.servlet.http.HttpServletRequest"
                    depends=""
                    msg="errors.byte"
-                   jsFunctionName="ByteValidations"/>
+                   jsFunctionName="ByteValidations"
+                   jsFunction="org.apache.commons.validator.javascript.validateByte-compress"/>
 
 
         <validator name="short"
@@ -151,7 +154,8 @@
                        javax.servlet.http.HttpServletRequest"
                    depends=""
                    msg="errors.short"
-                   jsFunctionName="ShortValidations"/>
+                   jsFunctionName="ShortValidations"
+                   jsFunction="org.apache.commons.validator.javascript.validateShort-compress"/>
 
 
         <validator name="integer"
@@ -165,7 +169,8 @@
                        javax.servlet.http.HttpServletRequest"
                    depends=""
                    msg="errors.integer"
-                   jsFunctionName="IntegerValidations"/>
+                   jsFunctionName="IntegerValidations"
+                   jsFunction="org.apache.commons.validator.javascript.validateInteger-compress"/>
 
 
         <validator name="long"
@@ -192,7 +197,8 @@
                        javax.servlet.http.HttpServletRequest"
                    depends=""
                    msg="errors.float"
-                   jsFunctionName="FloatValidations"/>
+                   jsFunctionName="FloatValidations"
+                   jsFunction="org.apache.commons.validator.javascript.validateFloat-compress"/>
 
         <validator name="double"
                    classname="org.apache.struts.validator.FieldChecks"
@@ -295,7 +301,8 @@
                        javax.servlet.http.HttpServletRequest"
                    depends=""
                    msg="errors.date"
-                   jsFunctionName="DateValidations"/>
+                   jsFunctionName="DateValidations"
+                   jsFunction="org.apache.commons.validator.javascript.validateDate-compress"/>
 
 
         <validator name="intRange"
@@ -308,7 +315,8 @@
                        org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
                    depends="integer"
-                   msg="errors.range"/>
+                   msg="errors.range"
+                   jsFunction="org.apache.commons.validator.javascript.validateIntRange-compress"/>
 
         <validator name="longRange"
                    classname="org.apache.struts.validator.FieldChecks"
@@ -333,7 +341,8 @@
                        org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
                    depends="float"
-                   msg="errors.range"/>
+                   msg="errors.range"
+                   jsFunction="org.apache.commons.validator.javascript.validateFloatRange-compress"/>
 
         <validator name="doubleRange"
                    classname="org.apache.struts.validator.FieldChecks"
@@ -358,7 +367,8 @@
                        org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
                    depends=""
-                   msg="errors.creditcard"/>
+                   msg="errors.creditcard"
+                   jsFunction="org.apache.commons.validator.javascript.validateCreditCard-compress"/>
 
 
         <validator name="email"
@@ -371,7 +381,8 @@
                        org.apache.commons.validator.Validator,
                        javax.servlet.http.HttpServletRequest"
                    depends=""
-                   msg="errors.email"/>
+                   msg="errors.email"
+                   jsFunction="org.apache.commons.validator.javascript.validateEmail-compress"/>
 
         <validator name="url"
                    classname="org.apache.struts.validator.FieldChecks"
@@ -395,7 +406,7 @@
                    methodParams=""
                    depends=""
                    msg=""
-                   jsFunction="org.apache.commons.validator.javascript.validateUtilities"/>
+                   jsFunction="org.apache.commons.validator.javascript.validateUtilities-compress"/>
 
     </global>