commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skitch...@apache.org
Subject cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules digester-rules.dtd
Date Fri, 14 Jan 2005 11:04:31 GMT
skitching    2005/01/14 03:04:31

  Modified:    digester/src/java/org/apache/commons/digester/xmlrules
                        digester-rules.dtd
  Log:
  * Use Parameter Entity to define list of rule elements instead of using
    copy-and paste. This also fixed a few inconsistencies.
  * Add set-nested-properties-rule.
  Thanks to Wendy Smoak for much of this patch.
  
  Revision  Changes    Path
  1.14      +14 -9     jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/digester-rules.dtd
  
  Index: digester-rules.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/xmlrules/digester-rules.dtd,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- digester-rules.dtd	9 Sep 2004 20:38:21 -0000	1.13
  +++ digester-rules.dtd	14 Jan 2005 11:04:31 -0000	1.14
  @@ -38,11 +38,12 @@
   <!ENTITY % rule-elements "bean-property-setter-rule | call-method-rule |
                      call-param-rule | object-param-rule |
                      factory-create-rule | object-create-rule |
  -                   set-properties-rule | set-property-rule | set-top-rule |
  -                   set-next-rule" >
  +                   set-properties-rule | set-nested-properties-rule |
  +                   set-property-rule | set-top-rule |
  +                   set-next-rule | set-root-rule" >
   
   <!-- digester-rules is the root element. -->
  -<!ELEMENT digester-rules (pattern | include | bean-property-setter-rule | call-method-rule
| call-param-rule |  object-param-rule | factory-create-rule | object-create-rule | set-properties-rule
| set-property-rule | set-top-rule | set-next-rule )*>
  +<!ELEMENT digester-rules (pattern | include | %rule-elements; )*>
   
   
   <!-- <pattern> defines a matching pattern, or part of a matching pattern. Any
  @@ -60,10 +61,7 @@
   
     Note that the use of pattern elements is optional; an alternative is for
     each rule element to contain a 'pattern' attribute.   -->
  -<!ELEMENT pattern (pattern | include | bean-property-setter-rule | call-method-rule
| call-param-rule |
  -                   factory-create-rule | object-create-rule |
  -                   set-properties-rule | set-property-rule | set-top-rule |
  -                   set-next-rule )*>
  +<!ELEMENT pattern (pattern | include | %rule-elements; )*>
   <!ATTLIST pattern
       value CDATA #REQUIRED>
   
  @@ -166,6 +164,12 @@
   <!ATTLIST set-properties-rule
       pattern   CDATA #IMPLIED>
   
  +<!-- SetNestedPropertiesRule -->
  +<!ELEMENT set-nested-properties-rule (alias)*>
  +<!ATTLIST set-nested-properties-rule
  +    pattern                       CDATA #IMPLIED
  +    allow-unknown-child-elements  CDATA #IMPLIED>
  +
   <!-- An alias is a custom attribute->property name mapping -->
   <!ELEMENT alias EMPTY>
   <!ATTLIST alias
  @@ -199,3 +203,4 @@
       pattern    CDATA #IMPLIED
       methodname CDATA #REQUIRED
       paramtype  CDATA #IMPLIED>
  +
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message