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/share/org/apache/tomcat/deployment web.dtd
Date Fri, 22 Oct 1999 02:20:24 GMT
gonzo       99/10/21 19:20:23

  Modified:    src/share/org/apache/tomcat/core Tag: TOMCAT_J2EE_10F_102199
                        RequestMapper.java
               src/share/org/apache/tomcat/deployment Tag:
                        TOMCAT_J2EE_10F_102199 web.dtd
  Added:       src/etc  Tag: TOMCAT_J2EE_10F_102199 web.dtd
  Log:
  uri mapping (RequestMapper) check for null PathInfo
  - apm.
  
  added latest web.dtd from servlet 2.2/pr2 which
  has removed the redundant "role-name" element
  declaration which causes web application valiation
  parsing exceptions - j2ee.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.1   +440 -0    jakarta-tomcat/src/etc/Attic/web.dtd
  
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +7 -5      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
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- RequestMapper.java	1999/10/12 07:17:47	1.2
  +++ RequestMapper.java	1999/10/22 02:20:14	1.2.2.1
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestMapper.java,v
1.2 1999/10/12 07:17:47 gonzo Exp $
  - * $Revision: 1.2 $
  - * $Date: 1999/10/12 07:17:47 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/RequestMapper.java,v
1.2.2.1 1999/10/22 02:20:14 gonzo Exp $
  + * $Revision: 1.2.2.1 $
  + * $Date: 1999/10/22 02:20:14 $
    *
    * ====================================================================
    *
  @@ -137,9 +137,11 @@
   	    int counter = 0;
   
               while (stillSearching) {
  -                if (wrapper.getPath() != null &&
  +                if (wrapper != null &&
  +                    wrapper.getPath() != null &&
   		    wrapper.getServletClass() == null) {
  -		    wrapper = getMatch(wrapper.getPath() + pathInfo);
  +		    wrapper = getMatch(wrapper.getPath() +
  +                        (pathInfo == null ? "" : pathInfo));
   		    this.mapPath = this.servletPath;
   
                       if (stillSearching &&
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.4.2.1   +4 -13     jakarta-tomcat/src/share/org/apache/tomcat/deployment/web.dtd
  
  Index: web.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/deployment/web.dtd,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- web.dtd	1999/10/21 18:46:55	1.4
  +++ web.dtd	1999/10/22 02:20:20	1.4.2.1
  @@ -121,12 +121,12 @@
   <!ELEMENT mime-mapping (extension, mime-type)>
   
   <!-- The extension element contains a string describing an
  -extension. example: “txt” -->
  +extension. example: txt -->
   
   <!ELEMENT extension (#PCDATA)>
   
   <!-- The mime-type element contains a defined mime type. example:
  -“text/plain” -->
  +text/plain -->
   
   <!ELEMENT mime-type (#PCDATA)>
   
  @@ -296,17 +296,6 @@
   <!-- The role-name element contains the name of a role. This element
   must contain a non-empty string. -->
   
  -<!-- XXX
  -     this causes validation errors
  -<!ELEMENT role-name (#PCDATA)>
  --->
  -
  -<!-- The security-role-ref element contains the declaration of a
  -security role reference in the servlet's code. The contents of the
  -role-name element is that of the String used in the servlet code to
  -specify a role. The role-link element specifies that this coded role
  -should be linked to a role described by the security-role element -->
  -
   <!ELEMENT security-role-ref (description?, role-name, role-link)> 
   
   <!-- The role-link element is used to link a security role reference
  @@ -447,3 +436,5 @@
   <!ATTLIST home id ID #IMPLIED>
   <!ATTLIST remote id ID #IMPLIED>
   <!ATTLIST ejb-link id ID #IMPLIED>
  +
  +
  
  
  

Mime
View raw message