Author: markt
Date: Mon Jul 5 21:07:32 2010
New Revision: 960701
URL: http://svn.apache.org/viewvc?rev=960701&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49551
Allow default context.xml file to be specified using an absolute path.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=960701&r1=960700&r2=960701&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Mon Jul 5
21:07:32 2010
@@ -537,7 +537,7 @@ public class ContextConfig
*/
protected void contextConfig() {
- // Open the default web.xml file, if it exists
+ // Open the default context.xml file, if it exists
if( defaultContextXml==null && context instanceof StandardContext ) {
defaultContextXml =
((StandardContext)context).getDefaultContextXml();
}
@@ -545,7 +545,10 @@ public class ContextConfig
if( defaultContextXml==null ) getDefaultContextXml();
if (!context.getOverride()) {
- File defaultContextFile = new File(getBaseDir(),
defaultContextXml);
+ File defaultContextFile = new File(defaultContextXml);
+ if (!defaultContextFile.isAbsolute()) {
+ defaultContextFile =new File(getBaseDir(), defaultContextXml);
+ }
if (defaultContextFile.exists()) {
try {
URL defaultContextUrl = defaultContextFile.toURI().toURL();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=960701&r1=960700&r2=960701&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Jul 5 21:07:32 2010
@@ -108,6 +108,10 @@
required to be used. No functional change. Patch provided by Sebb.
(markt)
</fix>
+ <fix>
+ <bug>49551</bug>: Allow default context.xml location to be specified
+ using an absolute path. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
