You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/06/11 01:27:55 UTC
cvs commit: jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup ContextConfig.java
craigmcc 00/06/10 16:27:54
Modified: proposals/catalina/src/share/org/apache/tomcat/startup
ContextConfig.java
Log:
The latest change to XmlMapper broke the Catalina build (not that Costin
really cares :-).
Revision Changes Path
1.12 +6 -6 jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup/ContextConfig.java
Index: ContextConfig.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup/ContextConfig.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ContextConfig.java 2000/05/20 22:13:33 1.11
+++ ContextConfig.java 2000/06/10 23:27:54 1.12
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup/ContextConfig.java,v 1.11 2000/05/20 22:13:33 craigmcc Exp $
- * $Revision: 1.11 $
- * $Date: 2000/05/20 22:13:33 $
+ * $Header: /home/cvs/jakarta-tomcat/proposals/catalina/src/share/org/apache/tomcat/startup/ContextConfig.java,v 1.12 2000/06/10 23:27:54 craigmcc Exp $
+ * $Revision: 1.12 $
+ * $Date: 2000/06/10 23:27:54 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
* of that Context, and the associated defined servlets.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.11 $ $Date: 2000/05/20 22:13:33 $
+ * @version $Revision: 1.12 $ $Date: 2000/06/10 23:27:54 $
*/
public final class ContextConfig
@@ -322,8 +322,8 @@
mapper.setValidating(true);
File resourceFile = new File(System.getProperty("catalina.home"),
Constants.WebDtdResourcePath);
- mapper.register(Constants.WebDtdPublicId,
- "file:" + resourceFile.toString());
+ mapper.registerDTDFile(Constants.WebDtdPublicId,
+ resourceFile.toString());
mapper.addRule("web-app/context-param",
mapper.methodSetter("addParameter", 2));