Author: markt
Date: Fri May 14 20:57:34 2010
New Revision: 944462
URL: http://svn.apache.org/viewvc?rev=944462&view=rev
Log:
Better handling for public ID when validation is enabled
Modified:
tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
Modified: tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=944462&r1=944461&r2=944462&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/WebXml.java Fri May 14
20:57:34 2010
@@ -168,7 +168,6 @@ public class WebXml {
private String publicId = null;
public String getPublicId() { return publicId; }
public void setPublicId(String publicId) {
- this.publicId = publicId;
// Update major and minor version
if (publicId == null) {
// skip
@@ -178,22 +177,30 @@ public class WebXml {
equalsIgnoreCase(publicId)) {
majorVersion = 3;
minorVersion = 0;
+ this.publicId = publicId;
} else if (org.apache.catalina.startup.Constants.WebSchemaPublicId_25.
equalsIgnoreCase(publicId)) {
majorVersion = 2;
minorVersion = 5;
+ this.publicId = publicId;
} else if (org.apache.catalina.startup.Constants.WebSchemaPublicId_24.
equalsIgnoreCase(publicId)) {
majorVersion = 2;
minorVersion = 4;
+ this.publicId = publicId;
} else if (org.apache.catalina.startup.Constants.WebDtdPublicId_23.
equalsIgnoreCase(publicId)) {
majorVersion = 2;
minorVersion = 3;
+ this.publicId = publicId;
} else if (org.apache.catalina.startup.Constants.WebDtdPublicId_22.
equalsIgnoreCase(publicId)) {
majorVersion = 2;
minorVersion = 2;
+ this.publicId = publicId;
+ } else if ("datatypes".equals(publicId)) {
+ // Will occur when validation is enabled and dependencies are
+ // traced back. Ignore it.
} else {
// Unrecognised publicId
log.warn(sm.getString("webxml.unrecognisedPublicId", publicId));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
