tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java ServletResponseWrapperInclude.java
Date Tue, 27 Aug 2002 22:24:43 GMT
luehe       2002/08/27 15:24:42

  Modified:    jasper2/src/share/org/apache/jasper/runtime
                        JspRuntimeLibrary.java
                        ServletResponseWrapperInclude.java
  Log:
  Fixed 12003 ("Unable to use jsp:include in a fragment")
  
  Revision  Changes    Path
  1.5       +9 -23     jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
  
  Index: JspRuntimeLibrary.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- JspRuntimeLibrary.java	21 Aug 2002 16:21:56 -0000	1.4
  +++ JspRuntimeLibrary.java	27 Aug 2002 22:24:42 -0000	1.5
  @@ -62,26 +62,12 @@
   
   package org.apache.jasper.runtime;
   
  -import java.io.IOException;
  -import java.util.Enumeration;
  -import java.util.Map;
  -
  +import java.util.*;
  +import java.io.*;
  +import java.beans.*;
  +import java.security.*;
   import java.lang.reflect.Method;
   
  -import java.io.Writer;
  -import java.io.Reader;
  -import java.io.IOException;
  -import java.io.InputStreamReader;
  -
  -import java.beans.PropertyDescriptor;
  -import java.beans.IndexedPropertyDescriptor;
  -import java.beans.PropertyEditor;
  -import java.beans.PropertyEditorManager;
  -
  -import java.security.AccessController;
  -import java.security.PrivilegedExceptionAction;
  -import java.security.PrivilegedActionException;
  -
   import javax.servlet.RequestDispatcher;
   import javax.servlet.ServletException;
   import javax.servlet.ServletRequest;
  @@ -818,7 +804,7 @@
        * @param request The servlet request we are processing
        * @param response The servlet response we are processing
        * @param relativePath The relative path of the resource to be included
  -     * @param out The JspWriter to whom we are currently writing
  +     * @param out The Writer to whom we are currently writing
        * @param flush Should we flush before the include is processed?
        *
        * @exception IOException if thrown by the included servlet
  @@ -827,7 +813,7 @@
       public static void include(HttpServletRequest request,
                                  HttpServletResponse response,
                                  String relativePath,
  -                               JspWriter out,
  +                               Writer out,
                                  boolean flush)
           throws IOException, ServletException {
   
  
  
  
  1.2       +8 -7      jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/ServletResponseWrapperInclude.java
  
  Index: ServletResponseWrapperInclude.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/ServletResponseWrapperInclude.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServletResponseWrapperInclude.java	28 Mar 2002 18:46:20 -0000	1.1
  +++ ServletResponseWrapperInclude.java	27 Aug 2002 22:24:42 -0000	1.2
  @@ -62,6 +62,7 @@
   package org.apache.jasper.runtime;
   
   import java.lang.IllegalStateException;
  +import java.io.Writer;
   import java.io.PrintWriter;
   
   import javax.servlet.*;
  @@ -73,7 +74,7 @@
    *
    * This 'wrapped' response object is passed as the second argument 
    * to the internal RequestDispatcher.include(). It channels
  - * all output text into the current JspWriter.
  + * all output text into the current Writer.
    *
    * @author Pierre Delisle
    */
  @@ -82,20 +83,20 @@
       extends HttpServletResponseWrapper
   {
       /**
  -     * The PrintWriter writes all output to the JspWriter of the 
  +     * The PrintWriter writes all output to the Writer of the 
        * including page.
        */
       PrintWriter printWriter;
   
       public ServletResponseWrapperInclude(ServletResponse response, 
  -					 JspWriter jspWriter) 
  +					 Writer writer) 
       {
   	super((HttpServletResponse)response);
  -	this.printWriter = new PrintWriter(jspWriter);
  +	this.printWriter = new PrintWriter(writer);
       }
   
       /**
  -     * Returns a wrapper around the JspWriter of the including page.
  +     * Returns a wrapper around the Writer of the including page.
        */
       public java.io.PrintWriter getWriter()
   	throws java.io.IOException 
  
  
  

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