tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gl...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet JspServlet.java
Date Tue, 02 Apr 2002 16:11:13 GMT
glenn       02/04/02 08:11:13

  Modified:    jasper/src/share/org/apache/jasper Tag: tomcat_40_branch
                        CommandLineContext.java EmbededServletOptions.java
                        JspCompilationContext.java JspEngineContext.java
                        Options.java
               jasper/src/share/org/apache/jasper/compiler Tag:
                        tomcat_40_branch CommandLineCompiler.java
                        CommentGenerator.java ExpressionGenerator.java
                        GetPropertyGenerator.java IncludeGenerator.java
                        JspCompiler.java ScriptletGenerator.java
                        SetPropertyGenerator.java TldLocationsCache.java
               jasper/src/share/org/apache/jasper/logging Tag:
                        tomcat_40_branch Logger.java
               jasper/src/share/org/apache/jasper/runtime Tag:
                        tomcat_40_branch BodyContentImpl.java
               jasper/src/share/org/apache/jasper/servlet Tag:
                        tomcat_40_branch JspServlet.java
  Log:
  Cleanup Java 1.4 javadoc errors
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.6.2.2   +10 -7     jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java
  
  Index: CommandLineContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- CommandLineContext.java	1 Feb 2002 22:20:37 -0000	1.6.2.1
  +++ CommandLineContext.java	2 Apr 2002 16:11:12 -0000	1.6.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v
1.6.2.1 2002/02/01 22:20:37 kinman Exp $
  - * $Revision: 1.6.2.1 $
  - * $Date: 2002/02/01 22:20:37 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/CommandLineContext.java,v
