Return-Path: <costin@hyperreal.org>
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 25145 invoked by uid 2016); 3 Nov 1999 20:55:04 -0000
Delivered-To: apcore-jakarta-tomcat-cvs@apache.org
Received: (qmail 25124 invoked by uid 259); 3 Nov 1999 20:55:03 -0000
Date: 3 Nov 1999 20:55:03 -0000
Message-ID: <19991103205503.25122.qmail@hyperreal.org>
From: costin@hyperreal.org
To: jakarta-tomcat-cvs@apache.org
Subject: cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core
 Constants.java RequestMapper.java

costin      99/11/03 12:55:02

  Modified:    src/share/org/apache/jasper/runtime JspServlet.java
               src/share/org/apache/tomcat/core Constants.java
                        RequestMapper.java
  Log:
  Partial fix for "errors if jsp servlet is redefined with a different name".
  ( it works now, but JSP case is still hardcoded )
  
  Revision  Changes    Path
  1.6       +4 -3      jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java
  
  Index: JspServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JspServlet.java	1999/10/21 01:48:43	1.5
  +++ JspServlet.java	1999/11/03 20:54:57	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v 1.5 1999/10/21 01:48:43 akv Exp $
  - * $Revision: 1.5 $
  - * $Date: 1999/10/21 01:48:43 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspServlet.java,v 1.6 1999/11/03 20:54:57 costin Exp $
  + * $Revision: 1.6 $
  + * $Date: 1999/11/03 20:54:57 $
    *
    * ====================================================================
    * 
  @@ -158,6 +158,7 @@
   
                   theServlet.service(request, response);
               } catch (FileNotFoundException ex) {
  +		//		ex.printStackTrace();
                   response.sendError(HttpServletResponse.SC_NOT_FOUND, 
                                      Constants.getString("jsp.error.file.not.found", 
                                                          new Object[] {
  
  
  
  1.4       +4 -3      jakarta-tomcat/src/share/org/apache/tomcat/core/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Constants.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Constants.java	1999/11/03 20:38:49	1.3
  +++ Constants.java	1999/11/03 20:54:59	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Constants.java,v 1.3 1999/11/03 20:38:49 costin Exp $
  - * $Revision: 1.3 $
  - * $Date: 1999/11/03 20:38:49 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Constants.java,v 1.4 1999/11/03 20:54:59 costin Exp $
  + * $Revision: 1.4 $
  + * $Date: 1999/11/03 20:54:59 $
    *
    * ====================================================================
    *
  @@ -172,6 +172,7 @@
   
       public static class JSP {
   	public static final String NAME = "jsp";
  +	public static final String CLASSNAME = "org.apache.jasper.runtime.JspServlet";
   	
           public static class Directive {
               public static class Compile {
  
  
  
  1.4       +4 -4      jakarta-tomcat/src/share/org/apache/tomcat/core/RequestMapper.java
  
  Index: RequestMapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestMapper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RequestMapper.java	1999/11/03 20:38:53	1.3
  +++ RequestMapper.java	1999/11/03 20:55:00	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestMapper.java,v 1.3 1999/11/03 20:38:53 costin Exp $
  - * $Revision: 1.3 $
  - * $Date: 1999/11/03 20:38:53 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestMapper.java,v 1.4 1999/11/03 20:55:00 costin Exp $
  + * $Revision: 1.4 $
  + * $Date: 1999/11/03 20:55:00 $
    *
    * ====================================================================
    *
  @@ -286,7 +286,7 @@
               this.resourceName != null) {
               // XXX
               // hack to differentiate amongst a mapped servlet and a jsp
  -            if (! wrapper.getServletName().equals(Constants.JSP.NAME)) {
  +            if (! wrapper.getServletClass().equals(Constants.JSP.CLASSNAME)) {
                   mapPath = "/" + wrapper.getServletClass();
               } else {
                   mapPath = this.resourceName;