cvs commit: jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet ServletToolboxManager.java

[nbubna]

nbubna      2004/04/16 13:39:28

  Modified:    src/java/org/apache/velocity/tools/view
                        XMLToolboxManager.java
               src/java/org/apache/velocity/tools/view/servlet
                        ServletToolboxManager.java
  Log:
  update DTDs in javadoc to include tool parameter support
  
  Revision  Changes    Path
  1.11      +6 -3      
jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java
  
  Index: XMLToolboxManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/XMLToolboxManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- XMLToolboxManager.java    15 Apr 2004 17:33:15 -0000      1.10
  +++ XMLToolboxManager.java    16 Apr 2004 20:39:28 -0000      1.11
  @@ -146,12 +146,15 @@
        * <p>The DTD corresponding to the default ToolboxRuleSet is:
        * <pre>
        *  &lt;?xml version="1.0"?&gt;
  -     *  &lt;!ELEMENT toolbox (tool*,data*)&gt;
  -     *  &lt;!ELEMENT tool    (key,class,#PCDATA)&gt;
  +     *  &lt;!ELEMENT toolbox (tool*,data*,#PCDATA)&gt;
  +     *  &lt;!ELEMENT tool    (key,class,parameter*,#PCDATA)&gt;
        *  &lt;!ELEMENT data    (key,value)&gt;
        *      &lt;!ATTLIST data type (string|number|boolean) "string"&gt;
        *  &lt;!ELEMENT key     (#CDATA)&gt;
        *  &lt;!ELEMENT class   (#CDATA)&gt;
  +     *  &lt;!ELEMENT parameter (EMPTY)&gt;
  +     *      &lt;!ATTLIST parameter name CDATA #REQUIRED&gt;
  +     *      &lt;!ATTLIST parameter value CDATA #REQUIRED&gt;
        *  &lt;!ELEMENT value   (#CDATA)&gt;
        * </pre></p>
        *
  
  
  
  1.14      +6 -3      
jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java
  
  Index: ServletToolboxManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity-tools/src/java/org/apache/velocity/tools/view/servlet/ServletToolboxManager.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ServletToolboxManager.java        15 Apr 2004 17:33:16 -0000      1.13
  +++ ServletToolboxManager.java        16 Apr 2004 20:39:28 -0000      1.14
  @@ -251,15 +251,18 @@
        * <p>The DTD corresponding to the ServletToolboxRuleSet is:
        * <pre>
        *  &lt;?xml version="1.0"?&gt;
  -     *  &lt;!ELEMENT toolbox (create-session,xhtml,tool*,data*)&gt;
  +     *  &lt;!ELEMENT toolbox (create-session?,xhtml?,tool*,data*,#PCDATA)&gt;
        *  &lt;!ELEMENT create-session (#CDATA)&gt;
        *  &lt;!ELEMENT xhtml          (#CDATA)&gt;
  -     *  &lt;!ELEMENT tool           (key,scope,class,#PCDATA)&gt;
  +     *  &lt;!ELEMENT tool           (key,scope?,class,parameter*,#PCDATA)&gt;
        *  &lt;!ELEMENT data           (key,value)&gt;
        *      &lt;!ATTLIST data type (string|number|boolean) "string"&gt;
        *  &lt;!ELEMENT key            (#CDATA)&gt;
        *  &lt;!ELEMENT scope          (#CDATA)&gt;
        *  &lt;!ELEMENT class          (#CDATA)&gt;
  +     *  &lt;!ELEMENT parameter (EMPTY)&gt;
  +     *      &lt;!ATTLIST parameter name CDATA #REQUIRED&gt;
  +     *      &lt;!ATTLIST parameter value CDATA #REQUIRED&gt;
        *  &lt;!ELEMENT value          (#CDATA)&gt;
        * </pre></p>
        *
  
  
  

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