This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3dabb929cf1c1be4c9363d9282c3c6191c4d663c Author: kangzhidong <kzd...@163.com> AuthorDate: Wed Aug 21 23:59:54 2019 +0800 fix typo --- java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java | 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java | 2 +- java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java | 2 +- java/org/apache/catalina/ant/jmx/package.html | 4 ++-- java/org/apache/tomcat/util/modeler/package.html | 2 +- webapps/docs/mbeans-descriptors-howto.xml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java index a538ea6..5f1bc83 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorGetTask.java @@ -35,7 +35,7 @@ import org.apache.tools.ant.BuildException; * <p> * Examples: * <br> - * Get a Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em> + * Get an Mbean IDataSender attribute nrOfRequests and create a new ant property <em>IDataSender.9025.nrOfRequests</em> * </p> * <pre> * <jmx:get diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java index c81e9d0..74f2201 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorSetTask.java @@ -37,7 +37,7 @@ import org.apache.tools.ant.BuildException; * </ul> * <p> * Examples: - * Set a Mbean Manager attribute maxActiveSessions. + * Set an Mbean Manager attribute maxActiveSessions. * Set this attribute with fresh jmx connection without save reference * </p> * <pre> diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java index 62f1728..ba1ac1e 100644 --- a/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java +++ b/java/org/apache/catalina/ant/jmx/JMXAccessorUnregisterTask.java @@ -22,7 +22,7 @@ import javax.management.ObjectName; import org.apache.tools.ant.BuildException; /** - * unregister a MBean at <em>JMX</em> JSR 160 MBeans Server. + * unregister an MBean at <em>JMX</em> JSR 160 MBeans Server. * <ul> * <li>unregister Mbeans</li> * </ul> diff --git a/java/org/apache/catalina/ant/jmx/package.html b/java/org/apache/catalina/ant/jmx/package.html index 121dfad..9277039 100644 --- a/java/org/apache/catalina/ant/jmx/package.html +++ b/java/org/apache/catalina/ant/jmx/package.html @@ -41,13 +41,13 @@ existing one. The following attribute are exists in every tasks:</p> <tr> <td>username</td> <td> - The username of a MBeanServer auth, when configured. + The username of an MBeanServer auth, when configured. </td> </tr> <tr> <td>password</td> <td> - The password of a MBeanServer auth, when configured. + The password of an MBeanServer auth, when configured. </td> </tr> <tr> diff --git a/java/org/apache/tomcat/util/modeler/package.html b/java/org/apache/tomcat/util/modeler/package.html index a64f08a..c60fb52 100644 --- a/java/org/apache/tomcat/util/modeler/package.html +++ b/java/org/apache/tomcat/util/modeler/package.html @@ -215,7 +215,7 @@ registry metadata by hand, using the <code>addManagedBean()</code> and the standard support for loading a configuration file to be convenient and sufficient.</p> -<p>Modeler will also look for a mbeans-descriptors.xml in the same package +<p>Modeler will also look for an mbeans-descriptors.xml in the same package with the class being registered and in its parent. If no metadata is found, modeler will use a number of simple patterns, similar with the ones used by ant, to determine a reasonable metadata</p> diff --git a/webapps/docs/mbeans-descriptors-howto.xml b/webapps/docs/mbeans-descriptors-howto.xml index a32e4f5..d9a7be2 100644 --- a/webapps/docs/mbeans-descriptors-howto.xml +++ b/webapps/docs/mbeans-descriptors-howto.xml @@ -49,7 +49,7 @@ in order to avoid a "ManagedBean is not found" exception.</p> <section name="Adding MBean descriptions"> <p>You may also add MBean descriptions for custom components in -a mbeans-descriptors.xml file, located in the same package as the class files +an mbeans-descriptors.xml file, located in the same package as the class files it describes.</p> <p>The permitted syntax for the mbeans-descriptors.xml is defined by --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org