stephan     2003/02/04 12:58:35

  Modified:    src/blocks/chaperon/samples sitemap.xmap
               src/blocks/chaperon/samples/stylesheets class2html.xsl
                        java2html.xsl
               src/blocks/slide/java/org/apache/cocoon/components/repository/impl
                        SlideConfigurationAdapter.java
               src/webapp/WEB-INF/entities sitemap-v06.rng
  Log:
  Removed unknown tags from the javodoc comments, thanks to Tony Collen.
  Clean stylesheets, thanks to Steven Noels.
  Allow parameters in the body of transformers for the paramerizable
  contract, bug reported by Pier Fumagalli, thanks..
  
  Revision  Changes    Path
  1.5       +6 -6      xml-cocoon2/src/blocks/chaperon/samples/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/chaperon/samples/sitemap.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- sitemap.xmap      4 Feb 2003 14:54:27 -0000       1.4
  +++ sitemap.xmap      4 Feb 2003 20:58:31 -0000       1.5
  @@ -43,8 +43,8 @@
      <map:transformer name="parser" 
                       src="org.apache.cocoon.transformation.ParserTransformer" 
                       logger="sitemap.transformer.parser">
  -    <map:parameter name="flatten" value="true"/>
  -    <map:parameter name="ignoring" value="true"/>
  +    <parameter name="flatten" value="true"/>
  +    <parameter name="ignoring" value="true"/>
      </map:transformer>
   
     </map:transformers>
  @@ -194,11 +194,11 @@
        <map:part                    src="cocoon:/packages.xml"/>
        <map:part                    src="misc/{1}/{2}.java"/>
       </map:aggregate>
  -    <map:transform type="lexer"  src="cocoon:/java.xlex"/>
  -<!--    <map:transform type="lexer"   src="grammars/java.xlex"/>-->
  +    <!--<map:transform type="lexer"  src="cocoon:/java.xlex"/>-->
  +    <map:transform type="lexer"   src="grammars/java.xlex"/>
       <map:transform                src="stylesheets/text4javadoc.xsl"/>
  -    <map:transform type="lexer" src="cocoon:/javadoc.xlex"/>
  -<!--    <map:transform type="lexer"   src="grammars/javadoc.xlex"/>-->
  +    <!--<map:transform type="lexer" src="cocoon:/javadoc.xlex"/>-->
  +    <map:transform type="lexer"   src="grammars/javadoc.xlex"/>
       <map:transform                src="stylesheets/java2html.xsl">
        <map:parameter name="package" value="{1}"/>
        <map:parameter name="class"   value="{2}"/>
  
  
  
  1.3       +0 -6      
xml-cocoon2/src/blocks/chaperon/samples/stylesheets/class2html.xsl
  
  Index: class2html.xsl
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/blocks/chaperon/samples/stylesheets/class2html.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- class2html.xsl    4 Feb 2003 19:13:03 -0000       1.2
  +++ class2html.xsl    4 Feb 2003 20:58:31 -0000       1.3
  @@ -368,12 +368,6 @@
     <xsl:apply-templates select="st:TEXT|st:TAG"/>
    </xsl:template>
   
  -<!-- FIXME: Stephan, check if this is waht you want (SN)
  - <xsl:template match="st:TAG">
  -  <xsl:text disable-output-escaping="yes"><xsl:value-of select="."/></xsl:text>
  - </xsl:template>
  --->
  -
    <xsl:template match="st:TAG">
     <xsl:value-of select="." disable-output-escaping="yes"/>
    </xsl:template>
  
  
  
  1.4       +0 -6      
xml-cocoon2/src/blocks/chaperon/samples/stylesheets/java2html.xsl
  
  Index: java2html.xsl
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/blocks/chaperon/samples/stylesheets/java2html.xsl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- java2html.xsl     4 Feb 2003 19:13:03 -0000       1.3
  +++ java2html.xsl     4 Feb 2003 20:58:31 -0000       1.4
  @@ -489,12 +489,6 @@
   <!--  <br/>-->
    </xsl:template>
   
  -<!-- FIXME: Stephan, take a look if this is what you want (SN)
  - <xsl:template match="lex:lexeme[@symbol='SPACES']">
  -  <xsl:text><xsl:value-of select="@text"/></xsl:text>
  - </xsl:template>
  --->
  -
    <xsl:template match="lex:lexeme[@symbol='SPACES']"><xsl:value-of 
