Author: yoavs
Date: Thu Jun 15 11:51:57 2006
New Revision: 414654
URL: http://svn.apache.org/viewvc?rev=414654&view=rev
Log:
Bugzilla 39657: http://issues.apache.org/bugzilla/show_bug.cgi?id=39657.
Adds the same check for the JSP API that we currently do for the Servlet API,
i.e. log a warning and don't load the jar from the webapp's repository.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=414654&r1=414653&r2=414654&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Thu Jun 15 11:51:57 2006
@@ -138,7 +138,8 @@
* earlier versions.
*/
protected static final String[] triggers = {
- "javax.servlet.Servlet" // Servlet API
+ "javax.servlet.Servlet", // Servlet API
+ "javax.servlet.jsp.JspPage" // JSP API
};
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=414654&r1=414653&r2=414654&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Jun 15 11:51:57 2006
@@ -36,6 +36,10 @@
<add>
<bug>39661</bug>: Add documentation on JULI FileHandler properties.
(yoavs)
</add>
+ <add>
+ <bug>39657</bug>: Warn (and don't load jar) if JSP API is in webapp
classloader repository, as suggested by
+ David Sanchez Crespillo. (yoavs)
+ </add>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
