You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ws...@apache.org on 2006/05/06 20:09:54 UTC

svn commit: r400346 - in /struts/action/trunk: apps/blank/src/main/webapp/WEB-INF/ apps/cookbook/src/main/webapp/WEB-INF/ apps/examples/src/main/webapp/WEB-INF/upload/ apps/examples/src/main/webapp/WEB-INF/validator/ apps/mailreader/src/main/webapp/WEB...

Author: wsmoak
Date: Sat May  6 11:09:51 2006
New Revision: 400346

URL: http://svn.apache.org/viewcvs?rev=400346&view=rev
Log:
The Commons Validator dependency was changed to v1.3.0 in r397364.
Change DOCTYPE in validator config files to v1.3.0 for consistency.
Issue:  STR-2860

Modified:
    struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml
    struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml
    struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml
    struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml
    struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml
    struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-type.xml
    struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-validwhen.xml
    struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation.xml
    struts/action/trunk/apps/mailreader/src/main/webapp/WEB-INF/validation.xml
    struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/validation.xml
    struts/action/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules.xml

Modified: struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml (original)
+++ struts/action/trunk/apps/blank/src/main/webapp/WEB-INF/validation.xml Sat May  6 11:09:51 2006
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 
 <!DOCTYPE form-validation PUBLIC
-     "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-     "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+     "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+     "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 
 <form-validation>
 

Modified: struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml (original)
+++ struts/action/trunk/apps/cookbook/src/main/webapp/WEB-INF/validation.xml Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE form-validation PUBLIC
-         "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-         "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+         "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+         "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 
 <form-validation>
 

Modified: struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml (original)
+++ struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/upload/validation.xml Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE form-validation PUBLIC
-        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-        "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+        "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 <form-validation>
 
     <formset>

Modified: struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml (original)
+++ struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-bundles.xml Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE form-validation PUBLIC
-          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-          "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 <form-validation>
 
   <!-- ========================= Default Formset ========================= -->

Modified: struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml (original)
+++ struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-i18nVariables.xml Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE form-validation PUBLIC
-          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-          "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 <form-validation>
   <global>
   </global>

Modified: struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-type.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-type.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-type.xml (original)
+++ struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-type.xml Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE form-validation PUBLIC
-          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-          "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 <form-validation>
 
   <!-- ========================= Default Formset ========================= -->

Modified: struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-validwhen.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-validwhen.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-validwhen.xml (original)
+++ struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation-validwhen.xml Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE form-validation PUBLIC
-          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-          "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 <form-validation>
   <global>
   </global>

Modified: struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation.xml (original)
+++ struts/action/trunk/apps/examples/src/main/webapp/WEB-INF/validator/validation.xml Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
 <!DOCTYPE form-validation PUBLIC
-          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-          "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 <form-validation>
   <global>
     <constant>

Modified: struts/action/trunk/apps/mailreader/src/main/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/mailreader/src/main/webapp/WEB-INF/validation.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/mailreader/src/main/webapp/WEB-INF/validation.xml (original)
+++ struts/action/trunk/apps/mailreader/src/main/webapp/WEB-INF/validation.xml Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE form-validation PUBLIC
-        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-        "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+        "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 
 <!--
     Validation Rules for the Struts MailReader Web Application

Modified: struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/validation.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/validation.xml (original)
+++ struts/action/trunk/apps/scripting-mailreader/src/main/webapp/WEB-INF/validation.xml Sat May  6 11:09:51 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1" ?>
 <!DOCTYPE form-validation PUBLIC
-        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-        "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+        "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 
 <!--
     Validation Rules for the Struts MailReader Web Application

Modified: struts/action/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules.xml
URL: http://svn.apache.org/viewcvs/struts/action/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules.xml?rev=400346&r1=400345&r2=400346&view=diff
==============================================================================
--- struts/action/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules.xml (original)
+++ struts/action/trunk/core/src/main/resources/org/apache/struts/validator/validator-rules.xml Sat May  6 11:09:51 2006
@@ -1,18 +1,19 @@
 <!DOCTYPE form-validation PUBLIC
-        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.2.0//EN"
-        "http://jakarta.apache.org/commons/dtds/validator_1_2_0.dtd">
+        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+        "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
 
 <!--
   $Id$
 
    This file contains the default Struts Validator pluggable validator
-   definitions.  It should be placed somewhere under /WEB-INF and
+   definitions.  It is contained in struts-core.jar, and should be 
    referenced in the struts-config.xml under the plug-in element
    for the ValidatorPlugIn.
 
       <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
-        <set-property property="pathnames" value="/WEB-INF/validator-rules.xml,
-                                                  /WEB-INF/validation.xml"/>
+        <set-property property="pathnames" 
+                      value="/org/apache/struts/validator/validator-rules.xml,
+                             /WEB-INF/validation.xml"/>
       </plug-in>
 
    These are the default error messages associated with