tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@hyperreal.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core Constants.java RequestMapper.java
Date Fri, 05 Nov 1999 00:43:29 GMT
costin      99/11/04 16:43:18

  Modified:    src/share/org/apache/tomcat/core Tag: TOMCAT_J2EE_10F_102199
                        Constants.java RequestMapper.java
  Log:
  Fix for "Redefine Jsp servlet name"
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.3   +5 -4      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.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- Constants.java	1999/11/01 02:42:18	1.2.2.2
  +++ Constants.java	1999/11/05 00:42:57	1.2.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Constants.java,v
1.2.2.2 1999/11/01 02:42:18 gonzo Exp $
  - * $Revision: 1.2.2.2 $
  - * $Date: 1999/11/01 02:42:18 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/Constants.java,v
1.2.2.3 1999/11/05 00:42:57 costin Exp $
  + * $Revision: 1.2.2.3 $
  + * $Date: 1999/11/05 00:42:57 $
    *
    * ====================================================================
    *
  @@ -172,7 +172,8 @@
   
       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 {
                   public static final String Name = "jsp_precompile";
  
  
  
  1.2.2.3   +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.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- RequestMapper.java	1999/11/01 02:42:23	1.2.2.2
  +++ RequestMapper.java	1999/11/05 00:43:02	1.2.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestMapper.java,v
1.2.2.2 1999/11/01 02:42:23 gonzo Exp $
  - * $Revision: 1.2.2.2 $
  - * $Date: 1999/11/01 02:42:23 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestMapper.java,v
1.2.2.3 1999/11/05 00:43:02 costin Exp $
  + * $Revision: 1.2.2.3 $
  + * $Date: 1999/11/05 00:43:02 $
    *
    * ====================================================================
    *
  @@ -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;
  
  
  

Mime
View raw message