Author: yoavs
Date: Sat Oct 15 23:46:45 2005
New Revision: 322459
URL: http://svn.apache.org/viewcvs?rev=322459&view=rev
Log:
Bugzilla 36840: http://issues.apache.org/bugzilla/show_bug.cgi?id=36840
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/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/ContextConfig.java?rev=322459&r1=322458&r2=322459&view=diff
==============================================================================
---
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
Sat Oct 15 23:46:45 2005
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2001,2004 The Apache Software Foundation.
+ * Copyright 1999-2001,2004-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -181,7 +181,10 @@
* Return the location of the default deployment descriptor
*/
public String getDefaultWebXml() {
- if( defaultWebXml == null ) defaultWebXml=Constants.DefaultWebXml;
+ if( defaultWebXml == null ) {
+ defaultWebXml=Constants.DefaultWebXml;
+ }
+
return (this.defaultWebXml);
}
@@ -203,7 +206,10 @@
* Return the location of the default context file
*/
public String getDefaultContextXml() {
- if( defaultContextXml == null )
defaultContextXml=Constants.DefaultContextXml;
+ if( defaultContextXml == null ) {
+ defaultContextXml=Constants.DefaultContextXml;
+ }
+
return (this.defaultContextXml);
}
@@ -336,7 +342,13 @@
}
webDigester.push(context);
webDigester.setErrorHandler(new ContextErrorHandler());
+
+ if(log.isDebugEnabled()) {
+ log.debug("Parsing application web.xml file at " +
url.toExternalForm());
+ }
+
webDigester.parse(is);
+
if (parseException != null) {
ok = false;
}
@@ -344,13 +356,13 @@
log.info("No web.xml, using defaults " + context );
}
} catch (SAXParseException e) {
- log.error(sm.getString("contextConfig.applicationParse"), e);
+ log.error(sm.getString("contextConfig.applicationParse",
url.toExternalForm()), e);
log.error(sm.getString("contextConfig.applicationPosition",
"" + e.getLineNumber(),
"" + e.getColumnNumber()));
ok = false;
} catch (Exception e) {
- log.error(sm.getString("contextConfig.applicationParse"), e);
+ log.error(sm.getString("contextConfig.applicationParse",
url.toExternalForm()), e);
ok = false;
} finally {
webDigester.reset();
@@ -1055,7 +1067,7 @@
// Dump the contents of this pipeline if requested
if ((log.isDebugEnabled()) && (context instanceof ContainerBase)) {
- log.debug("Pipline Configuration:");
+ log.debug("Pipeline Configuration:");
Pipeline pipeline = ((ContainerBase) context).getPipeline();
Valve valves[] = null;
if (pipeline != null)
Modified:
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties?rev=322459&r1=322458&r2=322459&view=diff
==============================================================================
---
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
Sat Oct 15 23:46:45 2005
@@ -2,7 +2,7 @@
contextConfig.applicationConfig=Configuration error in application web.xml
contextConfig.applicationListener=Exception creating listener of class {0}
contextConfig.applicationMissing=Missing application web.xml, using defaults
only
-contextConfig.applicationParse=Parse error in application web.xml
+contextConfig.applicationParse=Parse error in application web.xml file at {0}
contextConfig.applicationPosition=Occurred at line {0} column {1}
contextConfig.authenticatorConfigured=Configured an authenticator for method
{0}
contextConfig.authenticatorInstantiate=Cannot instantiate an authenticator of
class {0}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=322459&r1=322458&r2=322459&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Sat Oct 15 23:46:45 2005
@@ -14,18 +14,6 @@
<body>
-<section name="Preface">
- <p>
- This is the Changelog for Tomcat 5.5.x, which was branched based on Tomcat
5.0.27.
- For changes in Tomcat version 5.0.x, which preceded version 5.5.0, please see
- <a href="http://jakarta.apache.org/tomcat/tomcat-5.0-doc/changelog.html";>The
- Tomcat 5.0.x Changelog</a>. As maintenance releases are cut on the 5.0.x
branch,
- most fixes will be ported into a 5.5.x release and noted both here and in the
- above Changelog. However, bugs fixed in Tomcat 5.0.28 and earlier are noted
- only in the above changelog.
- </p>
-</section>
-
<section name="Tomcat 5.5.13 (yoavs)">
<subsection name="General">
<changelog>
@@ -49,6 +37,10 @@
<fix>
<bug>36802</bug>: Fix problem of double-init when JMX-deploying a
Context into a started Host. (billbarker)
+ </fix>
+ <fix>
+ <bug>36840</bug>: Provide information as to which web.xml is being
processed on startup to
+ help debug parsing errors. (yoavs)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
