costin 01/02/05 22:45:05
Modified: src/share/org/apache/tomcat/modules/config
ServerXmlReader.java
Log:
Fewer messages in ServerXmlReader.
If server.xml is read from TOMCAT_HOME, don't display the long path again.
Revision Changes Path
1.4 +5 -3
jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java
Index: ServerXmlReader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ServerXmlReader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServerXmlReader.java 2001/02/04 22:24:16 1.3
+++ ServerXmlReader.java 2001/02/06 06:45:05 1.4
@@ -131,13 +131,17 @@
if( f.exists() ){
cm.setNote( "configFile", f.getAbsolutePath());
loadConfigFile(xh,f,cm);
+ String s=f.getAbsolutePath();
+ if( s.startsWith( cm.getHome()))
+ s="$TOMCAT_HOME" + s.substring( cm.getHome().length());
+ log( "Config=" + s);
// load server-*.xml
/* Vector v = getUserConfigFiles(f);
for (Enumeration e = v.elements();
e.hasMoreElements() ; ) {
f = (File)e.nextElement();
loadConfigFile(xh,f,cm);
-
+ cm.log(sm.getString("tomcat.loading") + " " + f);
}
*/
}
@@ -148,14 +152,12 @@
public static void loadConfigFile(XmlMapper xh, File f, ContextManager cm)
throws TomcatException
{
- cm.log(sm.getString("tomcat.loading") + " " + f);
try {
xh.readXml(f,cm);
} catch( Exception ex ) {
cm.log( sm.getString("tomcat.fatalconfigerror"), ex );
throw new TomcatException(ex);
}
- cm.log(sm.getString("tomcat.loaded") + " " + f);
}
public static void setTagRules( XmlMapper xh ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
