You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/03/03 12:38:27 UTC
svn commit: r1663672 -
/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Tue Mar 3 11:38:27 2015
New Revision: 1663672
URL: http://svn.apache.org/r1663672
Log:
Clean-up. No functional change.
- Fix a Java 8 Javadoc warning.
- Improve the Javadoc.
- Format the code
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
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=1663672&r1=1663671&r2=1663672&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Mar 3 11:38:27 2015
@@ -243,29 +243,31 @@ public class ContextConfig implements Li
private WebXmlParser webXmlParser;
+
// ------------------------------------------------------------- Properties
+
/**
- * Return the location of the default deployment descriptor
+ * Obtain the location of the default deployment descriptor.
+ *
+ * @return The path to the default web.xml. If not absolute, it is relative
+ * to CATALINA_BASE.
*/
public String getDefaultWebXml() {
- if( defaultWebXml == null ) {
- defaultWebXml=Constants.DefaultWebXml;
+ if (defaultWebXml == null) {
+ defaultWebXml = Constants.DefaultWebXml;
}
-
- return (this.defaultWebXml);
-
+ return defaultWebXml;
}
/**
- * Set the location of the default deployment descriptor
+ * Set the location of the default deployment descriptor.
*
- * @param path Absolute/relative path to the default web.xml
+ * @param path The path to the default web.xml. If not absolute, it is
+ * relative to CATALINA_BASE.
*/
public void setDefaultWebXml(String path) {
-
this.defaultWebXml = path;
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org