tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jfarc...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper Mapper.java
Date Wed, 25 Aug 2004 19:25:46 GMT
jfarcand    2004/08/25 12:25:46

  Modified:    util/java/org/apache/tomcat/util/http/mapper Mapper.java
  Log:
  Add missing case to support the following web.xml:
  
      <servlet>
          <display-name>ServletTest</display-name>
          <servlet-name>ServletTest</servlet-name>
          <servlet-class>test.ServletTest</servlet-class>
      </servlet>
      <servlet-mapping>
          <servlet-name>ServletTest</servlet-name>
          <url-pattern>*.screen</url-pattern>
      </servlet-mapping>
      <welcome-file-list>
         <welcome-file>welcome.screen</welcome-file>
      </welcome-file-list>
  
  All Servlet TCKs passed. Please review (I recall some discussion on welcome file but can't
find those emails).
  
  Revision  Changes    Path
  1.41      +9 -0      jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java
  
  Index: Mapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/http/mapper/Mapper.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- Mapper.java	27 Jun 2004 23:56:23 -0000	1.40
  +++ Mapper.java	25 Aug 2004 19:25:46 -0000	1.41
  @@ -751,10 +751,19 @@
                               }
                           }
                       }
  +                
  +                    // Rule 4d -- Welcome resources that 
  +                    //            are mapped to an extension.
  +                    if (mappingData.wrapper == null) {
  +                        internalMapExtensionWrapper(extensionWrappers, 
  +                                                    path, mappingData);
  +                    } 
                   }
  +
                   path.setOffset(servletPath);
                   path.setEnd(pathEnd);
               }
  +                                        
           }
   
   
  
  
  

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


Mime
View raw message