Author: remy.maucherat(a)jboss.com Date: 2009-06-06 06:19:15 -0400 (Sat, 06 Jun 2009) New Revision: 1085 Modified: trunk/java/org/apache/catalina/core/StandardContext.java trunk/java/org/apache/jasper/JspCompilationContext.java trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Log: - Oops: that shiny jar repository should be started. - Comment out the debug. - Fix URL. Modified: trunk/java/org/apache/catalina/core/StandardContext.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardContext.java 2009-06-06 00:41:19 UTC (rev 1084) +++ trunk/java/org/apache/catalina/core/StandardContext.java 2009-06-06 10:19:15 UTC (rev 1085) @@ -2304,7 +2304,7 @@ for (int i = 0; i < listeners.length; i++) { addApplicationListener(listeners[i]); } - System.out.println("Add TLD for URI: " + tagLibraryInfo.getUri() + " " + tagLibraryInfo); + //System.out.println("Add TLD for URI: " + tagLibraryInfo.getUri() + " " + tagLibraryInfo); jspTagLibraries.put(tagLibraryInfo.getUri(), tagLibraryInfo); } @@ -2316,7 +2316,7 @@ * @param tagLibrayInfo the tag library info that will be added */ public void addJspTagLibrary(String uri, TagLibraryInfo tagLibraryInfo) { - System.out.println("Add TLD for implicit URI: " + uri + " " + tagLibraryInfo); + //System.out.println("Add TLD for implicit URI: " + uri + " " + tagLibraryInfo); jspTagLibraries.put(uri, tagLibraryInfo); } @@ -4064,6 +4064,8 @@ started = true; // Start our subordinate components, if any + if ((jarRepository != null) && (jarRepository instanceof Lifecycle)) + ((Lifecycle) jarRepository).start(); if ((loader != null) && (loader instanceof Lifecycle)) ((Lifecycle) loader).start(); Modified: trunk/java/org/apache/jasper/JspCompilationContext.java =================================================================== --- trunk/java/org/apache/jasper/JspCompilationContext.java 2009-06-06 00:41:19 UTC (rev 1084) +++ trunk/java/org/apache/jasper/JspCompilationContext.java 2009-06-06 10:19:15 UTC (rev 1085) @@ -556,14 +556,7 @@ * 'exposed' in the web application. */ public String[] getTldLocation(String uri) throws JasperException { - System.out.print("Look for: " + uri + " TLDs list: "); - Iterator<String> keys = jspTagLibraries.keySet().iterator(); - while (keys.hasNext()) { - System.out.print(keys.next() + ", "); - } - System.out.println(); org.apache.catalina.deploy.jsp.TagLibraryInfo tagLibraryInfo = jspTagLibraries.get(uri); - System.out.println("Result: " + tagLibraryInfo); if (tagLibraryInfo == null) { return null; } else { @@ -577,9 +570,12 @@ return location; } /* - String[] location = - getOptions().getTldLocationsCache().getLocation(uri); - return location; + System.out.print("Look for: " + uri + " TLDs list: "); + Iterator<String> keys = jspTagLibraries.keySet().iterator(); + while (keys.hasNext()) { + System.out.print(keys.next() + ", "); + } + System.out.println(); */ } Modified: trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java =================================================================== --- trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2009-06-06 00:41:19 UTC (rev 1084) +++ trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java 2009-06-06 10:19:15 UTC (rev 1085) @@ -143,7 +143,7 @@ URL jarFileUrl = null; if (location[0].endsWith(".jar")) { try { - jarFileUrl = new URL("jar:" + location[0] + "!/"); + jarFileUrl = new URL("jar:file:" + location[0] + "!/"); } catch (MalformedURLException ex) { err.jspError("jsp.error.file.not.found", location[0]); }