tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From go...@hyperreal.org
Subject cvs commit: jakarta-tomcat/src/tests/webpages/WEB-INF/classes/request EchoServlet.java
Date Sat, 30 Oct 1999 09:24:05 GMT
gonzo       99/10/30 02:24:04

  Modified:    src/share/org/apache/tomcat/core Tag: TOMCAT_J2EE_10F_102199
                        RequestDispatcherImpl.java
               src/tests/share/tests/jsp Tag: TOMCAT_J2EE_10F_102199
                        jsp.properties
               src/tests/webpages/WEB-INF/classes/request Tag:
                        TOMCAT_J2EE_10F_102199 EchoServlet.java
  Log:
  RequestDispacter.forward() will propogate and
  aggregate the associated query strings leading
  with the forward resource - j2ee
  
  	note: i still need to dive into rd.include()
  
  one of the jsp tests was failing as /jsp/error/Err.jsp
  is not available ... changed it to /jsp/error/err.jsp.
  
  removed the System.out in EchoServlet
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.2   +18 -4     jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java
  
  Index: RequestDispatcherImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- RequestDispatcherImpl.java	1999/10/23 04:20:18	1.1.2.1
  +++ RequestDispatcherImpl.java	1999/10/30 09:23:56	1.1.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java,v
1.1.2.1 1999/10/23 04:20:18 gonzo Exp $
  - * $Revision: 1.1.2.1 $
  - * $Date: 1999/10/23 04:20:18 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestDispatcherImpl.java,v
1.1.2.2 1999/10/30 09:23:56 gonzo Exp $
  + * $Revision: 1.1.2.2 $
  + * $Date: 1999/10/30 09:23:56 $
    *
    * ====================================================================
    * 
  @@ -113,9 +113,23 @@
   	ForwardedRequest fRequest =
   	    new ForwardedRequest(realRequest, urlPath);
   
  +        // join the query strings of the destination request
  +        // with the originaing request in that order.
  +
  +        String aggregatedQueryString = this.queryString;
  +
  +        if (realRequest.getQueryString() != null &&
  +            realRequest.getQueryString().trim().length() > 0) {
  +            if (aggregatedQueryString == null) {
  +                aggregatedQueryString = realRequest.getQueryString();
  +            } else {
  +                aggregatedQueryString += "&" + realRequest.getQueryString();
  +            }
  +        }
  +
           fRequest.setServletPath(this.lookupResult.getServletPath());
   	fRequest.setPathInfo(this.lookupResult.getPathInfo());
  -        fRequest.setQueryString(queryString);
  +        fRequest.setQueryString(aggregatedQueryString);
   
   	this.lookupResult.getWrapper().handleRequest(fRequest, resFacade);
       }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.3   +1 -1      jakarta-tomcat/src/tests/share/tests/jsp/Attic/jsp.properties
  
  Index: jsp.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/tests/share/tests/jsp/Attic/jsp.properties,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- jsp.properties	1999/10/27 01:26:02	1.1.2.2
  +++ jsp.properties	1999/10/30 09:24:00	1.1.2.3
  @@ -72,7 +72,7 @@
   test.15.returnCode:HTTP/1.0 500 Internal Server Error
   test.15.magnitude:true
   
  -test.16.request:GET /jsp/error/Err.jsp HTTP/1.0
  +test.16.request:GET /jsp/error/err.jsp HTTP/1.0
   test.16.golden:Err.txt
   test.16.returnCode: HTTP/1.0 200 OK
   test.16.magnitude:true
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.1.1.1.2.1 +1 -2      jakarta-tomcat/src/tests/webpages/WEB-INF/classes/request/EchoServlet.java
  
  Index: EchoServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/tests/webpages/WEB-INF/classes/request/EchoServlet.java,v
  retrieving revision 1.1.1.1
  retrieving revision 1.1.1.1.2.1
  diff -u -r1.1.1.1 -r1.1.1.1.2.1
  --- EchoServlet.java	1999/10/09 00:20:58	1.1.1.1
  +++ EchoServlet.java	1999/10/30 09:24:03	1.1.1.1.2.1
  @@ -1,4 +1,4 @@
  -/* $Id: EchoServlet.java,v 1.1.1.1 1999/10/09 00:20:58 duncan Exp $
  +/* $Id: EchoServlet.java,v 1.1.1.1.2.1 1999/10/30 09:24:03 gonzo Exp $
    *
    */
   
  @@ -32,7 +32,6 @@
                         HttpServletResponse response)
           throws IOException, ServletException
       {
  -System.out.println("EchoServletr: inside doPost()");
           doGet(request, response);
       }
       
  
  
  

Mime
View raw message