costin 01/02/10 08:42:46
Modified: src/share/org/apache/tomcat/modules/config
ContextXmlReader.java
Log:
- If configFile is specified, don't override it with the default
- print the context config file that is beeing loaded
Revision Changes Path
1.3 +10 -1
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java
Index: ContextXmlReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContextXmlReader.java 2001/02/04 22:24:16 1.2
+++ ContextXmlReader.java 2001/02/10 16:42:46 1.3
@@ -101,9 +101,12 @@
public void engineInit(ContextManager cm)
throws TomcatException
{
- configFile=(String)cm.getNote("configFile");
+ if( configFile==null )
+ configFile=(String)cm.getNote("configFile");
+
XmlMapper xh=new XmlMapper();
xh.setDebug( debug );
+
// use the same tags for context-local modules
ServerXmlReader.setTagRules( xh );
ServerXmlReader.addDefaultTags(cm, xh);
@@ -127,6 +130,12 @@
for (Enumeration e = v.elements();
e.hasMoreElements() ; ) {
f = (File)e.nextElement();
+ if( f.exists() ) {
+ String s=f.getAbsolutePath();
+ if( s.startsWith( cm.getHome()))
+ s="$TOMCAT_HOME" + s.substring( cm.getHome().length());
+ log( "Context config=" + s);
+ }
ServerXmlReader.loadConfigFile(xh,f,cm);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
