This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1f1877c3d888f519f0544386cebc3c3f0ca16786 Author: Mark Thomas <[email protected]> AuthorDate: Thu Apr 23 22:03:35 2020 +0100 Add DTD definition to all mbean-descriptor files The DTD is in the org.apache.tomcat.util.modeler package --- java/org/apache/catalina/authenticator/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/connector/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/core/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/deploy/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/ha/session/mbeans-descriptors.xml | 4 ++-- java/org/apache/catalina/loader/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/mbeans/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/realm/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/session/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/startup/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/users/mbeans-descriptors.xml | 3 +++ java/org/apache/catalina/valves/mbeans-descriptors.xml | 3 +++ java/org/apache/jasper/servlet/mbeans-descriptors.xml | 3 +++ .../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml | 3 +++ .../src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 3 +++ 18 files changed, 53 insertions(+), 2 deletions(-) diff --git a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml index de95ae4..cb4b4f7 100644 --- a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml +++ b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="BasicAuthenticator" diff --git a/java/org/apache/catalina/connector/mbeans-descriptors.xml b/java/org/apache/catalina/connector/mbeans-descriptors.xml index 0d89a8e..00d03b2 100644 --- a/java/org/apache/catalina/connector/mbeans-descriptors.xml +++ b/java/org/apache/catalina/connector/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <!-- This MBean contains Connector attributes and some common attributes of diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml b/java/org/apache/catalina/core/mbeans-descriptors.xml index dd9fd60..4379950 100644 --- a/java/org/apache/catalina/core/mbeans-descriptors.xml +++ b/java/org/apache/catalina/core/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="ApplicationFilterConfig" diff --git a/java/org/apache/catalina/deploy/mbeans-descriptors.xml b/java/org/apache/catalina/deploy/mbeans-descriptors.xml index 9015307..e4d76e6 100644 --- a/java/org/apache/catalina/deploy/mbeans-descriptors.xml +++ b/java/org/apache/catalina/deploy/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="ContextEnvironment" diff --git a/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml b/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml index 8b81e51..a1b1676 100644 --- a/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml +++ b/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="ClusterSingleSignOn" diff --git a/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml b/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml index 9fc61fb..0128993 100644 --- a/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml +++ b/java/org/apache/catalina/ha/deploy/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="FarmWarDeployer" diff --git a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml index bc85c13..afc1175 100644 --- a/java/org/apache/catalina/ha/session/mbeans-descriptors.xml +++ b/java/org/apache/catalina/ha/session/mbeans-descriptors.xml @@ -16,8 +16,8 @@ limitations under the License. --> <!DOCTYPE mbeans-descriptors PUBLIC -"-//Apache Software Foundation//DTD Model MBeans Configuration File" -"http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="JvmRouteBinderValve" diff --git a/java/org/apache/catalina/loader/mbeans-descriptors.xml b/java/org/apache/catalina/loader/mbeans-descriptors.xml index 2758359..997a8fb 100644 --- a/java/org/apache/catalina/loader/mbeans-descriptors.xml +++ b/java/org/apache/catalina/loader/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="WebappLoader" diff --git a/java/org/apache/catalina/mbeans-descriptors.xml b/java/org/apache/catalina/mbeans-descriptors.xml index 27ecc13..cd27816 100644 --- a/java/org/apache/catalina/mbeans-descriptors.xml +++ b/java/org/apache/catalina/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="Group" diff --git a/java/org/apache/catalina/mbeans/mbeans-descriptors.xml b/java/org/apache/catalina/mbeans/mbeans-descriptors.xml index 255e0fb..6c59c00 100644 --- a/java/org/apache/catalina/mbeans/mbeans-descriptors.xml +++ b/java/org/apache/catalina/mbeans/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="MBeanFactory" diff --git a/java/org/apache/catalina/realm/mbeans-descriptors.xml b/java/org/apache/catalina/realm/mbeans-descriptors.xml index bd36bd5..012fb30 100644 --- a/java/org/apache/catalina/realm/mbeans-descriptors.xml +++ b/java/org/apache/catalina/realm/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="DataSourceRealm" diff --git a/java/org/apache/catalina/session/mbeans-descriptors.xml b/java/org/apache/catalina/session/mbeans-descriptors.xml index 43af19c..54857ea 100644 --- a/java/org/apache/catalina/session/mbeans-descriptors.xml +++ b/java/org/apache/catalina/session/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="StandardManager" diff --git a/java/org/apache/catalina/startup/mbeans-descriptors.xml b/java/org/apache/catalina/startup/mbeans-descriptors.xml index 3e283c5..4ea2203 100644 --- a/java/org/apache/catalina/startup/mbeans-descriptors.xml +++ b/java/org/apache/catalina/startup/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="ContextConfig" diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml b/java/org/apache/catalina/users/mbeans-descriptors.xml index 46c645c..216a416 100644 --- a/java/org/apache/catalina/users/mbeans-descriptors.xml +++ b/java/org/apache/catalina/users/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="MemoryUserDatabase" className="org.apache.catalina.mbeans.MemoryUserDatabaseMBean" diff --git a/java/org/apache/catalina/valves/mbeans-descriptors.xml b/java/org/apache/catalina/valves/mbeans-descriptors.xml index cb24a5f..f4329a2 100644 --- a/java/org/apache/catalina/valves/mbeans-descriptors.xml +++ b/java/org/apache/catalina/valves/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="AccessLogValve" diff --git a/java/org/apache/jasper/servlet/mbeans-descriptors.xml b/java/org/apache/jasper/servlet/mbeans-descriptors.xml index 5c6aafc..dbfea6c 100644 --- a/java/org/apache/jasper/servlet/mbeans-descriptors.xml +++ b/java/org/apache/jasper/servlet/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="JspMonitor" diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml index aad96f3..f10978e 100644 --- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml +++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean description="Reports " domain="tomcat.jdbc" group="jdbc-pool" name="SlowQueryReportJmx" diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml index ee83e1e..f031f71 100644 --- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml +++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/mbeans-descriptors.xml @@ -15,6 +15,9 @@ See the License for the specific language governing permissions and limitations under the License. --> +<!DOCTYPE mbeans-descriptors PUBLIC + "-//Apache Software Foundation//DTD Model MBeans Configuration File" + "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";> <mbeans-descriptors> <mbean name="TomcatJDBCPool" --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
