cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet JspServletWrapper.java

[luehe]

luehe       2002/12/04 18:27:35

  Modified:    jasper2/src/share/org/apache/jasper
                        JspCompilationContext.java
               jasper2/src/share/org/apache/jasper/servlet
                        JspServletWrapper.java
  Log:
  Fix for 15002 ("Tag files in different directories not belonging to
  different tag libraries") on Windows.
  
  Revision  Changes    Path
  1.26      +4 -4      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java
  
  Index: JspCompilationContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspCompilationContext.java,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- JspCompilationContext.java        28 Nov 2002 04:18:07 -0000      1.25
  +++ JspCompilationContext.java        5 Dec 2002 02:27:35 -0000       1.26
  @@ -447,7 +447,7 @@
   
        if (isTagFile) {
            jspPath = "tags/"
  -             + tagInfo.getTagClassName().replace('.', File.separatorChar)
  +             + tagInfo.getTagClassName().replace('.', '/')
                + ".java";
        } else {
            String dirName = getJspFile();
  
  
  
  1.22      +4 -4      
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java
  
  Index: JspServletWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JspServletWrapper.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- JspServletWrapper.java    28 Nov 2002 04:18:08 -0000      1.21
  +++ JspServletWrapper.java    5 Dec 2002 02:27:35 -0000       1.22
  @@ -155,7 +155,7 @@
                                         servletContext, this, rctxt,
                                         tagFileJars);
           ctxt.createOutdir("/tags/"
  -                       + tagInfo.getTagClassName().replace('.', 
File.separatorChar));
  +                       + tagInfo.getTagClassName().replace('.', '/'));
       }
   
       public JspCompilationContext getJspEngineContext() {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>