Author: markt
Date: Fri Jan 24 21:46:16 2014
New Revision: 1561201
URL: http://svn.apache.org/r1561201
Log:
Backport r1560931 with +1 votes on dev list from markt, kkolinko and rjung
Remove the dependency between coyote and jsp-api since servlet-api now contains
the necessary schemas
Modified:
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/descriptor/DigesterFactory.java
tomcat/tc6.0.x/trunk/res/maven/coyote.pom
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1561201&r1=1561200&r2=1561201&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Fri Jan 24 21:46:16 2014
@@ -177,6 +177,8 @@
<include name="javax/servlet/*" />
<include name="javax/servlet/http/*" />
<include name="javax/servlet/resources/*" />
+ <include name="javax/servlet/jsp/resoucres/*" />
+ <exclude name="javax/servlet/jsp/resoucres/jspxml*" />
</patternset>
<patternset id="files.jsp-api">
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=1561201&r1=1561200&r2=1561201&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 24 21:46:16 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;
@@ -94,7 +93,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();
}
Modified: tomcat/tc6.0.x/trunk/res/maven/coyote.pom
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/maven/coyote.pom?rev=1561201&r1=1561200&r2=1561201&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/maven/coyote.pom (original)
+++ tomcat/tc6.0.x/trunk/res/maven/coyote.pom Fri Jan 24 21:46:16 2014
@@ -38,12 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
- <artifactId>jsp-api</artifactId>
- <version>@MAVEN.DEPLOY.VERSION@</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
<artifactId>juli</artifactId>
<version>@MAVEN.DEPLOY.VERSION@</version>
<scope>compile</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
