Author: markt
Date: Fri Jan 24 10:24:03 2014
New Revision: 1560931
URL: http://svn.apache.org/r1560931
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56045
Copy the XML schemas used for validation that are located in jsp-api.jar to
servlet-api.jar so that an embedded Tomcat instance can start without Jasper
being available. Also enable validation to work without Jasper being available.
Modified:
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1560931&r1=1560930&r2=1560931&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Jan 24 10:24:03 2014
@@ -283,6 +283,8 @@
<include name="javax/servlet/descriptor/*" />
<include name="javax/servlet/http/*" />
<include name="javax/servlet/resources/*" />
+ <include name="javax/servlet/jsp/resources/*" />
+ <exclude name="javax/servlet/jsp/resources/jspxml*" />
</patternset>
<patternset id="files.jsp-api">
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java?rev=1560931&r1=1560930&r2=1560931&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
Fri Jan 24 10:24:03 2014
@@ -22,7 +22,6 @@ 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;
@@ -103,7 +102,7 @@ public class DigesterFactory {
private static String idFor(String url) {
URL id = ServletContext.class.getResource("resources/" + url);
if (id == null) {
- id = JspContext.class.getResource("resources/" + url);
+ id = ServletContext.class.getResource("jsp/resources/" + url);
}
return id.toExternalForm();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
