Author: markt
Date: Fri Jan 17 15:46:00 2014
New Revision: 1559157
URL: http://svn.apache.org/r1559157
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56016
When loading resources for XML schema validation, take account of the
possibility that servlet-api.jar and jsp-api.jar may not be loaded by the same
class loader.
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/tc7.0.x/trunk:r1558894,1558917
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1559157&r1=1559156&r2=1559157&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Jan 17 15:46:00 2014
@@ -34,16 +34,6 @@ PATCHES ACCEPTED TO BACKPORT:
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56016
- When loading resources for XML schema validation, take account of the
- possibility that servlet-api.jar and jsp-api.jar may not be loaded by the
same
- class loader.
- Patch by Juan Carlos Estibariz.
- https://svn.apache.org/r1558894
- https://svn.apache.org/r1558917
- +1: markt, kkolinko, jboynes
- -1:
-
PATCHES/ISSUES THAT ARE STALLED:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1559157&r1=1559156&r2=1559157&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Fri Jan 17 15:46:00 2014
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletContext;
+import javax.servlet.jsp.JspContext;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.RuleSet;
@@ -93,7 +94,7 @@ public class DigesterFactory {
private static String idFor(String url) {
URL id = ServletContext.class.getResource("resources/" + url);
if (id == null) {
- id = ServletContext.class.getResource("jsp/resources/" + url);
+ id = JspContext.class.getResource("resources/" + url);
}
return id.toExternalForm();
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1559157&r1=1559156&r2=1559157&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Jan 17 15:46:00 2014
@@ -105,6 +105,12 @@
by default when a security manager is used. The block is implemented
via
a custom resolver to enable the logging of any blocked entities.
(markt)
</add>
+ <fix>
+ <bug>56016</bug>: When loading resources for XML schema validation,
take
+ account of the possibility that servlet-api.jar and jsp-api.jar may not
+ be loaded by the same class loader. Patch by Juan Carlos Estibariz.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
