Author: markt
Date: Wed Dec 18 23:03:36 2013
New Revision: 1552153
URL: http://svn.apache.org/r1552153
Log:
Better Javadoc
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Host.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Host.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Host.java?rev=1552153&r1=1552152&r2=1552153&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Host.java Wed Dec 18 23:03:36
2013
@@ -149,32 +149,44 @@ public interface Host extends Container
/**
- * Get the server.xml <host> attribute's xmlNamespaceAware.
- * @return true if namespace awarenes is enabled.
+ * Will the parsing of the web.xml file for Contexts of this Host be
+ * performed by a namespace aware parser? If <code>false</code> it may
still
+ * be enabled per Context using
+ * {@link Context#setXmlNamespaceAware(boolean)}.
*
+ * @return true if namespace awareness is enabled.
*/
public boolean getXmlNamespaceAware();
/**
- * Get the server.xml <host> attribute's xmlValidation.
- * @return true if validation is enabled.
+ * Will the parsing of the web.xml file and *.tld files for Contexts of
this
+ * Host be performed by a validating parser? If <code>false</code> it may
+ * still be enabled per Context using
+ * {@link Context#setXmlValidation(boolean)}.
*
+ * @return true if validation is enabled.
*/
public boolean getXmlValidation();
/**
- * Set the validation feature of the XML parser used when
- * parsing xml instances.
- * @param xmlValidation true to enable xml instance validation
+ * Controls whether the parsing of the web.xml file and *.tld files for
this
+ * Context will be performed by a validating parser. If <code>false</code>
+ * it may still be enabled per Context using
+ * {@link Context#setXmlValidation(boolean)}.
+ *
+ * @param xmlValidation true to enable xml validation
*/
public void setXmlValidation(boolean xmlValidation);
- /**
- * Set the namespace aware feature of the XML parser used when
- * parsing xml instances.
+ /**
+ * Controls whether the parsing of the web.xml file for Contexts of this
+ * Host will be performed by a namespace aware parser. If
<code>false</code>
+ * it may still be enabled per Context using
+ * {@link Context#setXmlNamespaceAware(boolean)}.
+ *
* @param xmlNamespaceAware true to enable namespace awareness
*/
public void setXmlNamespaceAware(boolean xmlNamespaceAware);
@@ -182,7 +194,7 @@ public interface Host extends Container
/**
* Return the regular expression that defines the files and directories in
- * the host's {@link #appBase} that will be ignored by the automatic
+ * the host's {@link #getAppBase()} that will be ignored by the automatic
* deployment process.
*/
public String getDeployIgnore();
@@ -190,15 +202,15 @@ public interface Host extends Container
/**
* Return the compiled regular expression that defines the files and
- * directories in the host's {@link #appBase} that will be ignored by the
- * automatic deployment process.
+ * directories in the host's {@link #getAppBase()} that will be ignored by
+ * the automatic deployment process.
*/
public Pattern getDeployIgnorePattern();
/**
* Set the regular expression that defines the files and directories in
- * the host's {@link #appBase} that will be ignored by the automatic
+ * the host's {@link #getAppBase()} that will be ignored by the automatic
* deployment process.
*/
public void setDeployIgnore(String deployIgnore);
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1552153&r1=1552152&r2=1552153&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardHost.java Wed
Dec 18 23:03:36 2013
@@ -448,44 +448,26 @@ public class StandardHost
}
- /**
- * Set the validation feature of the XML parser used when
- * parsing xml instances.
- * @param xmlValidation true to enable xml instance validation
- */
+
public void setXmlValidation(boolean xmlValidation){
-
this.xmlValidation = xmlValidation;
-
}
- /**
- * Get the server.xml <host> attribute's xmlValidation.
- * @return true if validation is enabled.
- *
- */
+
public boolean getXmlValidation(){
return xmlValidation;
}
- /**
- * Get the server.xml <host> attribute's xmlNamespaceAware.
- * @return true if namespace awarenes is enabled.
- *
- */
+
public boolean getXmlNamespaceAware(){
return xmlNamespaceAware;
}
- /**
- * Set the namespace aware feature of the XML parser used when
- * parsing xml instances.
- * @param xmlNamespaceAware true to enable namespace awareness
- */
public void setXmlNamespaceAware(boolean xmlNamespaceAware){
this.xmlNamespaceAware=xmlNamespaceAware;
}
+
/**
* Host work directory base.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