1.6.2.2 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.6.2.2 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -179,7 +179,8 @@
       }
       
       /**
  -     * What is the scratch directory we are generating code into?
  +     * The scratch directory to generate code into.
  +     *
        * FIXME: In some places this is called scratchDir and in some
        * other places it is called outputDir.
        */
  @@ -188,7 +189,8 @@
       }
       
       /**
  -     * What is the scratch directory we are generating code into?
  +     * The scratch directory to generate code into for javac.
  +     *
        * FIXME: In some places this is called scratchDir and in some
        * other places it is called outputDir.
        */
  @@ -259,8 +261,9 @@
       }
   
       /**
  -     * What's the content type of this JSP? Content type includes
  -     * content type and encoding. 
  +     * The content type of this JSP.
  +     *
  +     * Content type includes content type and encoding. 
        */
       public String getContentType() {
           return contentType;
  
  
  
  1.6.2.2   +18 -13    jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java
  
  Index: EmbededServletOptions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- EmbededServletOptions.java	30 Nov 2001 22:17:39 -0000	1.6.2.1
  +++ EmbededServletOptions.java	2 Apr 2002 16:11:12 -0000	1.6.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.6.2.1 2001/11/30 22:17:39 larryi Exp $
  - * $Revision: 1.6.2.1 $
  - * $Date: 2001/11/30 22:17:39 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/EmbededServletOptions.java,v
1.6.2.2 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.6.2.2 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -84,24 +84,29 @@
       public boolean keepGenerated = true;
   
       /**
  -     * Do you want support for "large" files? What this essentially
  -     * means is that we generated code so that the HTML data in a JSP
  -     * file is stored separately as opposed to those constant string
  -     * data being used literally in the generated servlet. 
  +     * Flag support for "large" files.
  +     *
  +     * What this essentially means is that we generated code so that
  +     * the HTML data in a JSP file is stored separately as opposed
  +     * to those constant string data being used literally in the
  +     * generated servlet.
        */
       public boolean largeFile = false;
       
       /**
  -     * Do you want support for "mapped" files? This will generate
  -     * servlet that has a print statement per line of the JSP file.
  -     * This seems like a really nice feature to have for debugging.
  +     * Flag support for "mapped" files.
  +     *
  +     * This will generate servlet that has a print statement per
  +     * line of the JSP file. This seems like a really nice feature
  +     * to have for debugging.
        */
       public boolean mappedFile = false;
       
       /**
  -     * Do you want stack traces and such displayed in the client's
  -     * browser? If this is false, such messages go to the standard
  -     * error or a log file if the standard error is redirected. 
  +     * Flag to display stack traces in the client's browser.
  +     *
  +     * If this is false, such messages go to the standard
  +     * error or a log file if the standard error is redirected.
        */
       public boolean sendErrorToClient = false;
   
  
  
  
  1.5.2.1   +12 -9     jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java
  
  Index: JspCompilationContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- JspCompilationContext.java	8 Feb 2001 13:37:16 -0000	1.5
  +++ JspCompilationContext.java	2 Apr 2002 16:11:12 -0000	1.5.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java,v
1.5 2001/02/08 13:37:16 glenn Exp $
  - * $Revision: 1.5 $
  - * $Date: 2001/02/08 13:37:16 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspCompilationContext.java,v
1.5.2.1 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.5.2.1 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -112,14 +112,16 @@
       public boolean isErrorPage();
       
       /**
  -     * What is the scratch directory we are generating code into?
  +     * The scratch directory to generate code into. 
  +     *
        * FIXME: In some places this is called scratchDir and in some
        * other places it is called outputDir.
        */
       public String getOutputDir();
       
       /**
  -     * What is the scratch directory we are generating code into?
  +     * The scratch directory to generate code into for javac.
  +     *
        * FIXME: In some places this is called scratchDir and in some
        * other places it is called outputDir.
        */
  @@ -154,8 +156,9 @@
       public boolean keepGenerated();
   
       /**
  -     * What's the content type of this JSP? Content type includes
  -     * content type and encoding. 
  +     * The content type of this JSP.
  +     *
  +     * Content type includes content type and encoding.
        */
       public String getContentType();
   
  @@ -194,7 +197,7 @@
       /**
        * Gets a resource as a stream, relative to the meanings of this
        * context's implementation.
  -     *@returns a null if the resource cannot be found or represented 
  +     * @return a null if the resource cannot be found or represented 
        *         as an InputStream.
        */
       public java.io.InputStream getResourceAsStream(String res);
  @@ -214,7 +217,7 @@
        * Get the 'location' of the TLD associated with 
        * a given taglib 'uri'.
        * 
  -     * @returns An array of two Strings. The first one is
  +     * @return An array of two Strings. The first one is
        * real path to the TLD. If the path to the TLD points
        * to a jar file, then the second string is the
        * name of the entry for the TLD in the jar file.
  
  
  
  1.9.2.1   +14 -9     jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java
  
  Index: JspEngineContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- JspEngineContext.java	19 Jun 2001 04:17:26 -0000	1.9
  +++ JspEngineContext.java	2 Apr 2002 16:11:12 -0000	1.9.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java,v
1.9 2001/06/19 04:17:26 remm Exp $
  - * $Revision: 1.9 $
  - * $Date: 2001/06/19 04:17:26 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/JspEngineContext.java,v
1.9.2.1 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.9.2.1 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -187,7 +187,9 @@
       
       /**
        * What class loader to use for loading classes while compiling
  -     * this JSP? I don't think this is used right now -- akv. 
  +     * this JSP.
  +     *
  +     * I don't think this is used right now -- akv.
        */
       public ClassLoader getClassLoader() {
           return Thread.currentThread().getContextClassLoader();
  @@ -202,7 +204,8 @@
       }
       
       /**
  -     * What is the scratch directory we are generating code into?
  +     * Get the scratch directory to place generated code.
  +     *
        * FIXME: In some places this is called scratchDir and in some
        * other places it is called outputDir.
        */
  @@ -211,7 +214,8 @@
       }
       
       /**
  -     * What is the scratch directory we are generating code into?
  +     * Get the scratch directory to place generated code for javac.
  +     *
        * FIXME: In some places this is called scratchDir and in some
        * other places it is called outputDir.
        */
  @@ -258,8 +262,9 @@
       }
   
       /**
  -     * What's the content type of this JSP? Content type includes
  -     * content type and encoding. 
  +     * Get the content type of this JSP.
  +     *
  +     * Content type includes content type and encoding.
        */
       public String getContentType() {
           return contentType;
  @@ -352,7 +357,7 @@
       /**
        * Gets a resource as a stream, relative to the meanings of this
        * context's implementation.
  -     *@returns a null if the resource cannot be found or represented 
  +     * @return a null if the resource cannot be found or represented 
        *         as an InputStream.
        */
       public java.io.InputStream getResourceAsStream(String res)
  
  
  
  1.6.2.2   +4 -4      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java
  
  Index: Options.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- Options.java	30 Nov 2001 22:17:39 -0000	1.6.2.1
  +++ Options.java	2 Apr 2002 16:11:12 -0000	1.6.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v
1.6.2.1 2001/11/30 22:17:39 larryi Exp $
  - * $Revision: 1.6.2.1 $
  - * $Date: 2001/11/30 22:17:39 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/Options.java,v
1.6.2.2 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.6.2.2 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -137,7 +137,7 @@
        * web.xml or implicitely via the uri tag in the TLD 
        * of a taglib deployed in a jar file (WEB-INF/lib).
        *
  -     * @returns the instance of the TldLocationsCache
  +     * @return the instance of the TldLocationsCache
        * for the web-application.
        */
       public TldLocationsCache getTldLocationsCache();
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.2   +4 -4      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommandLineCompiler.java
  
  Index: CommandLineCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommandLineCompiler.java,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- CommandLineCompiler.java	1 Feb 2002 20:58:37 -0000	1.2.2.1
  +++ CommandLineCompiler.java	2 Apr 2002 16:11:12 -0000	1.2.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommandLineCompiler.java,v
1.2.2.1 2002/02/01 20:58:37 kinman Exp $
  - * $Revision: 1.2.2.1 $
  - * $Date: 2002/02/01 20:58:37 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommandLineCompiler.java,v
1.2.2.2 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.2.2.2 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * The Apache Software License, Version 1.1
    *
  @@ -113,7 +113,7 @@
   
       /**
        * Always outDated.  (Of course we are, this is an explicit invocation
  -     *@returns true
  +     * @return true
        */
       public boolean isOutDated() {
           return true;
  
  
  
  1.1.4.1   +6 -2      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommentGenerator.java
  
  Index: CommentGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/CommentGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- CommentGenerator.java	12 Aug 2000 00:52:07 -0000	1.1
  +++ CommentGenerator.java	2 Apr 2002 16:11:12 -0000	1.1.4.1
  @@ -77,6 +77,12 @@
   import org.apache.jasper.Constants;
   import org.apache.jasper.JspCompilationContext;
   
  +/**
  + * JSP Comment Generator
  + *
  + * @author Mandar Raje [Patch submitted by Yury Kamen]
  + */
  +
   public interface CommentGenerator {
       
       /**
  @@ -86,8 +92,6 @@
        * @param start Start position of the block
        * @param stop End position of the block
        * @exception JasperException
  -     *
  -     * @author Mandar Raje [Patch submitted by Yury Kamen]
        */
       void generateStartComment(Generator generator, ServletWriter out, Mark start, Mark
stop) throws JasperException;
   
  
  
  
  1.2.2.1   +4 -4      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ExpressionGenerator.java
  
  Index: ExpressionGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ExpressionGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- ExpressionGenerator.java	17 Jul 2001 22:12:03 -0000	1.2
  +++ ExpressionGenerator.java	2 Apr 2002 16:11:12 -0000	1.2.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ExpressionGenerator.java,v
1.2 2001/07/17 22:12:03 horwat Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/07/17 22:12:03 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ExpressionGenerator.java,v
1.2.2.1 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.2.2.1 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -62,7 +62,7 @@
   package org.apache.jasper.compiler;
   
   /**
  - * Generator to deal with JSP expressions: <%= ... %> stuff. 
  + * Generator to deal with JSP expressions: &lt;%= ... %&gt; stuff. 
    *
    * @author Anil K. Vijendran
    */
  
  
  
  1.2.4.1   +4 -4      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/GetPropertyGenerator.java
  
  Index: GetPropertyGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/GetPropertyGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- GetPropertyGenerator.java	11 Oct 2000 19:35:13 -0000	1.2
  +++ GetPropertyGenerator.java	2 Apr 2002 16:11:12 -0000	1.2.4.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/GetPropertyGenerator.java,v
1.2 2000/10/11 19:35:13 shemnon Exp $
  - * $Revision: 1.2 $
  - * $Date: 2000/10/11 19:35:13 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/GetPropertyGenerator.java,v
1.2.4.1 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.2.4.1 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -70,7 +70,7 @@
   import org.xml.sax.Attributes;
   
   /**
  - * Generator for <jsp:getProperty.../>
  + * Generator for jsp:getProperty.
    *
    * @author Mandar Raje
    * @author Danno Ferrin
  
  
  
  1.8.2.2   +4 -4      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java
  
  Index: IncludeGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
  retrieving revision 1.8.2.1
  retrieving revision 1.8.2.2
  diff -u -r1.8.2.1 -r1.8.2.2
  --- IncludeGenerator.java	5 Dec 2001 18:41:46 -0000	1.8.2.1
  +++ IncludeGenerator.java	2 Apr 2002 16:11:12 -0000	1.8.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
1.8.2.1 2001/12/05 18:41:46 kinman Exp $
  - * $Revision: 1.8.2.1 $
  - * $Date: 2001/12/05 18:41:46 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
1.8.2.2 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.8.2.2 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -71,7 +71,7 @@
   import org.xml.sax.Attributes;
   
   /**
  - * Generator for <jsp:include.../>
  + * Generator for jsp:include.
    *
    *
    * @author Anil K. Vijendran
  
  
  
  1.7.2.2   +1 -1      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspCompiler.java
  
  Index: JspCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/JspCompiler.java,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -r1.7.2.1 -r1.7.2.2
  --- JspCompiler.java	3 Oct 2001 23:45:02 -0000	1.7.2.1
  +++ JspCompiler.java	2 Apr 2002 16:11:12 -0000	1.7.2.2
  @@ -67,7 +67,7 @@
   
   /**
    * JspCompiler is an implementation of Compiler with a funky code
  - * mangling and code generation scheme!
  + * mangling and code generation scheme.
    *
    * The reason that it is both a sub-class of compiler and an implementation
    * of mangler is because the isOutDated method that is overridden and the
  
  
  
  1.1.4.1   +4 -4      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ScriptletGenerator.java
  
  Index: ScriptletGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ScriptletGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.1.4.1
  diff -u -r1.1 -r1.1.4.1
  --- ScriptletGenerator.java	12 Aug 2000 00:52:08 -0000	1.1
  +++ ScriptletGenerator.java	2 Apr 2002 16:11:12 -0000	1.1.4.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ScriptletGenerator.java,v
1.1 2000/08/12 00:52:08 pierred Exp $
  - * $Revision: 1.1 $
  - * $Date: 2000/08/12 00:52:08 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ScriptletGenerator.java,v
1.1.4.1 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.1.4.1 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -66,7 +66,7 @@
   
   
   /**
  - * Generator for <% .... %> stuff. 
  + * Generator for &lt;% .... %&gt; stuff. 
    *
    * @author Anil K. Vijendran
    */
  
  
  
  1.3.4.1   +4 -4      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java
  
  Index: SetPropertyGenerator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
  retrieving revision 1.3
  retrieving revision 1.3.4.1
  diff -u -r1.3 -r1.3.4.1
  --- SetPropertyGenerator.java	30 Nov 2000 21:47:58 -0000	1.3
  +++ SetPropertyGenerator.java	2 Apr 2002 16:11:12 -0000	1.3.4.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
1.3 2000/11/30 21:47:58 pierred Exp $
  - * $Revision: 1.3 $
  - * $Date: 2000/11/30 21:47:58 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
1.3.4.1 2002/04/02 16:11:12 glenn Exp $
  + * $Revision: 1.3.4.1 $
  + * $Date: 2002/04/02 16:11:12 $
    *
    * ====================================================================
    * 
  @@ -71,7 +71,7 @@
   import org.xml.sax.Attributes;
   
   /**
  - * Generator for <jsp:setProperty .../>
  + * Generator for jsp:setProperty.
    *
    * @author Mandar Raje
    * @author Danno Ferrin
  
  
  
  1.9.2.1   +1 -1      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TldLocationsCache.java
  
  Index: TldLocationsCache.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/TldLocationsCache.java,v
  retrieving revision 1.9
  retrieving revision 1.9.2.1
  diff -u -r1.9 -r1.9.2.1
  --- TldLocationsCache.java	2 Jun 2001 20:18:23 -0000	1.9
  +++ TldLocationsCache.java	2 Apr 2002 16:11:12 -0000	1.9.2.1
  @@ -290,7 +290,7 @@
        * Get the 'location' of the TLD associated with 
        * a given taglib 'uri'.
        * 
  -     * @returns An array of two Strings. The first one is
  +     * @return An array of two Strings. The first one is
        * real path to the TLD. If the path to the TLD points
        * to a jar file, then the second string is the
        * name of the entry for the TLD in the jar file.
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.4.1   +4 -2      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/Logger.java
  
  Index: Logger.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/logging/Logger.java,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- Logger.java	31 Aug 2000 15:46:40 -0000	1.2
  +++ Logger.java	2 Apr 2002 16:11:13 -0000	1.2.4.1
  @@ -510,12 +510,14 @@
       }
   
       /**
  -     * If we are timestamping at all, what format do we use to print
  -     * the timestamp? See java.text.SimpleDateFormat.
  +     * If we are timestamping at all, what format to use when
  +     * printing the timestamp.
        *
        * Default = "yyyy-MM-dd hh:mm:ss". Special case: "msec" => raw
        * number of msec since epoch, very efficient but not
        * user-friendly
  +     *
  +     * @see java.text.SimpleDateFormat
        **/
       public void setTimestampFormat(String value)
       {
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.2   +2 -2      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/BodyContentImpl.java
  
  Index: BodyContentImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/BodyContentImpl.java,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- BodyContentImpl.java	5 Dec 2001 18:41:46 -0000	1.2.2.1
  +++ BodyContentImpl.java	2 Apr 2002 16:11:13 -0000	1.2.2.2
  @@ -543,7 +543,7 @@
        * Note: this is after evaluation!!  There are no scriptlets,
        * etc in this stream.
        *
  -     * @returns the value of this BodyJspWriter as a Reader
  +     * @return the value of this BodyJspWriter as a Reader
        */
       public Reader getReader() {
           return new CharArrayReader (cb, 0, nextChar);
  @@ -554,7 +554,7 @@
        * Note: this is after evaluation!!  There are no scriptlets,
        * etc in this stream.
        *
  -     * @returns the value of the BodyJspWriter as a String
  +     * @return the value of the BodyJspWriter as a String
        */
       public String getString() {
           return new String(cb, 0, nextChar);
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.21.2.6  +1 -1      jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java
  
  Index: JspServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/servlet/JspServlet.java,v
  retrieving revision 1.21.2.5
  retrieving revision 1.21.2.6
  diff -u -r1.21.2.5 -r1.21.2.6
  --- JspServlet.java	30 Jan 2002 10:57:13 -0000	1.21.2.5
  +++ JspServlet.java	2 Apr 2002 16:11:13 -0000	1.21.2.6
  @@ -101,7 +101,7 @@
   import org.apache.jasper.logging.JasperLogger;
   
   /**
  - * The JSP engine (a.k.a Jasper)! 
  + * The JSP engine (a.k.a Jasper).
    *
    * The servlet container is responsible for providing a
    * URLClassLoader for the web application context Jasper
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message