Author: markt
Date: Sun Feb 25 19:12:18 2007
New Revision: 511708
URL: http://svn.apache.org/viewvc?view=rev&rev=511708
Log:
Fix bug 41674. Error messages should refer to context.xml not web.xml. Port of
same fix in TC6.
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java?view=diff&rev=511708&r1=511707&r2=511708
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
Sun Feb 25 19:12:18 2007
@@ -762,8 +762,8 @@
context.addWatchedResource(file.getAbsolutePath());
}
} catch (Exception e) {
- log.error(sm.getString("contextConfig.defaultMissing")
- + " " + resourceName + " " + file , e);
+ log.error(sm.getString("contextConfig.contextMissing",
+ resourceName + " " + file), e);
}
if (source == null)
@@ -787,13 +787,15 @@
log.debug("Successfully processed context [" +
context.getName()
+ "] configuration file " + baseDir + " " +
resourceName);
} catch (SAXParseException e) {
- log.error(sm.getString("contextConfig.defaultParse"), e);
+ log.error(sm.getString("contextConfig.contextParse",
+ context.getName()), e);
log.error(sm.getString("contextConfig.defaultPosition",
"" + e.getLineNumber(),
"" + e.getColumnNumber()));
ok = false;
} catch (Exception e) {
- log.error(sm.getString("contextConfig.defaultParse"), e);
+ log.error(sm.getString("contextConfig.contextParse",
+ context.getName()), e);
ok = false;
} finally {
contextDigester.reset();
@@ -803,7 +805,7 @@
stream.close();
}
} catch (IOException e) {
- log.error(sm.getString("contextConfig.defaultClose"), e);
+ log.error(sm.getString("contextConfig.contextClose"), e);
}
}
}
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties?view=diff&rev=511708&r1=511707&r2=511708
==============================================================================
---
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
(original)
+++
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
Sun Feb 25 19:12:18 2007
@@ -11,6 +11,9 @@
contextConfig.cce=Lifecycle event data object {0} is not a Context
contextConfig.certificatesConfig.added=Added certificates -> request attribute
Valve
contextConfig.certificatesConfig.error=Exception adding CertificatesValve:
+contextConfig.contextClose=Error closing context.xml
+contextConfig.contextMissing=Missing context.xml: {0}
+contextConfig.contextParse=Parse error in context.xml for {0}
contextConfig.defaultClose=Error closing default web.xml
contextConfig.defaultConfig=Configuration error in default web.xml
contextConfig.defaultMissing=Missing default web.xml, using application
web.xml only
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=511708&r1=511707&r2=511708
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sun Feb 25 19:12:18 2007
@@ -21,6 +21,10 @@
<bug>41608</bug> Make log levels consistent when Servlet.service()
throws an exception. (markt)
</fix>
+ <fix>
+ <bug>41674</bug> Fix error messages when parsing context.xml that
+ incorrectly referred to web.xml. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
