commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression ExpressionFactory.java CompositeExpression.java ExpressionSupport.java Expression.java ConstantExpression.java
Date Thu, 09 Sep 2004 12:25:41 GMT
dion        2004/09/09 05:25:41

  Modified:    jelly/src/java/org/apache/commons/jelly XMLOutput.java
                        Jelly.java JellyContext.java Tag.java Script.java
                        MapTagSupport.java LocationAware.java
                        JellyTagException.java NamespaceAwareTag.java
                        DynaTagSupport.java TagLibrary.java
                        DynaBeanTagSupport.java JellyException.java
                        MissingAttributeException.java TagSupport.java
                        DynaTag.java
               jelly/src/java/org/apache/commons/jelly/expression/jexl
                        JexlExpression.java JexlExpressionFactory.java
               jelly/src/java/org/apache/commons/jelly/expression
                        ExpressionFactory.java CompositeExpression.java
                        ExpressionSupport.java Expression.java
                        ConstantExpression.java
  Log:
  Fix license file whitespace
  
  Revision  Changes    Path
  1.18      +61 -61    jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java
  
  Index: XMLOutput.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- XMLOutput.java	7 Sep 2004 16:15:15 -0000	1.17
  +++ XMLOutput.java	9 Sep 2004 12:25:39 -0000	1.18
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -33,7 +33,7 @@
   import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.helpers.DefaultHandler;
   
  -/** <p><code>XMLOutput</code> is used to output XML events 
  +/** <p><code>XMLOutput</code> is used to output XML events
     * in a SAX-like manner. This also allows pipelining to be done
     * such as in the <a href="http://xml.apache.org/cocoon/">Cocoon</a> project.</p>
     *
  @@ -50,25 +50,25 @@
   
       /** empty attributes */
       private static final Attributes EMPTY_ATTRIBUTES = new AttributesImpl();
  -    
  +
       /** The SAX ContentHandler that output goes to */
       private ContentHandler contentHandler;
  -    
  +
       /** The SAX LexicalHandler that output goes to */
       private LexicalHandler lexicalHandler;
  -    
  +
       /** The Log to which logging calls will be made. */
       private static final Log log = LogFactory.getLog(XMLOutput.class);
   
       /** the default for escaping of text */
       private static final boolean DEFAULT_ESCAPE_TEXT = false;
  -    
  +
       public XMLOutput() {
       }
   
       public XMLOutput(ContentHandler contentHandler) {
           this.contentHandler = contentHandler;
  -        // often classes will implement LexicalHandler as well 
  +        // often classes will implement LexicalHandler as well
           if (contentHandler instanceof LexicalHandler) {
               this.lexicalHandler = (LexicalHandler) contentHandler;
           }
  @@ -90,9 +90,9 @@
               + "]";
       }
   
  -    /** 
  -     * Provides a useful hook that implementations can use to close the 
  -     * underlying OutputStream or Writer 
  +    /**
  +     * Provides a useful hook that implementations can use to close the
  +     * underlying OutputStream or Writer
        */
       public void close() throws IOException {
       }
  @@ -105,9 +105,9 @@
       }
   
       // Static helper methods
  -    //-------------------------------------------------------------------------                    
  +    //-------------------------------------------------------------------------
   
  -    /** 
  +    /**
        * Creates an XMLOutput from an existing SAX XMLReader
        */
       public static XMLOutput createXMLOutput(XMLReader xmlReader) {
  @@ -130,7 +130,7 @@
           return output;
       }
   
  -    /** 
  +    /**
        * Creates a text based XMLOutput which converts all XML events into
        * text and writes to the underlying Writer.
        */
  @@ -138,10 +138,10 @@
           return createXMLOutput(writer, DEFAULT_ESCAPE_TEXT);
       }
   
  -    /** 
  +    /**
        * Creates a text based XMLOutput which converts all XML events into
        * text and writes to the underlying Writer.
  -     * 
  +     *
        * @param writer is the writer to output to
        * @param escapeText is whether or not text output will be escaped. This must be true
        * if the underlying output is XML or could be false if the underlying output is textual.
  @@ -152,19 +152,19 @@
           xmlWriter.setEscapeText(escapeText);
           return createXMLOutput(xmlWriter);
       }
  -    
  -    /** 
  +
  +    /**
        * Creates a text based XMLOutput which converts all XML events into
        * text and writes to the underlying OutputStream.
        */
       public static XMLOutput createXMLOutput(OutputStream out) throws UnsupportedEncodingException {
           return createXMLOutput(out, DEFAULT_ESCAPE_TEXT);
       }
  -    
  -    /** 
  +
  +    /**
        * Creates a text based XMLOutput which converts all XML events into
        * text and writes to the underlying OutputStream.
  -     * 
  +     *
        * @param out is the output stream to write
        * @param escapeText is whether or not text output will be escaped. This must be true
        * if the underlying output is XML or could be false if the underlying output is textual.
  @@ -178,19 +178,19 @@
       /**
        * returns an XMLOutput object that will discard all
        * tag-generated XML events.  Useful when tag output is not expected
  -     * or not significant. 
  -     * 
  +     * or not significant.
  +     *
        * @return a no-op XMLOutput
        */
       public static XMLOutput createDummyXMLOutput() {
           return new XMLOutput(new DefaultHandler());
       }
  -    
  +
       // Extra helper methods provided for tag authors
  -    //-------------------------------------------------------------------------                    
  +    //-------------------------------------------------------------------------
   
  -    /** 
  -     * Outputs the given String as a piece of valid text in the 
  +    /**
  +     * Outputs the given String as a piece of valid text in the
        * XML event stream.
        * Any special XML characters should be properly escaped.
        */
  @@ -199,8 +199,8 @@
           characters(ch, 0, ch.length);
       }
   
  -    /** 
  -     * Outputs the given String as a piece of CDATA in the 
  +    /**
  +     * Outputs the given String as a piece of CDATA in the
        * XML event stream.
        */
       public void writeCDATA(String text) throws SAXException {
  @@ -210,7 +210,7 @@
           endCDATA();
       }
   
  -    /** 
  +    /**
        * Outputs a comment to the XML stream
        */
       public void writeComment(String text) throws SAXException {
  @@ -231,7 +231,7 @@
       public void startElement(String localName, Attributes attributes) throws SAXException {
           startElement("", localName, localName, attributes);
       }
  -    
  +
       /**
        * Helper method for outputting an end element event for an element in no namespace
        */
  @@ -239,9 +239,9 @@
           endElement("", localName, localName);
       }
   
  -    
  +
       // ContentHandler interface
  -    //-------------------------------------------------------------------------                    
  +    //-------------------------------------------------------------------------
   
       /**
        * Receive an object for locating the origin of SAX document events.
  @@ -276,7 +276,7 @@
        * Receive notification of the beginning of a document.
        *
        * <p>The SAX parser will invoke this method only once, before any
  -     * other event callbacks (except for {@link #setDocumentLocator 
  +     * other event callbacks (except for {@link #setDocumentLocator
        * setDocumentLocator}).</p>
        *
        * @exception org.xml.sax.SAXException Any SAX exception, possibly
  @@ -308,7 +308,7 @@
        * Begin the scope of a prefix-URI Namespace mapping.
        *
        * <p>The information from this event is not necessary for
  -     * normal Namespace processing: the SAX XML reader will 
  +     * normal Namespace processing: the SAX XML reader will
        * automatically replace prefixes for element and attribute
        * names when the <code>http://xml.org/sax/features/namespaces</code>
        * feature is <var>true</var> (the default).</p>
  @@ -323,11 +323,11 @@
        * <p>Note that start/endPrefixMapping events are not
        * guaranteed to be properly nested relative to each other:
        * all startPrefixMapping events will occur immediately before the
  -     * corresponding {@link #startElement startElement} event, 
  +     * corresponding {@link #startElement startElement} event,
        * and all {@link #endPrefixMapping endPrefixMapping}
        * events will occur immediately after the corresponding
        * {@link #endElement endElement} event,
  -     * but their order is not otherwise 
  +     * but their order is not otherwise
        * guaranteed.</p>
        *
        * <p>There should never be start/endPrefixMapping events for the
  @@ -349,9 +349,9 @@
       /**
        * End the scope of a prefix-URI mapping.
        *
  -     * <p>See {@link #startPrefixMapping startPrefixMapping} for 
  +     * <p>See {@link #startPrefixMapping startPrefixMapping} for
        * details.  These events will always occur immediately after the
  -     * corresponding {@link #endElement endElement} event, but the order of 
  +     * corresponding {@link #endElement endElement} event, but the order of
        * {@link #endPrefixMapping endPrefixMapping} events is not otherwise
        * guaranteed.</p>
        *
  @@ -391,7 +391,7 @@
        * properties:</p>
        *
        * <ul>
  -     * <li>the Namespace URI and local name are required when 
  +     * <li>the Namespace URI and local name are required when
        * the namespaces property is <var>true</var> (the default), and are
        * optional when the namespaces property is <var>false</var> (if one is
        * specified, both must be);</li>
  @@ -406,7 +406,7 @@
        * will contain attributes used for Namespace declarations
        * (xmlns* attributes) only if the
        * <code>http://xml.org/sax/features/namespace-prefixes</code>
  -     * property is true (it is false by default, and support for a 
  +     * property is true (it is false by default, and support for a
        * true value is optional).</p>
        *
        * <p>Like {@link #characters characters()}, attribute values may have
  @@ -442,7 +442,7 @@
        *
        * <p>The SAX parser will invoke this method at the end of every
        * element in the XML document; there will be a corresponding
  -     * {@link #startElement startElement} event for every endElement 
  +     * {@link #startElement startElement} event for every endElement
        * event (even when the element is empty).</p>
        *
        * <p>For information on the names, see startElement.</p>
  @@ -495,7 +495,7 @@
        *
        * <p>Note that some parsers will report whitespace in element
        * content using the {@link #ignorableWhitespace ignorableWhitespace}
  -     * method rather than this one (validating parsers <em>must</em> 
  +     * method rather than this one (validating parsers <em>must</em>
        * do so).</p>
        *
        * @param ch The characters from the XML document.
  @@ -503,7 +503,7 @@
        * @param length The number of characters to read from the array.
        * @exception org.xml.sax.SAXException Any SAX exception, possibly
        *            wrapping another exception.
  -     * @see #ignorableWhitespace 
  +     * @see #ignorableWhitespace
        * @see org.xml.sax.Locator
        */
       public void characters(char ch[], int start, int length) throws SAXException {
  @@ -584,7 +584,7 @@
        * <code>http://xml.org/sax/features/external-parameter-entities</code>
        * properties.</p>
        *
  -     * @param name The name of the skipped entity.  If it is a 
  +     * @param name The name of the skipped entity.  If it is a
        *        parameter entity, the name will begin with '%', and if
        *        it is the external DTD subset, it will be the string
        *        "[dtd]".
  @@ -597,7 +597,7 @@
   
   
       // Lexical Handler interface
  -    //-------------------------------------------------------------------------                    
  +    //-------------------------------------------------------------------------
   
       /**
        * Report the start of DTD declarations, if any.
  @@ -606,7 +606,7 @@
        * DOCTYPE declaration; if the document has no DOCTYPE declaration,
        * this method will not be invoked.</p>
        *
  -     * <p>All declarations reported through 
  +     * <p>All declarations reported through
        * {@link org.xml.sax.DTDHandler DTDHandler} or
        * {@link org.xml.sax.ext.DeclHandler DeclHandler} events must appear
        * between the startDTD and {@link #endDTD endDTD} events.
  @@ -614,14 +614,14 @@
        * unless they appear between {@link #startEntity startEntity}
        * and {@link #endEntity endEntity} events.  Comments and
        * processing instructions from the DTD should also be reported
  -     * between the startDTD and endDTD events, in their original 
  +     * between the startDTD and endDTD events, in their original
        * order of (logical) occurrence; they are not required to
        * appear in their correct locations relative to DTDHandler
        * or DeclHandler events, however.</p>
        *
        * <p>Note that the start/endDTD events will appear within
        * the start/endDocument events from ContentHandler and
  -     * before the first 
  +     * before the first
        * {@link org.xml.sax.ContentHandler#startElement startElement}
        * event.</p>
        *
  @@ -671,12 +671,12 @@
        * feature to query or control the reporting of parameter entities.</p>
        *
        * <p>General entities are reported with their regular names,
  -     * parameter entities have '%' prepended to their names, and 
  +     * parameter entities have '%' prepended to their names, and
        * the external DTD subset has the pseudo-entity name "[dtd]".</p>
        *
  -     * <p>When a SAX2 driver is providing these events, all other 
  -     * events must be properly nested within start/end entity 
  -     * events.  There is no additional requirement that events from 
  +     * <p>When a SAX2 driver is providing these events, all other
  +     * events must be properly nested within start/end entity
  +     * events.  There is no additional requirement that events from
        * {@link org.xml.sax.ext.DeclHandler DeclHandler} or
        * {@link org.xml.sax.DTDHandler DTDHandler} be properly ordered.</p>
        *
  @@ -685,7 +685,7 @@
        * event, which is part of the ContentHandler interface.</p>
        *
        * <p>Because of the streaming event model that SAX uses, some
  -     * entity boundaries cannot be reported under any 
  +     * entity boundaries cannot be reported under any
        * circumstances:</p>
        *
        * <ul>
  @@ -707,7 +707,7 @@
        * @exception SAXException The application may raise an exception.
        * @see #endEntity
        * @see org.xml.sax.ext.DeclHandler#internalEntityDecl
  -     * @see org.xml.sax.ext.DeclHandler#externalEntityDecl 
  +     * @see org.xml.sax.ext.DeclHandler#externalEntityDecl
        */
       public void startEntity(String name) throws SAXException {
           if (lexicalHandler != null) {
  @@ -778,7 +778,7 @@
       }
   
       // Properties
  -    //-------------------------------------------------------------------------                    
  +    //-------------------------------------------------------------------------
       /**
        * @return the SAX ContentHandler to use to pipe SAX events into
        */
  @@ -789,7 +789,7 @@
       /**
        * Sets the SAX ContentHandler to pipe SAX events into
        *
  -     * @param contentHandler is the new ContentHandler to use. 
  +     * @param contentHandler is the new ContentHandler to use.
        *      This value cannot be null.
        */
       public void setContentHandler(ContentHandler contentHandler) {
  @@ -809,7 +809,7 @@
       /**
        * Sets the SAX LexicalHandler to pipe SAX events into
        *
  -     * @param lexicalHandler is the new LexicalHandler to use. 
  +     * @param lexicalHandler is the new LexicalHandler to use.
        *      This value can be null.
        */
       public void setLexicalHandler(LexicalHandler lexicalHandler) {
  @@ -817,7 +817,7 @@
       }
   
       // Implementation methods
  -    //-------------------------------------------------------------------------                    
  +    //-------------------------------------------------------------------------
       /**
        * Factory method to create a new XMLOutput from an XMLWriter
        */
  
  
  
  1.33      +9 -9      jakarta-commons/jelly/src/java/org/apache/commons/jelly/Jelly.java
  
  Index: Jelly.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/Jelly.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- Jelly.java	7 Sep 2004 02:07:51 -0000	1.32
  +++ Jelly.java	9 Sep 2004 12:25:39 -0000	1.33
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -217,8 +217,8 @@
        */
       protected URL resolveURL(String name) throws MalformedURLException {
           
  -        URL url = this.getClass().getClassLoader().getResource(name);
  -        if (url == null)
  +        URL resourceUrl = this.getClass().getClassLoader().getResource(name);
  +        if (resourceUrl == null)
           {
               File file = new File(name);
               if (file.exists()) {
  @@ -226,7 +226,7 @@
               }
               return new URL(name);
           } else {
  -            return url;
  +            return resourceUrl;
           }
       }
   
  @@ -284,7 +284,7 @@
        * Loads the properties from the given input stream 
        */    
       protected void loadProperties(InputStream is) throws IOException {
  -        JellyContext context = getJellyContext();
  +        JellyContext theContext = getJellyContext();
           Properties props = new Properties();
           props.load(is);
           Enumeration propsEnum = props.propertyNames();
  @@ -293,7 +293,7 @@
               String value = props.getProperty(key);
               
               // @todo we should parse the value in case its an Expression
  -            context.setVariable(key, value);
  +            theContext.setVariable(key, value);
           }
       }
   }
  
  
  
  1.60      +34 -33    jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java
  
  Index: JellyContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyContext.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- JellyContext.java	9 Sep 2004 04:12:24 -0000	1.59
  +++ JellyContext.java	9 Sep 2004 12:25:39 -0000	1.60
  @@ -40,7 +40,30 @@
   public class JellyContext {
   
       /** The Log to which logging calls will be made. */
  -    private static Log log = LogFactory.getLog(JellyContext.class);
  +    private static final Log log = LogFactory.getLog(JellyContext.class);
  +
  +    /** Default for inheritance of variables **/
  +    private static final boolean DEFAULT_INHERIT = true;
  +
  +    /** Default for export of variables **/
  +    private static final boolean DEFAULT_EXPORT = false;
  +
  +    /** String used to denote a script can't be parsed */
  +    private static final String BAD_PARSE = "Could not parse Jelly script";
  +
  +    /**
  +     * The class loader to use for instantiating application objects.
  +     * If not specified, the context class loader, or the class loader
  +     * used to load this class itself, is used, based on the value of the
  +     * <code>useContextClassLoader</code> variable.
  +     */
  +    protected ClassLoader classLoader;
  +
  +    /**
  +     * Do we want to use the Context ClassLoader when loading classes
  +     * for instantiating new objects?  Default is <code>false</code>.
  +     */
  +    protected boolean useContextClassLoader = false;
   
       /** The root URL context (where scripts are located from) */
       private URL rootURL;
  @@ -57,15 +80,9 @@
       /** The parent context */
       private JellyContext parent;
   
  -    /** Default for inheritance of variables **/
  -    private static final boolean DEFAULT_INHERIT = true;
  -
       /** Do we inherit variables from parent context? */
       private boolean inherit = JellyContext.DEFAULT_INHERIT;
   
  -    /** Default for export of variables **/
  -    private static final boolean DEFAULT_EXPORT = false;
  -
       /** Do we export our variables to parent context? */
       private boolean export  = JellyContext.DEFAULT_EXPORT;
   
  @@ -76,23 +93,6 @@
       private boolean cacheTags = false;
   
       /**
  -     * The class loader to use for instantiating application objects.
  -     * If not specified, the context class loader, or the class loader
  -     * used to load this class itself, is used, based on the value of the
  -     * <code>useContextClassLoader</code> variable.
  -     */
  -    protected ClassLoader classLoader;
  -
  -    /**
  -     * Do we want to use the Context ClassLoader when loading classes
  -     * for instantiating new objects?  Default is <code>false</code>.
  -     */
  -    protected boolean useContextClassLoader = false;
  -
  -    /** String used to denote a script can't be parsed */
  -    private static final String BAD_PARSE = "Could not parse Jelly script";
  -
  -    /**
        * Create a new context with the currentURL set to the rootURL
        */
       public JellyContext() {
  @@ -232,9 +232,9 @@
           if (definedHere) return value;
   
           if ( value == null && isInherit() ) {
  -            JellyContext parent = getParent();
  -            if (parent != null) {
  -                value = parent.getVariable( name );
  +            JellyContext parentContext = getParent();
  +            if (parentContext != null) {
  +                value = parentContext.getVariable( name );
               }
           }
   
  @@ -873,9 +873,9 @@
               return (this.classLoader);
           }
           if (this.useContextClassLoader) {
  -            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
  -            if (classLoader != null) {
  -                return (classLoader);
  +            ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
  +            if (contextClassLoader != null) {
  +                return (contextClassLoader);
               }
           }
           return (this.getClass().getClassLoader());
  @@ -925,11 +925,12 @@
        */
       protected URL createRelativeURL(URL rootURL, String relativeURI)
           throws MalformedURLException {
  -        if (rootURL == null) {
  +        URL url = rootURL;
  +        if (url == null) {
               File file = new File(System.getProperty("user.dir"));
  -            rootURL = file.toURL();
  +            url = file.toURL();
           }
  -        String urlText = rootURL.toString() + relativeURI;
  +        String urlText = url.toString() + relativeURI;
           if ( log.isDebugEnabled() ) {
               log.debug("Attempting to open url: " + urlText);
           }
  
  
  
  1.17      +16 -16    jakarta-commons/jelly/src/java/org/apache/commons/jelly/Tag.java
  
  Index: Tag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/Tag.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- Tag.java	24 Feb 2004 14:15:40 -0000	1.16
  +++ Tag.java	9 Sep 2004 12:25:40 -0000	1.17
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -16,7 +16,7 @@
   
   package org.apache.commons.jelly;
   
  -/** 
  +/**
    * <p><code>Tag</code> represents a Jelly custom tag.
    * A Tag is only ever used by a single thread so that Tag developers do not
    * need to concern themselves with mutli-threading issues when writing a Tag.
  @@ -29,37 +29,37 @@
    */
   public interface Tag {
   
  -    /** 
  +    /**
        * @return the parent of this tag
        */
       public Tag getParent();
   
  -    /** 
  +    /**
        * Sets the parent of this tag
        */
       public void setParent(Tag parent);
   
  -    /** 
  -     * @return the body of the tag 
  +    /**
  +     * @return the body of the tag
        */
       public Script getBody();
   
  -    /** 
  +    /**
        * Sets the body of the tag
        */
       public void setBody(Script body);
  -    
  -    /** 
  +
  +    /**
        * Gets the context in which the tag will be run
        */
       public JellyContext getContext();
   
  -    /** 
  -     * Sets the context in which the tag will be run 
  +    /**
  +     * Sets the context in which the tag will be run
        */
       public void setContext(JellyContext context) throws JellyTagException;
   
  -    /** 
  +    /**
        * Evaluates this tag after all the tags properties have been initialized.
        */
       public void doTag(XMLOutput output) throws MissingAttributeException, JellyTagException;
  @@ -68,5 +68,5 @@
        * A helper method to invoke this tags body
        */
       public void invokeBody(XMLOutput output) throws JellyTagException;
  -    
  +
   }
  
  
  
  1.12      +6 -6      jakarta-commons/jelly/src/java/org/apache/commons/jelly/Script.java
  
  Index: Script.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/Script.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Script.java	24 Feb 2004 14:15:40 -0000	1.11
  +++ Script.java	9 Sep 2004 12:25:40 -0000	1.12
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -16,9 +16,9 @@
   
   package org.apache.commons.jelly;
   
  -/** 
  +/**
    * <p><code>Script</code> represents a Jelly script.
  - * A Script <b>must</b> be thread safe so care should be taken on the 
  + * A Script <b>must</b> be thread safe so care should be taken on the
    * implementations of Scripts. However Tags are only used in a single thread
    * (each thread will have create its own Tags for the Script it is running)
    * so multi threading is not a concern for Tag developers.</p>
  
  
  
  1.8       +4 -4      jakarta-commons/jelly/src/java/org/apache/commons/jelly/MapTagSupport.java
  
  Index: MapTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/MapTagSupport.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MapTagSupport.java	24 Feb 2004 14:15:40 -0000	1.7
  +++ MapTagSupport.java	9 Sep 2004 12:25:40 -0000	1.8
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  
  
  
  1.4       +12 -12    jakarta-commons/jelly/src/java/org/apache/commons/jelly/LocationAware.java
  
  Index: LocationAware.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/LocationAware.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocationAware.java	24 Feb 2004 14:15:40 -0000	1.3
  +++ LocationAware.java	9 Sep 2004 12:25:40 -0000	1.4
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -30,40 +30,40 @@
       /** 
        * @return the line number of the tag 
        */
  -    public int getLineNumber();
  +    int getLineNumber();
       
       /** 
        * Sets the line number of the tag 
        */
  -    public void setLineNumber(int lineNumber);
  +    void setLineNumber(int lineNumber);
   
       /** 
        * @return the column number of the tag 
        */
  -    public int getColumnNumber();
  +    int getColumnNumber();
       
       /** 
        * Sets the column number of the tag 
        */
  -    public void setColumnNumber(int columnNumber);
  +    void setColumnNumber(int columnNumber);
   
       /** 
        * @return the Jelly file which caused the problem 
        */
  -    public String getFileName();
  +    String getFileName();
  +    
       /** 
        * Sets the Jelly file which caused the problem 
        */
  -    public void setFileName(String fileName);
  +    void setFileName(String fileName);
       
  -
       /** 
        * @return the element name which caused the problem
        */
  -    public String getElementName();
  +    String getElementName();
   
       /** 
        * Sets the element name which caused the problem
        */
  -    public void setElementName(String elementName);
  +    void setElementName(String elementName);
   }
  
  
  
  1.5       +4 -4      jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyTagException.java
  
  Index: JellyTagException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyTagException.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JellyTagException.java	24 Feb 2004 14:15:40 -0000	1.4
  +++ JellyTagException.java	9 Sep 2004 12:25:40 -0000	1.5
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  
  
  
  1.4       +6 -6      jakarta-commons/jelly/src/java/org/apache/commons/jelly/NamespaceAwareTag.java
  
  Index: NamespaceAwareTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/NamespaceAwareTag.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- NamespaceAwareTag.java	24 Feb 2004 14:15:40 -0000	1.3
  +++ NamespaceAwareTag.java	9 Sep 2004 12:25:40 -0000	1.4
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -18,7 +18,7 @@
   
   import java.util.Map;
   
  -/** 
  +/**
    * <p><code>NamespaceAwareTag</code> represents a Jelly custom tag which
    * needs to be aware of the XML Namespace context in which it is used.
    * When the tag is used it will be given the namespace context which is a
  @@ -32,9 +32,9 @@
   
   public interface NamespaceAwareTag extends Tag {
   
  -    /** 
  +    /**
        * Sets the namespace context in scope when this tag is used
  -     * 
  +     *
        * @param prefixToUriMap is a Map where the keys are the namespace
        * prefixes and the values are the namespace URIs
        */
  
  
  
  1.7       +3 -3      jakarta-commons/jelly/src/java/org/apache/commons/jelly/DynaTagSupport.java
  
  Index: DynaTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/DynaTagSupport.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DynaTagSupport.java	24 Feb 2004 14:15:40 -0000	1.6
  +++ DynaTagSupport.java	9 Sep 2004 12:25:40 -0000	1.7
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  
  
  
  1.25      +18 -18    jakarta-commons/jelly/src/java/org/apache/commons/jelly/TagLibrary.java
  
  Index: TagLibrary.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/TagLibrary.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- TagLibrary.java	24 Feb 2004 14:15:40 -0000	1.24
  +++ TagLibrary.java	9 Sep 2004 12:25:40 -0000	1.25
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -44,8 +44,8 @@
   
       static {
   
  -        // register standard converters 
  -               
  +        // register standard converters
  +
           ConvertUtils.register(
               new Converter() {
                   public Object convert(Class type, Object value) {
  @@ -61,7 +61,7 @@
               },
               File.class
           );
  -    }        
  +    }
   
       public TagLibrary() {
       }
  @@ -81,7 +81,7 @@
           return null;
   
       }
  -    
  +
       /** Creates a new Tag for the given tag name and attributes */
       public Tag createTag(String name, Attributes attributes)
           throws JellyException {
  @@ -103,7 +103,7 @@
           }
           return null;
       }
  -    
  +
       /** Allows taglibs to use their own expression evaluation mechanism */
       public Expression createExpression(
           ExpressionFactory factory,
  @@ -119,24 +119,24 @@
           if (myFactory != null) {
               return CompositeExpression.parse(attributeValue, myFactory);
           }
  -        
  +
           // will use a constant expression instead
           return new ConstantExpression(attributeValue);
       }
  -    
  -    
  +
  +
       // Implementation methods
  -    //-------------------------------------------------------------------------     
  +    //-------------------------------------------------------------------------
   
  -    /** 
  -     * Registers a tag implementation Class for a given tag name 
  +    /**
  +     * Registers a tag implementation Class for a given tag name
        */
       protected void registerTag(String name, Class type) {
           tags.put(name, type);
       }
   
  -    /** 
  -     * Registers a tag factory for a given tag name 
  +    /**
  +     * Registers a tag factory for a given tag name
        */
       protected void registerTagFactory(String name, TagFactory tagFactory) {
           tags.put(name, tagFactory);
  @@ -146,7 +146,7 @@
       protected ExpressionFactory getExpressionFactory() {
           return null;
       }
  -    
  +
       protected Map getTagClasses() {
           return tags;
       }
  
  
  
  1.15      +2 -2      jakarta-commons/jelly/src/java/org/apache/commons/jelly/DynaBeanTagSupport.java
  
  Index: DynaBeanTagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/DynaBeanTagSupport.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DynaBeanTagSupport.java	9 Sep 2004 04:16:29 -0000	1.14
  +++ DynaBeanTagSupport.java	9 Sep 2004 12:25:40 -0000	1.15
  @@ -4,9 +4,9 @@
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  
  
  
  1.17      +4 -4      jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyException.java
  
  Index: JellyException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/JellyException.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JellyException.java	8 Sep 2004 04:27:59 -0000	1.16
  +++ JellyException.java	9 Sep 2004 12:25:40 -0000	1.17
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  
  
  
  1.6       +3 -3      jakarta-commons/jelly/src/java/org/apache/commons/jelly/MissingAttributeException.java
  
  Index: MissingAttributeException.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/MissingAttributeException.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MissingAttributeException.java	24 Feb 2004 14:15:40 -0000	1.5
  +++ MissingAttributeException.java	9 Sep 2004 12:25:40 -0000	1.6
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  
  
  
  1.33      +4 -4      jakarta-commons/jelly/src/java/org/apache/commons/jelly/TagSupport.java
  
  Index: TagSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/TagSupport.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- TagSupport.java	8 Sep 2004 04:27:59 -0000	1.32
  +++ TagSupport.java	9 Sep 2004 12:25:40 -0000	1.33
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  
  
  
  1.11      +4 -4      jakarta-commons/jelly/src/java/org/apache/commons/jelly/DynaTag.java
  
  Index: DynaTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/DynaTag.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DynaTag.java	24 Feb 2004 14:15:40 -0000	1.10
  +++ DynaTag.java	9 Sep 2004 12:25:40 -0000	1.11
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  
  
  
  1.18      +15 -15    jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java
  
  Index: JexlExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/jexl/JexlExpression.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- JexlExpression.java	24 Feb 2004 13:56:59 -0000	1.17
  +++ JexlExpression.java	9 Sep 2004 12:25:41 -0000	1.18
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -29,9 +29,9 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
  -/** 
  - * Represents a <a href="http://jakarta.apache.org/commons/jexl.html">Jexl</a> 
  - * expression which fully supports the Expression Language in JSTL and JSP 
  +/**
  + * Represents a <a href="http://jakarta.apache.org/commons/jexl.html">Jexl</a>
  + * expression which fully supports the Expression Language in JSTL and JSP
    * along with some extra features like object method invocation.
    *
    * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  @@ -53,26 +53,26 @@
       public String toString() {
           return super.toString() + "[" + expression.getExpression() + "]";
       }
  -    
  +
       // Expression interface
  -    //------------------------------------------------------------------------- 
  +    //-------------------------------------------------------------------------
       public String getExpressionText() {
           return "${" + expression.getExpression() + "}";
       }
  -    
  +
       public Object evaluate(JellyContext context) {
           try {
               JexlContext jexlContext = new JellyJexlContext( context );
               if (log.isDebugEnabled()) {
                   log.debug("Evaluating EL: " + expression.getExpression());
  -            }           
  +            }
               Object value = expression.evaluate(jexlContext);
  -            
  +
               if (log.isDebugEnabled()) {
                   log.debug("value of expression: " + value);
               }
  -            
  -            return value;           
  +
  +            return value;
           }
           catch (Exception e) {
               log.warn("Caught exception evaluating: " + expression + ". Reason: " + e, e);
  @@ -135,7 +135,7 @@
       public Set keySet() {
           return null;
       }
  -        
  +
       public Object put(Object key, Object value) {
           return null;
       }
  
  
  
  1.19      +31 -31    jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java
  
  Index: JexlExpressionFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/jexl/JexlExpressionFactory.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- JexlExpressionFactory.java	29 Aug 2004 23:38:57 -0000	1.18
  +++ JexlExpressionFactory.java	9 Sep 2004 12:25:41 -0000	1.19
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -24,8 +24,8 @@
   
   //import org.apache.commons.jexl.resolver.FlatResolver;
   
  -/** 
  - * Represents a factory of <a href="http://jakarta.apache.org/commons/jexl.html">Jexl</a> 
  +/**
  + * Represents a factory of <a href="http://jakarta.apache.org/commons/jexl.html">Jexl</a>
    * expression which fully supports the Expression Language in JSTL and JSP.
    * In addition this ExpressionFactory can also support Ant style variable
    * names, where '.' is used inside variable names.
  @@ -38,21 +38,21 @@
   
       /** whether we should allow Ant-style expresssions, using dots as part of variable name */
       private boolean supportAntVariables = true;
  -    
  +
       // ExpressionFactory interface
  -    //------------------------------------------------------------------------- 
  +    //-------------------------------------------------------------------------
       public Expression createExpression(String text) throws JellyException {
  -/*        
  -        
  -        org.apache.commons.jexl.Expression expr = 
  +/*
  +
  +        org.apache.commons.jexl.Expression expr =
               org.apache.commons.jexl.ExpressionFactory.createExpression(text);
  -            
  +
           if ( isSupportAntVariables() ) {
               expr.addPostResolver(new FlatResolver());
           }
  -        
  +
           return new JexlExpression( expr );
  -*/        
  +*/
   
           Expression jexlExpression = null;
           try {
  @@ -69,35 +69,35 @@
           }
           return jexlExpression;
       }
  -    
  +
       // Properties
  -    //------------------------------------------------------------------------- 
  +    //-------------------------------------------------------------------------
   
  -    /** 
  -     * @return whether we should allow Ant-style expresssions, using dots as 
  -     * part of variable name 
  +    /**
  +     * @return whether we should allow Ant-style expresssions, using dots as
  +     * part of variable name
        */
       public boolean isSupportAntVariables() {
           return supportAntVariables;
       }
  -    
  -    /** 
  -     * Sets whether we should allow Ant-style expresssions, using dots as 
  -     * part of variable name 
  +
  +    /**
  +     * Sets whether we should allow Ant-style expresssions, using dots as
  +     * part of variable name
        */
       public void setSupportAntVariables(boolean supportAntVariables) {
           this.supportAntVariables = supportAntVariables;
       }
   
       // Implementation methods
  -    //------------------------------------------------------------------------- 
  +    //-------------------------------------------------------------------------
   
       /**
        * @return true if the given string is a valid Ant variable name,
        * typically thats alphanumeric text with '.' etc.
        */
       protected boolean isValidAntVariableName(String text) {
  -        char[] chars = text.toCharArray();            
  +        char[] chars = text.toCharArray();
           for (int i = 0, size = chars.length; i < size; i++ ) {
               char ch = chars[i];
               // could maybe be a bit more restrictive...
  @@ -107,17 +107,17 @@
           }
           return true;
       }
  -    
  +
       private class ExpressionSupportLocal extends ExpressionSupport {
  -        
  +
           protected Expression jexlExpression = null;
           protected String text = null;
  -        
  +
           public ExpressionSupportLocal(Expression jexlExpression, String text) {
               this.jexlExpression = jexlExpression;
               this.text = text;
           }
  -        
  +
           public Object evaluate(JellyContext context) {
               Object answer = jexlExpression.evaluate(context);
   
  @@ -127,11 +127,11 @@
   
               return answer;
           }
  -                
  +
           public String getExpressionText() {
               return "${" + text + "}";
           }
  -                
  +
           public String toString() {
               return super.toString() + "[expression:" + text + "]";
           }
  
  
  
  1.9       +6 -6      jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/ExpressionFactory.java
  
  Index: ExpressionFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/ExpressionFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ExpressionFactory.java	24 Feb 2004 14:02:07 -0000	1.8
  +++ ExpressionFactory.java	9 Sep 2004 12:25:41 -0000	1.9
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -25,8 +25,8 @@
     */
   public interface ExpressionFactory {
   
  -    /** 
  -     * Creates a new expression for the given text 
  +    /**
  +     * Creates a new expression for the given text
        */
   
       public Expression createExpression(String text) throws JellyException;
  
  
  
  1.12      +24 -24    jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/CompositeExpression.java
  
  Index: CompositeExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/CompositeExpression.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CompositeExpression.java	5 Sep 2004 11:14:46 -0000	1.11
  +++ CompositeExpression.java	9 Sep 2004 12:25:41 -0000	1.12
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -25,7 +25,7 @@
   import org.apache.commons.jelly.JellyContext;
   import org.apache.commons.jelly.JellyException;
   
  -/** 
  +/**
    * <p><code>CompositeExpression</code> is a Composite expression made up of several
    * Expression objects which are concatenated into a single String.</p>
    *
  @@ -36,31 +36,31 @@
   
       /** The expressions */
       private List expressions;
  -    
  +
       public CompositeExpression() {
           this.expressions = new ArrayList();
       }
  -    
  +
       public CompositeExpression(List expressions) {
           this.expressions = expressions;
       }
  -    
  +
       public String toString() {
           return super.toString() + "[expressions=" + expressions +"]";
       }
  -    
  +
       /**
        * Parses the given String to be either a ConstantExpresssion, an Expression denoted as
        * "${foo}" or some String with embedded expresssions such as "abc${something}def${else}xyz"
        * which results in a CompositeExpression being returned.
  -     * 
  +     *
        * @param text is the String to parse into expressions
        * @param factory is the Factory of Expression objects used to create expresssions for the contents
        *  of the String "foo" inside expressions such as "${foo}"
  -     * 
  +     *
        * @return the Expresssion for the given String.
        * @throws JellyException if the text is invalid (such as missing '}' character).
  -     * @throws JellyException if there was some problem creating the underlying Expression object 
  +     * @throws JellyException if there was some problem creating the underlying Expression object
        *  from the ExpressionFactory
        */
       public static Expression parse(String text, ExpressionFactory factory) throws JellyException {
  @@ -201,7 +201,7 @@
       //-------------------------------------------------------------------------
   
       /**
  -     * @return the Expression objects that make up this 
  +     * @return the Expression objects that make up this
        * composite expression
        */
       public List getExpressions() {
  @@ -209,30 +209,30 @@
       }
   
       /**
  -     * Sets the Expression objects that make up this 
  +     * Sets the Expression objects that make up this
        * composite expression
        */
       public void setExpressions(List expressions) {
           this.expressions = expressions;
       }
  -        
  -    /** 
  +
  +    /**
        * Adds a new expression to the end of the expression list
        */
       public void addExpression(Expression expression) {
           expressions.add(expression);
       }
  -    
  +
       /**
  -     * A helper method to add a new constant text expression 
  +     * A helper method to add a new constant text expression
        */
       public void addTextExpression(String text) {
           addExpression(new ConstantExpression(text));
       }
  -    
  +
       // Expression interface
       //-------------------------------------------------------------------------
  -    
  +
       public String getExpressionText() {
           StringBuffer buffer = new StringBuffer();
           for (Iterator iter = expressions.iterator(); iter.hasNext(); ) {
  @@ -241,13 +241,13 @@
           }
           return buffer.toString();
       }
  -    
  -        
  +
  +
       // inherit javadoc from interface
       public Object evaluate(JellyContext context) {
           return evaluateAsString(context);
       }
  -    
  +
       // inherit javadoc from interface
       public String evaluateAsString(JellyContext context) {
           StringBuffer buffer = new StringBuffer();
  @@ -259,9 +259,9 @@
               }
           }
           return buffer.toString();
  -        
  +
       }
  -    
  +
       // inherit javadoc from interface
       public Iterator evaluateAsIterator(JellyContext context) {
           String value = evaluateAsString(context);
  
  
  
  1.15      +6 -6      jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/ExpressionSupport.java
  
  Index: ExpressionSupport.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/ExpressionSupport.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ExpressionSupport.java	5 Sep 2004 11:35:45 -0000	1.14
  +++ ExpressionSupport.java	9 Sep 2004 12:25:41 -0000	1.15
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -48,7 +48,7 @@
           // of an expression can actually be an expression.
           // e.g. ${foo.bar} can lookup "foo.bar" in a Maven context
           // which could actually be an expression
  -      
  +
           if ( value != null ) {
               return value.toString();
           }
  @@ -65,7 +65,7 @@
           }
           return value;
       }
  -    
  +
       // inherit javadoc from interface
       public boolean evaluateAsBoolean(JellyContext context) {
           Object value = evaluateRecurse(context);
  
  
  
  1.11      +12 -12    jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/Expression.java
  
  Index: Expression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/Expression.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Expression.java	24 Feb 2004 14:02:07 -0000	1.10
  +++ Expression.java	9 Sep 2004 12:25:41 -0000	1.11
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -30,25 +30,25 @@
       /**
        * @return the textual representation of this expression
     */
       public String getExpressionText();
  -    
  -    /** 
  +
  +    /**
        * Evaluates the expression with the given context
  -     * and returns the result 
  +     * and returns the result
        */
  -    public Object evaluate(JellyContext context);        
  -    
  +    public Object evaluate(JellyContext context);
  +
       /**
        * Evaluates the expression with the given context
        * coercing the result to be a String.
        */
       public String evaluateAsString(JellyContext context);
  -    
  +
       /**
        * Evaluates the expression with the given context
        * coercing the result to be a boolean.
        */
       public boolean evaluateAsBoolean(JellyContext context);
  -    
  +
       /**
        * Evaluates the expression with the given context
        * coercing the result to be an Iterator.
  @@ -57,7 +57,7 @@
   
       /**
        * This method evaluates the expression until a value (a non-Expression) object
  -     * is returned. 
  +     * is returned.
        * If the expression returns another expression, then the nested expression is evaluated.
        * <p>
        * Sometimes when Jelly is used inside Maven the value
  
  
  
  1.9       +13 -13    jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/ConstantExpression.java
  
  Index: ConstantExpression.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/expression/ConstantExpression.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ConstantExpression.java	24 Feb 2004 14:02:07 -0000	1.8
  +++ ConstantExpression.java	9 Sep 2004 12:25:41 -0000	1.9
  @@ -1,12 +1,12 @@
   /*
    * Copyright 2002,2004 The Apache Software Foundation.
  - * 
  + *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
    * You may obtain a copy of the License at
  - * 
  + *
    *      http://www.apache.org/licenses/LICENSE-2.0
  - * 
  + *
    * Unless required by applicable law or agreed to in writing, software
    * distributed under the License is distributed on an "AS IS" BASIS,
    * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  @@ -28,41 +28,41 @@
   
       /** The value of this expression */
       private Object value;
  -    
  +
       /** Base constructor
        */
       public ConstantExpression() {
       }
  -    
  +
       /** Convenience constructor sets <code>value</code> property.
        */
       public ConstantExpression(Object value) {
           this.value = value;
       }
  -    
  +
       public String toString() {
           return super.toString() + "[value=" + value +"]";
       }
  -    
  +
       public String getExpressionText() {
           return value == null ? "null" : value.toString();
       }
  -    
  -    /** 
  +
  +    /**
         * Evaluate expression against given context.
         *
         * @param context evaluate expression against this context
  -      * @return current value of <code>value</code> property  
  +      * @return current value of <code>value</code> property
         */
       public Object evaluate(JellyContext context) {
           return value;
       }
  -    
  +
       /** Gets the constant value of this expression */
       public Object getValue() {
           return value;
       }
  -    
  +
       /** Sets the constant value of this expression */
       public void setValue(Object value) {
           this.value = value;
  
  
  

---------------------------------------------------------------------
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