cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util SchemaResolver.java

2004-05-26 Thread yoavs 
yoavs   2004/05/26 09:26:16

  Modified:catalina/src/share/org/apache/catalina/util
SchemaResolver.java
  Log:
  Minor JavaDoc fixes (Bugzilla 28335)
  
  Revision  ChangesPath
  1.4   +1 -1  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/SchemaResolver.java
  
  Index: SchemaResolver.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/SchemaResolver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SchemaResolver.java   27 Feb 2004 14:58:50 -  1.3
  +++ SchemaResolver.java   26 May 2004 16:26:16 -  1.4
  @@ -61,7 +61,7 @@
   /**
* Create a new codeEntityResolver/code that will redirect
* all remote dtds and schema to a locat destination.
  - * @param schemaLocation the XML Schema used to validate xml instance.
  + * @param digester The digester instance.
*/
   public SchemaResolver(Digester digester) {
   this.digester = digester;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util SchemaResolver.java

2002-08-19 Thread patrickl 

patrickl2002/08/19 20:26:37

  Modified:catalina/src/share/org/apache/catalina/startup
Constants.java ContextConfig.java
  Added:   catalina/src/share/org/apache/catalina/util
SchemaResolver.java
  Log:
  This patch implements a new SAX's entity resolver that will re-direct any remote 
schema/dtd locally. The patch  implements a workaround for the warning problem when 
using Xerces 2.0.1. It also supports the current Xerces nightly build. I was unable to 
find a workaround for the StackOverflowException when using Xerces 2.0.2. At least we 
have one Xerces released version that work (very slow, that's why I am going to start 
adding validation switch on/off :-)).
  Submitted by: Jean-Francois Arcand ([EMAIL PROTECTED])
  
  Revision  ChangesPath
  1.5   +9 -13 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Constants.java
  
  Index: Constants.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Constants.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Constants.java10 Aug 2002 22:42:34 -  1.4
  +++ Constants.java20 Aug 2002 03:26:36 -  1.5
  @@ -83,49 +83,45 @@
   public static final String TldDtdPublicId_11 =
   -//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN;
   public static final String TldDtdResourcePath_11 =
  -//conf/tld_11.dtd;
   /javax/servlet/jsp/resources/web-jsptaglibrary_1_1.dtd;
   
   public static final String TldDtdPublicId_12 =
   -//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN;
   public static final String TldDtdResourcePath_12 =
  -//conf/tld_12.dtd;
   /javax/servlet/jsp/resources/web-jsptaglibrary_1_2.dtd;
   
   public static final String TldSchemaPublicId_20 =
  -http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd;;;
  +web-jsptaglibrary_2_0.xsd;;
   public static final String TldSchemaResourcePath_20 =
   /javax/servlet/resources/web-jsptaglibrary_2_0.xsd;
   
   public static final String WebDtdPublicId_22 =
   -//Sun Microsystems, Inc.//DTD Web Application 2.2//EN;
   public static final String WebDtdResourcePath_22 =
  -//  conf/web_22.dtd;
   /javax/servlet/resources/web-app_2_2.dtd;
   
   public static final String WebDtdPublicId_23 =
   -//Sun Microsystems, Inc.//DTD Web Application 2.3//EN;
   public static final String WebDtdResourcePath_23 =
  -//  conf/web_23.dtd;
   /javax/servlet/resources/web-app_2_3.dtd;
   
   public static final String WebSchemaPublicId_24 =
  -http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd;;;
  +web-app_2_4.xsd;;
   public static final String WebSchemaResourcePath_24 =
   /javax/servlet/resources/web-app_2_4.xsd;
   
   public static final String J2eeSchemaPublicId_14 =
  -http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd;;;
  +j2ee_1_4.xsd;;
   public static final String J2eeSchemaResourcePath_14 =
   /javax/servlet/resources/j2ee_1_4.xsd;
   
   public static final String W3cSchemaPublicId_10 =
  -http://www.w3.org/2001/xml.xsd;;;
  +xml.xsd;;
   public static final String W3cSchemaResourcePath_10 =
   /javax/servlet/resources/xml.xsd;
   
   public static final String JspSchemaPublicId_20 =
  -http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd;;;
  +jsp_2_0.xsd;;
   public static final String JspSchemaResourcePath_20 =
   /javax/servlet/resources/jsp_2_0.xsd;
   
  
  
  
  1.9   +79 -59
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- ContextConfig.java10 Aug 2002 22:42:34 -  1.8
  +++ ContextConfig.java20 Aug 2002 03:26:36 -  1.9
  @@ -124,9 +124,11 @@
   import org.apache.catalina.deploy.SecurityConstraint;
   import org.apache.catalina.loader.Extension;
   import org.apache.catalina.util.StringManager;
  +import org.apache.catalina.util.SchemaResolver;
   import org.apache.catalina.valves.ValveBase;
   import org.apache.commons.digester.Digester;
   import org.xml.sax.InputSource;
  +import org.xml.sax.EntityResolver;
   import org.xml.sax.SAXNotRecognizedException;
   import org.xml.sax.SAXNotSupportedException;
   import org.xml.sax.SAXParseException;
  @@ -275,12 +277,15 @@
   try {
   URL url =