[jbossweb-commits] JBossWeb SVN: r954 - in trunk: java/org/apache/catalina/startup and 1 other directory.

Author: remy.maucherat(a)jboss.com Date: 2009-03-11 20:48:22 -0400 (Wed, 11 Mar 2009) New Revision: 954 Modified: trunk/PATCHES.txt trunk/java/org/apache/catalina/startup/Constants.java trunk/java/org/apache/catalina/startup/DigesterFactory.java Log: - Port patch. Small refactoring for validation. Modified: trunk/PATCHES.txt =================================================================== --- trunk/PATCHES.txt 2009-03-11 00:23:41 UTC (rev 953) +++ trunk/PATCHES.txt 2009-03-12 00:48:22 UTC (rev 954) @@ -53,4 +53,6 @@ 751502 Per context validation (incomplete, and looks a bit useless anyway) +752651 +XmlBase configuration Modified: trunk/java/org/apache/catalina/startup/Constants.java =================================================================== --- trunk/java/org/apache/catalina/startup/Constants.java 2009-03-11 00:23:41 UTC (rev 953) +++ trunk/java/org/apache/catalina/startup/Constants.java 2009-03-12 00:48:22 UTC (rev 954) @@ -83,11 +83,26 @@ public static final String J2eeSchemaResourcePath_14 = "/javax/servlet/resources/j2ee_1_4.xsd"; + public static final String JavaeeSchemaPublicId_5 = + "javaee_5.xsd"; + public static final String JavaeeSchemaResourcePath_5 = + "/javax/servlet/resources/javaee_5.xsd"; + public static final String W3cSchemaPublicId_10 = "xml.xsd"; public static final String W3cSchemaResourcePath_10 = "/javax/servlet/resources/xml.xsd"; + public static final String W3cSchemaDTDPublicId_10 = + "XMLSchema.dtd"; + public static final String W3cSchemaDTDResourcePath_10 = + "/javax/servlet/resources/XMLSchema.dtd"; + + public static final String W3cDatatypesDTDPublicId_10 = + "datatypes.dtd"; + public static final String W3cDatatypesDTDResourcePath_10 = + "/javax/servlet/resources/datatypes.dtd"; + public static final String JspSchemaPublicId_20 = "jsp_2_0.xsd"; public static final String JspSchemaResourcePath_20 = @@ -108,4 +123,14 @@ public static final String J2eeWebServiceClientSchemaResourcePath_11 = "/javax/servlet/resources/j2ee_web_services_client_1_1.xsd"; + public static final String JavaeeWebServiceSchemaPublicId_12 = + "javaee_web_services_1_2.xsd"; + public static final String JavaeeWebServiceSchemaResourcePath_12 = + "/javax/servlet/resources/javaee_web_services_1_2.xsd"; + + public static final String JavaeeWebServiceClientSchemaPublicId_12 = + "javaee_web_services_client_1_2.xsd"; + public static final String JavaeeWebServiceClientSchemaResourcePath_12 = + "/javax/servlet/resources/javaee_web_services_client_1_2.xsd"; + } Modified: trunk/java/org/apache/catalina/startup/DigesterFactory.java =================================================================== --- trunk/java/org/apache/catalina/startup/DigesterFactory.java 2009-03-11 00:23:41 UTC (rev 953) +++ trunk/java/org/apache/catalina/startup/DigesterFactory.java 2009-03-12 00:48:22 UTC (rev 954) @@ -37,12 +37,6 @@ org.jboss.logging.Logger.getLogger(DigesterFactory.class); /** - * The XML entiry resolver used by the Digester. - */ - private static SchemaResolver schemaResolver; - - - /** * Create a <code>Digester</code> parser with no <code>Rule</code> * associated and XML validation turned off. */ @@ -78,8 +72,8 @@ configureSchema(digester); } - schemaResolver = new SchemaResolver(digester); - registerLocalSchema(); + SchemaResolver schemaResolver = new SchemaResolver(digester); + registerLocalSchema(schemaResolver); digester.setEntityResolver(schemaResolver); if ( rule != null ) { @@ -94,60 +88,101 @@ * Utilities used to force the parser to use local schema, when available, * instead of the <code>schemaLocation</code> XML element. */ - protected static void registerLocalSchema(){ + protected static void registerLocalSchema(SchemaResolver schemaResolver){ // J2EE register(Constants.J2eeSchemaResourcePath_14, - Constants.J2eeSchemaPublicId_14); + Constants.J2eeSchemaPublicId_14, + schemaResolver); + + /* FIXME: Add javaee_5.xsd + register(Constants.JavaeeSchemaResourcePath_5, + Constants.JavaeeSchemaPublicId_5, + schemaResolver); + */ + // W3C register(Constants.W3cSchemaResourcePath_10, - Constants.W3cSchemaPublicId_10); + Constants.W3cSchemaPublicId_10, + schemaResolver); + + register(Constants.W3cSchemaDTDResourcePath_10, + Constants.W3cSchemaDTDPublicId_10, + schemaResolver); + + register(Constants.W3cDatatypesDTDResourcePath_10, + Constants.W3cDatatypesDTDPublicId_10, + schemaResolver); + // JSP register(Constants.JspSchemaResourcePath_20, - Constants.JspSchemaPublicId_20); + Constants.JspSchemaPublicId_20, + schemaResolver); register(Constants.JspSchemaResourcePath_21, - Constants.JspSchemaPublicId_21); + Constants.JspSchemaPublicId_21, + schemaResolver); // TLD register(Constants.TldDtdResourcePath_11, - Constants.TldDtdPublicId_11); + Constants.TldDtdPublicId_11, + schemaResolver); register(Constants.TldDtdResourcePath_12, - Constants.TldDtdPublicId_12); + Constants.TldDtdPublicId_12, + schemaResolver); register(Constants.TldSchemaResourcePath_20, - Constants.TldSchemaPublicId_20); + Constants.TldSchemaPublicId_20, + schemaResolver); register(Constants.TldSchemaResourcePath_21, - Constants.TldSchemaPublicId_21); + Constants.TldSchemaPublicId_21, + schemaResolver); // web.xml register(Constants.WebDtdResourcePath_22, - Constants.WebDtdPublicId_22); + Constants.WebDtdPublicId_22, + schemaResolver); register(Constants.WebDtdResourcePath_23, - Constants.WebDtdPublicId_23); + Constants.WebDtdPublicId_23, + schemaResolver); register(Constants.WebSchemaResourcePath_24, - Constants.WebSchemaPublicId_24); + Constants.WebSchemaPublicId_24, + schemaResolver); register(Constants.WebSchemaResourcePath_25, - Constants.WebSchemaPublicId_25); + Constants.WebSchemaPublicId_25, + schemaResolver); // Web Service register(Constants.J2eeWebServiceSchemaResourcePath_11, - Constants.J2eeWebServiceSchemaPublicId_11); + Constants.J2eeWebServiceSchemaPublicId_11, + schemaResolver); register(Constants.J2eeWebServiceClientSchemaResourcePath_11, - Constants.J2eeWebServiceClientSchemaPublicId_11); + Constants.J2eeWebServiceClientSchemaPublicId_11, + schemaResolver); + /* FIXME + register(Constants.JavaeeWebServiceSchemaResourcePath_12, + Constants.JavaeeWebServiceSchemaPublicId_12, + schemaResolver); + + register(Constants.JavaeeWebServiceClientSchemaResourcePath_12, + Constants.JavaeeWebServiceClientSchemaPublicId_12, + schemaResolver); + */ + } /** * Load the resource and add it to the resolver. */ - protected static void register(String resourceURL, String resourcePublicId){ + protected static void register(String resourceURL, String resourcePublicId, + SchemaResolver schemaResolver){ URL url = DigesterFactory.class.getResource(resourceURL); if(url == null) { @@ -163,11 +198,11 @@ */ protected static void configureSchema(Digester digester){ URL url = DigesterFactory.class - .getResource(Constants.WebSchemaResourcePath_24); + .getResource(Constants.WebSchemaResourcePath_25); if(url == null) { log.error("Could not get url for " - + Constants.WebSchemaResourcePath_24); + + Constants.WebSchemaResourcePath_25); } else { digester.setSchema(url.toString()); }