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

[nbubna]

nbubna      2004/04/15 10:33:16

  Modified:    src/java/org/apache/velocity/tools/view
                        XMLToolboxManager.java
               src/java/org/apache/velocity/tools/view/servlet
                        ServletToolboxManager.java
  Log:
  update javadoc to reflect difference in DTDs for XMLToolboxManager and 
ServletToolboxManager
  
  Revision  Changes    Path
  1.10      +15 -14    
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XMLToolboxManager.java    18 Feb 2004 20:08:29 -0000      1.9
  +++ XMLToolboxManager.java    15 Apr 2004 17:33:15 -0000      1.10
  @@ -121,18 +121,6 @@
       /**
        * <p>Reads an XML document from an [EMAIL PROTECTED] InputStream}
        * and sets up the toolbox from that.</p>
  -     *
  -     * The DTD for toolbox schema is:
  -     * <pre>
  -     *  &lt;?xml version="1.0"?&gt;
  -     *  &lt;!ELEMENT toolbox (tool*,data*)&gt;
  -     *  &lt;!ELEMENT tool    (key,class,#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 value   (#CDATA)&gt;
  -     * </pre>
        * 
        * @param input the InputStream to read from
        */
  @@ -152,7 +140,20 @@
   
   
       /**
  -     * For subclassing convienence.
  +     * <p>Retrieves the rule set Digester should use to parse and load
  +     * the toolbox for this manager.</p>
  +     *
  +     * <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 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 value   (#CDATA)&gt;
  +     * </pre></p>
        *
        * @since VelocityTools 1.1
        */
  
  
  
  1.13      +19 -2     
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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ServletToolboxManager.java        18 Feb 2004 20:07:02 -0000      1.12
  +++ ServletToolboxManager.java        15 Apr 2004 17:33:16 -0000      1.13
  @@ -245,7 +245,24 @@
       // ------------------------------ XMLToolboxManager Overrides -------------
   
       /**
  -     * For subclassing convienence.
  +     * <p>Retrieves the rule set Digester should use to parse and load
  +     * the toolbox for this manager.</p>
  +     *
  +     * <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 create-session (#CDATA)&gt;
  +     *  &lt;!ELEMENT xhtml          (#CDATA)&gt;
  +     *  &lt;!ELEMENT tool           (key,scope,class,#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 value          (#CDATA)&gt;
  +     * </pre></p>
  +     *
        * @since VelocityTools 1.1
        */
       protected RuleSet getRuleSet()
  
  
  

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