diff --git a/VERSION.txt b/VERSION.txt index 452b6627bcf..13eb11a0383 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -2,6 +2,7 @@ jetty-7.2.2-SNAPSHOT + 330210 Improve performance of writing large bytes arrays + 330208 Support new wording on servlet-mapping and filter-mapping merging from servlet3.0a + 330188 Reject web-fragment.xml with same as another already loaded one + + 330229 Jetty tries to parse META-INF/*.tld when jsp-api is not on classpath, causing DTD entity resoluton to fail jetty-7.2.1.v20101111 11 November 2010 + 324679 Fixed dedection of write before static content diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java index 69bbcc9cfac..63e61942ac3 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/TagLibConfiguration.java @@ -220,6 +220,16 @@ public class TagLibConfiguration extends AbstractConfiguration @Override public void preConfigure(WebAppContext context) throws Exception { + try + { + Class jsp_page = Loader.loadClass(WebXmlConfiguration.class,"javax.servlet.jsp.JspPage"); + } + catch (Exception e) + { + //no jsp available, don't parse TLDs + return; + } + Set tlds = new HashSet(); // Find tld's from web.xml @@ -297,7 +307,8 @@ public class TagLibConfiguration extends AbstractConfiguration { if (_processor == null) { - Log.warn("No TldProcessor configured, skipping tld processing"); + if (Log.isDebugEnabled()) + Log.debug("No TldProcessor configured, skipping tld processing"); return; }