dwinterfeldt    02/03/16 16:18:06

  Modified:    validator/src/share/org/apache/commons/validator
                        ValidatorResourcesInitializer.java
  Log:
  Changed rules to load constant from an element structure instead of attributes so 
CDATA can be used for a constant value.
  
  Revision  Changes    Path
  1.5       +12 -11    
jakarta-commons/validator/src/share/org/apache/commons/validator/ValidatorResourcesInitializer.java
  
  Index: ValidatorResourcesInitializer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/ValidatorResourcesInitializer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ValidatorResourcesInitializer.java        12 Mar 2002 04:07:39 -0000      1.4
  +++ ValidatorResourcesInitializer.java        17 Mar 2002 00:18:06 -0000      1.5
  @@ -137,11 +137,11 @@
         digester.setValidating(false);
         
         // Create Global Constant objects
  -      digester.addObjectCreate("form-validation/global/constant",
  -                              "org.apache.commons.validator.Constant", "className");
  -      digester.addSetProperties("form-validation/global/constant");
  -      digester.addSetNext("form-validation/global/constant", "addConstant",
  -                         "org.apache.commons.validator.Constant");
  +      digester.addCallMethod("form-validation/global/constant",
  +                             "addConstantParam", 2);
  +      digester.addCallParam("form-validation/global/constant/constant-name", 0);
  +      digester.addCallParam("form-validation/global/constant/constant-value", 1);
  +                         
         // Create Global ValidatorAction objects
         digester.addObjectCreate("form-validation/global/validator",
                                 "org.apache.commons.validator.ValidatorAction", 
"className");
  @@ -160,12 +160,13 @@
         digester.addSetProperties("form-validation/formset");
         digester.addSetNext("form-validation/formset", "put",
                            "org.apache.commons.validator.FormSet");
  +
         // Create Constant objects
  -      digester.addObjectCreate("form-validation/formset/constant",
  -                              "org.apache.commons.validator.Constant", "className");
  -      digester.addSetProperties("form-validation/formset/constant");
  -      digester.addSetNext("form-validation/formset/constant", "addConstant",
  -                         "org.apache.commons.validator.Constant");
  +      digester.addCallMethod("form-validation/formset/constant",
  +                             "addConstantParam", 2);
  +      digester.addCallParam("form-validation/formset/constant/constant-name", 0);
  +      digester.addCallParam("form-validation/formset/constant/constant-value", 1);
  +
         // Create Form objects
         digester.addObjectCreate("form-validation/formset/form",
                                 "org.apache.commons.validator.Form", "className");
  @@ -227,7 +228,7 @@
            digester.parse(in);
            in.close();
         } catch (SAXException e) {
  -          log.error("ValidatorResourcesInitializer::initialize - SAXException: " + 
e.getMessage(), e);
  +          log.error(e.getMessage(), e);
         } finally {
                 if (in != null)
               try {in.close(); } catch (Exception e) {}
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to