costin 2003/03/20 15:33:44
Modified: catalina/src/share/org/apache/catalina/startup
ContextConfig.java
Log:
No default web.xml.
We should pack the default ( or a minimized ) web.xml in catalina.jar ( but not
in root - probably o/a/c/deploy ).
Revision Changes Path
1.22 +10 -4
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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ContextConfig.java 12 Mar 2003 21:19:26 -0000 1.21
+++ ContextConfig.java 20 Mar 2003 23:33:44 -0000 1.22
@@ -660,9 +660,15 @@
// Use getResource and getResourceAsStream
stream = getClass().getClassLoader()
.getResourceAsStream(defaultWebXml);
- source = new InputSource
- (getClass().getClassLoader()
- .getResource(defaultWebXml).toString());
+ if( stream != null ) {
+ source = new InputSource
+ (getClass().getClassLoader()
+ .getResource(defaultWebXml).toString());
+ } else {
+ log.info("No default web.xml");
+ // no default web.xml
+ return;
+ }
} else {
source =
new InputSource("file://" + file.getAbsolutePath());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
