View | Details | Raw Unified | Return to bug 59654
Collapse All | Expand All

(-)java/org/apache/jasper/compiler/TagLibraryInfoImpl.java (-2 / +7 lines)
Lines 340-348 Link Here
340 
                err.jspError("jsp.error.tld.missing_jar", uri);
 340 
                err.jspError("jsp.error.tld.missing_jar", uri);
341 
            }
 341 
            }
342 
            return new TldLocation("META-INF/taglib.tld", url.toString());
 342 
            return new TldLocation("META-INF/taglib.tld", url.toString());
343 
        } else {
 343 
        } else if (uri.startsWith("/WEB-INF/lib/")
344 
            return new TldLocation(uri);
 344 
                || uri.startsWith("/WEB-INF/classes/") ||
345 
                (uri.startsWith("/WEB-INF/tags/") && uri.endsWith(".tld")
346 
                        && !uri.endsWith("implicit.tld"))) {
347 
            err.jspError("jsp.error.tld.invalid_tld_file", uri);
345 
        }
 348 
        }
349 

            

            

              350
              
        return new TldLocation(uri);

            

        

          346
          
    }

          351
          
    }

        

        

          347
          

          352
          

        

        

          348
          
    private TagInfo createTagInfo(TreeNode elem, String jspVersion)

          353
          
    private TagInfo createTagInfo(TreeNode elem, String jspVersion)

        



(-)java/org/apache/jasper/resources/LocalStrings.properties
      (+1 lines)




  

    
      
            Lines 212-217
          
      
      
        Link Here
      
    
  

        

          212
          
jsp.error.tld.unable_to_read=Unable to read TLD \"{1}\" from JAR file \"{0}\": {2}

          212
          
jsp.error.tld.unable_to_read=Unable to read TLD \"{1}\" from JAR file \"{0}\": {2}

        

        

          213
          
jsp.error.tld.unable_to_get_jar=Unable to get JAR resource \"{0}\" containing TLD: {1}

          213
          
jsp.error.tld.unable_to_get_jar=Unable to get JAR resource \"{0}\" containing TLD: {1}

        

        

          214
          
jsp.error.tld.missing_jar=Missing JAR resource \"{0}\" containing TLD

          214
          
jsp.error.tld.missing_jar=Missing JAR resource \"{0}\" containing TLD

        

            

              
              
              215
              
jsp.error.tld.invalid_tld_file=Invalid tld file: \"{0}\", see JSP 2.2 specification section 7.3.1 for more details

            

        

          215
          
jsp.error.webxml_not_found=Could not locate web.xml

          216
          
jsp.error.webxml_not_found=Could not locate web.xml

        

        

          216
          
jsp.cmd_line.usage=Usage: jsptoservlet [-dd <path/to/outputDirectory>] [-keepgenerated] \

          217
          
jsp.cmd_line.usage=Usage: jsptoservlet [-dd <path/to/outputDirectory>] [-keepgenerated] \

        

        

          217
          
<.jsp files>

          218
          
<.jsp files>

        






  

  Return to bug 59654