select="@text"/></xsl:template>
   
    <xsl:template match="lex:lexeme[@symbol='TAB']">
  
  
  
  1.2       +137 -190  
xml-cocoon2/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlideConfigurationAdapter.java
  
  Index: SlideConfigurationAdapter.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/blocks/slide/java/org/apache/cocoon/components/repository/impl/SlideConfigurationAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SlideConfigurationAdapter.java    31 Jan 2003 18:08:43 -0000      1.1
  +++ SlideConfigurationAdapter.java    4 Feb 2003 20:58:35 -0000       1.2
  @@ -1,57 +1,53 @@
   /*
  - * The Apache Software License, Version 1.1
  - *
  - *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software itself,
  - *    if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "Apache Cocoon" and "Apache Software Foundation" must
  - *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact [EMAIL PROTECTED]
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - */
  +
  + ============================================================================
  +                   The Apache Software License, Version 1.1
  + ============================================================================
  +
  + Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  +
  + Redistribution and use in source and binary forms, with or without modifica-
  + tion, are permitted provided that the following conditions are met:
  +
  + 1. Redistributions of  source code must  retain the above copyright  notice,
  +    this list of conditions and the following disclaimer.
  +
  + 2. Redistributions in binary form must reproduce the above copyright notice,
  +    this list of conditions and the following disclaimer in the documentation
  +    and/or other materials provided with the distribution.
  +
  + 3. The end-user documentation included with the redistribution, if any, must
  +    include  the following  acknowledgment:   "This product includes software
  +    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
  +    Alternately, this  acknowledgment may  appear in the software itself,  if
  +    and wherever such third-party acknowledgments normally appear.
  +
  + 4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
  +    used to  endorse or promote  products derived from  this software without
  +    prior written permission. For written permission, please contact
  +    [EMAIL PROTECTED]
  +
  + 5. Products  derived from this software may not  be called "Apache", nor may
  +    "Apache" appear  in their name,  without prior written permission  of the
  +    Apache Software Foundation.
  +
  + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  + FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  + APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
  + INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
  + DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
  + OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
  + ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
  + (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
  + THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  +
  + This software  consists of voluntary contributions made  by many individuals
  + on  behalf of the Apache Software  Foundation and was  originally created by
  + Stefano Mazzocchi  <[EMAIL PROTECTED]>. For more  information on the Apache
  + Software Foundation, please see <http://www.apache.org/>.
  +
  +*/
   
   package org.apache.cocoon.components.repository.impl;
   
  @@ -70,6 +66,12 @@
   
       private org.apache.avalon.framework.configuration.Configuration configuration;
   
  +    /**
  +     * Create a new adapter to map a Avalon configuration 
  +     * to a Slide configuration 
  +     *
  +     * @param configuration Avalon configuration
  +     */
       public 
SlideConfigurationAdapter(org.apache.avalon.framework.configuration.Configuration 
configuration) {
           this.configuration = configuration;
       }
  @@ -77,9 +79,7 @@
       /**
        * Return the name of the node.
        *
  -     * @post getName() != null
  -     *
  -     * @returns name of the <code>Configuration</code> node.
  +     * @return name of the <code>Configuration</code> node.
        */
       public String getName() {
           return this.configuration.getName();
  @@ -89,16 +89,14 @@
        * Return a new <code>Configuration</code> instance encapsulating the
        * specified child node.
        *
  -     * @pre child != null
  -     * @post getConfiguration() != null
        * @param child The name of the child node.
        *
  -     * @returns Configuration
  +     * @return Configuration
        *
  -     * @exception ConfigurationException If no child with that name exists.
  +     * @throws ConfigurationException If no child with that name exists.
        */
       public Configuration getConfiguration(String child)
  -            throws ConfigurationException {
  +      throws ConfigurationException {
           return new SlideConfigurationAdapter(this.configuration.getChild(child));
       }
   
  @@ -106,19 +104,17 @@
        * Return an <code>Enumeration</code> of <code>Configuration<code>
        * elements containing all node children with the specified name.
        *
  -     * @pre name != null
  -     * @post getConfigurations() != null
        * @param name The name of the children to get.
        *
  -     * @returns Enumeration.  The <code>Enumeration</code> will be
  -     *          empty if there are no nodes by the specified name.
  +     * @return Enumeration.  The <code>Enumeration</code> will be
  +     *         empty if there are no nodes by the specified name.
        */
       public Enumeration getConfigurations(String name) {
   
           Vector configurations = new Vector();
  -        org.apache.avalon.framework.configuration.Configuration[] childs = 
  -            this.configuration.getChildren(name);
  -        for (int i=0; i<childs.length; i++) {
  +        org.apache.avalon.framework.configuration.Configuration[] childs = 
this.configuration.getChildren(name);
  +
  +        for (int i = 0; i<childs.length; i++) {
               configurations.addElement(new SlideConfigurationAdapter(childs[i]));
           }
           return configurations.elements();
  @@ -127,18 +123,16 @@
       /**
        * Return the value of specified attribute.
        *
  -     * @pre paramName != null
  -     * @post getAttribute != null
        * @param paramName The name of the parameter you ask the value of.
        *
  -     * @returns String value of attribute.
  +     * @return String value of attribute.
        *
  -     * @exception ConfigurationException If no attribute with that name exists.
  +     * @throws ConfigurationException If no attribute with that name exists.
        */
       public String getAttribute(String paramName)
  -        throws ConfigurationException {
  -       
  -        try { 
  +      throws ConfigurationException {
  +
  +        try {
               return this.configuration.getAttribute(paramName);
           } catch (org.apache.avalon.framework.configuration.ConfigurationException 
ce) {
               throw new ConfigurationException(ce.getMessage(), this);
  @@ -149,17 +143,15 @@
        * Return the <code>int</code> value of the specified attribute contained
        * in this node.
        *
  -     * @pre paramName != null
  -     * @post getAttributeAsInt() != null
        * @param paramName The name of the parameter you ask the value of.
        *
  -     * @returns int value of attribute
  +     * @return int value of attribute
        *
  -     * @exception ConfigurationException If no parameter with that name exists.
  -     *                                   or if conversion to <code>int</code> 
fails.
  +     * @throws ConfigurationException If no parameter with that name exists.
  +     *                                or if conversion to <code>int</code> fails.
        */
       public int getAttributeAsInt(String paramName)
  -        throws ConfigurationException {
  +      throws ConfigurationException {
   
           try {
               return this.configuration.getAttributeAsInteger(paramName);
  @@ -172,17 +164,16 @@
        * Returns the value of the attribute specified by its name as a
        * <code>long</code>.
        *
  -     * @pre paramName != null
  -     * @post getAttributeAsLong() != null
  -     * @param paramName The name of the parameter you ask the value of.
        *
  -     * @returns long value of attribute
  +     * @param name       
  +     *
  +     * @return long value of attribute
        *
  -     * @exception ConfigurationException If no parameter with that name exists.
  -     *                                   or if conversion to <code>long</code> 
fails.
  +     * @throws ConfigurationException If no parameter with that name exists.
  +     *                                or if conversion to <code>long</code> fails.
        */
       public long getAttributeAsLong(String name)
  -             throws ConfigurationException {
  +      throws ConfigurationException {
   
           try {
               return this.configuration.getAttributeAsLong(name);
  @@ -195,17 +186,15 @@
        * Return the <code>float</code> value of the specified parameter contained
        * in this node.
        *
  -     * @pre paramName != null
  -     * @post getAttributeAsFloat() != null
        * @param paramName The name of the parameter you ask the value of.
        *
  -     * @returns float value of attribute
  +     * @return float value of attribute
        *
  -     * @exception ConfigurationException If no parameter with that name exists.
  -     *                                   or if conversion to <code>float</code> 
fails.
  +     * @throws ConfigurationException If no parameter with that name exists.
  +     *                                or if conversion to <code>float</code> fails.
        */
       public float getAttributeAsFloat(String paramName)
  -        throws ConfigurationException {
  +      throws ConfigurationException {
   
           try {
               return this.configuration.getAttributeAsFloat(paramName);
  @@ -218,17 +207,15 @@
        * Return the <code>boolean</code> value of the specified parameter contained
        * in this node.<br>
        *
  -     * @pre paramName != null
  -     * @post getAttributeAsBoolean() != null
        * @param paramName The name of the parameter you ask the value of.
        *
  -     * @returns boolean value of attribute
  +     * @return boolean value of attribute
        *
  -     * @exception ConfigurationException If no parameter with that name exists.
  +     * @throws ConfigurationException If no parameter with that name exists.
        *                                   or if conversion to <code>boolean</code> 
fails.
        */
       public boolean getAttributeAsBoolean(String paramName)
  -        throws ConfigurationException {
  +      throws ConfigurationException {
   
           try {
               return this.configuration.getAttributeAsBoolean(paramName);
  @@ -240,9 +227,7 @@
       /**
        * Return the <code>String</code> value of the node.
        *
  -     * @post getValue() != null
  -     *
  -     * @returns the value of the node.
  +     * @return the value of the node.
        */
       public String getValue() {
   
  @@ -252,19 +237,15 @@
               return "";
           }
       }
  -    
   
       /**
        * Return the <code>int</code> value of the node.
        *
  -     * @post getValueAsInt() != null
  -     *
  -     * @returns the value of the node.
  +     * @return the value of the node.
        *
  -     * @exception ConfigurationException If conversion to <code>int</code> fails.
  +     * @throws ConfigurationException If conversion to <code>int</code> fails.
        */
  -    public int getValueAsInt()
  -        throws ConfigurationException {
  +    public int getValueAsInt() throws ConfigurationException {
   
           try {
               return this.configuration.getValueAsInteger();
  @@ -276,14 +257,11 @@
       /**
        * Return the <code>float</code> value of the node.
        *
  -     * @post getValueAsFloat() != null
  +     * @return the value of the node.
        *
  -     * @returns the value of the node.
  -     *
  -     * @exception ConfigurationException If conversion to <code>float</code> fails.
  +     * @throws ConfigurationException If conversion to <code>float</code> fails.
        */
  -    public float getValueAsFloat()
  -        throws ConfigurationException {
  +    public float getValueAsFloat() throws ConfigurationException {
   
           try {
               return this.configuration.getValueAsFloat();
  @@ -295,14 +273,11 @@
       /**
        * Return the <code>boolean</code> value of the node.
        *
  -     * @post getValueAsBoolean() != null
  -     *
  -     * @returns the value of the node.
  +     * @return the value of the node.
        *
  -     * @exception ConfigurationException If conversion to <code>boolean</code> 
fails.
  +     * @throws ConfigurationException If conversion to <code>boolean</code> fails.
        */
  -    public boolean getValueAsBoolean()
  -        throws ConfigurationException {
  +    public boolean getValueAsBoolean() throws ConfigurationException {
   
           try {
               return this.configuration.getValueAsBoolean();
  @@ -314,16 +289,13 @@
       /**
        * Return the <code>long</code> value of the node.<br>
        *
  -     * @post getValueAsLong() != null
  +     * @return the value of the node.
        *
  -     * @returns the value of the node.
  -     *
  -     * @exception ConfigurationException If conversion to <code>long</code> fails.
  +     * @throws ConfigurationException If conversion to <code>long</code> fails.
        */
  -    public long getValueAsLong()
  -        throws ConfigurationException {
  +    public long getValueAsLong() throws ConfigurationException {
   
  -        try { 
  +        try {
               return this.configuration.getValueAsLong();
           } catch (org.apache.avalon.framework.configuration.ConfigurationException 
ce) {
               throw new ConfigurationException(ce.getMessage(), this);
  @@ -335,14 +307,12 @@
        * If the configuration value is not set, the default value will be
        * used.
        *
  -     * @pre defaultValue != null
  -     * @post getValue(defaultValue) != null
        * @param defaultValue The default value desired.
        *
  -     * @returns String value of the <code>Configuration</code>, or default
  -     *          if none specified.
  +     * @return String value of the <code>Configuration</code>, or default
  +     *         if none specified.
        */
  -     public String getValue(String defaultValue) {
  +    public String getValue(String defaultValue) {
   
           return this.configuration.getValue(defaultValue);
       }
  @@ -352,12 +322,10 @@
        * If the configuration value is not set, the default value will be
        * used.
        *
  -     * @pre defaultValue != null
  -     * @post getValueAsInt(defaultValue) != null
        * @param defaultValue The default value desired.
        *
  -     * @returns int value of the <code>Configuration</code>, or default
  -     *          if none specified.
  +     * @return int value of the <code>Configuration</code>, or default
  +     *         if none specified.
        */
       public int getValueAsInt(int defaultValue) {
   
  @@ -369,15 +337,13 @@
        * If the configuration value is not set, the default value will be
        * used.
        *
  -     * @pre defaultValue != null
  -     * @post getValueAsLong(defaultValue) != null
        * @param defaultValue The default value desired.
        *
  -     * @returns long value of the <code>Configuration</code>, or default
  -     *          if none specified.
  +     * @return long value of the <code>Configuration</code>, or default
  +     *         if none specified.
        */
       public long getValueAsLong(long defaultValue) {
  -    
  +
           return this.configuration.getValueAsLong(defaultValue);
       }
   
  @@ -386,12 +352,10 @@
        * If the configuration value is not set, the default value will be
        * used.
        *
  -     * @pre defaultValue != null
  -     * @post getValueAsFloat(defaultValue) != null
        * @param defaultValue The default value desired.
        *
  -     * @returns float value of the <code>Configuration</code>, or default
  -     *          if none specified.
  +     * @return float value of the <code>Configuration</code>, or default
  +     *         if none specified.
        */
       public float getValueAsFloat(float defaultValue) {
   
  @@ -403,12 +367,10 @@
        * If the configuration value is not set, the default value will be
        * used.
        *
  -     * @pre defaultValue != null
  -     * @post getValueAsBoolean(defaultValue) != null
        * @param defaultValue The default value desired.
        *
  -     * @returns boolean value of the <code>Configuration</code>, or default
  -     *          if none specified.
  +     * @return boolean value of the <code>Configuration</code>, or default
  +     *         if none specified.
        */
       public boolean getValueAsBoolean(boolean defaultValue) {
   
  @@ -420,17 +382,14 @@
        * <code>String</code>, or the default value if no attribute by
        * that name exists or is empty.
        *
  -     * @pre name != null
  -     * @pre defaultValue != null
  -     * @post getAttribute(name, defaultValue) != null
        * @param name The name of the attribute you ask the value of.
        * @param defaultValue The default value desired.
        *
  -     * @returns String value of attribute. It will return the default
  -     *          value if the named attribute does not exist, or if
  -     *          the value is not set.
  +     * @return String value of attribute. It will return the default
  +     *         value if the named attribute does not exist, or if
  +     *         the value is not set.
        */
  -     public String getAttribute(String name, String defaultValue) {
  +    public String getAttribute(String name, String defaultValue) {
   
           return this.configuration.getAttribute(name, defaultValue);
       }
  @@ -440,15 +399,12 @@
        * <code>int</code>, or the default value if no attribute by
        * that name exists or is empty.
        *
  -     * @pre name != null
  -     * @pre defaultValue != null
  -     * @post getAttributeAsInt(name, defaultValue) != null
        * @param name The name of the attribute you ask the value of.
        * @param defaultValue The default value desired.
        *
  -     * @returns int value of attribute. It will return the default
  -     *          value if the named attribute does not exist, or if
  -     *          the value is not set.
  +     * @return int value of attribute. It will return the default
  +     *         value if the named attribute does not exist, or if
  +     *         the value is not set.
        */
       public int getAttributeAsInt(String name, int defaultValue) {
   
  @@ -460,15 +416,12 @@
        * <code>long</code>, or the default value if no attribute by
        * that name exists or is empty.
        *
  -     * @pre name != null
  -     * @pre defaultValue != null
  -     * @post getAttributeAsLong(name, defaultValue) != null
        * @param name The name of the attribute you ask the value of.
        * @param defaultValue The default value desired.
        *
  -     * @returns long value of attribute. It will return the default
  -     *          value if the named attribute does not exist, or if
  -     *          the value is not set.
  +     * @return long value of attribute. It will return the default
  +     *         value if the named attribute does not exist, or if
  +     *         the value is not set.
        */
       public long getAttributeAsLong(String name, long defaultValue) {
   
  @@ -480,15 +433,12 @@
        * <code>float</code>, or the default value if no attribute by
        * that name exists or is empty.
        *
  -     * @pre name != null
  -     * @pre defaultValue != null
  -     * @post getAttributeAsFloat(name, defaultValue) != null
        * @param name The name of the attribute you ask the value of.
        * @param defaultValue The default value desired.
        *
  -     * @returns float value of attribute. It will return the default
  -     *          value if the named attribute does not exist, or if
  -     *          the value is not set.
  +     * @return float value of attribute. It will return the default
  +     *         value if the named attribute does not exist, or if
  +     *         the value is not set.
        */
       public float getAttributeAsFloat(String name, float defaultValue) {
   
  @@ -500,29 +450,26 @@
        * <code>boolean</code>, or the default value if no attribute by
        * that name exists or is empty.
        *
  -     * @pre name != null
  -     * @pre defaultValue != null
  -     * @post getAttributeAsBoolean(name, defaultValue) != null
        * @param name The name of the attribute you ask the value of.
        * @param defaultValue The default value desired.
        *
  -     * @returns boolean value of attribute. It will return the default
  -     *          value if the named attribute does not exist, or if
  -     *          the value is not set.
  +     * @return boolean value of attribute. It will return the default
  +     *         value if the named attribute does not exist, or if
  +     *         the value is not set.
        */
       public boolean getAttributeAsBoolean(String name, boolean defaultValue) {
   
           return this.configuration.getAttributeAsBoolean(name, defaultValue);
       }
   
  -     /**
  -      * Return a <code>String</code> indicating the position of this
  -      * configuration element in a source file or URI.
  -     *
  -     * @returns String if a source file or URI is specified.  Otherwise
  -     *          it returns <code>null</code>
  -      */
  -       public String getLocation() {
  +    /**
  +     * Return a <code>String</code> indicating the position of this
  +     * configuration element in a source file or URI.
  +     *
  +     * @return String if a source file or URI is specified.  Otherwise
  +     *         it returns <code>null</code>
  +     */
  +    public String getLocation() {
   
           return this.configuration.getLocation();
       }
  
  
  
  1.7       +3 -0      xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v06.rng
  
  Index: sitemap-v06.rng
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/webapp/WEB-INF/entities/sitemap-v06.rng,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sitemap-v06.rng   3 Feb 2003 09:36:02 -0000       1.6
  +++ sitemap-v06.rng   4 Feb 2003 20:58:35 -0000       1.7
  @@ -488,6 +488,9 @@
             <ref name="web3RfcTransformer.contents"/>
             <ref name="simpleFormExtractTransformer.contents"/>
             <optional><ref name="mapping"/></optional>
  +          <zeroOrMore>
  +           <ref name="parameter"/>
  +          </zeroOrMore>
           </interleave>
       </element>
     </define>
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to