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 0d493ae70ae736af7e20a2d66f2834ef07887b20
Author: Mark Thomas <ma...@apache.org>
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/mapper/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/storeconfig/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/catalina/valves/rewrite/mbeans-descriptors.xml        | 3 +++
 java/org/apache/catalina/webresources/mbeans-descriptors.xml          | 3 +++
 java/org/apache/jasper/servlet/mbeans-descriptors.xml                 | 3 +++
 java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml     | 3 +++
 java/org/apache/tomcat/util/net/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 +++
 24 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/authenticator/mbeans-descriptors.xml 
b/java/org/apache/catalina/authenticator/mbeans-descriptors.xml
index 6b448c9..bcb6601 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 976144c..0bae24c 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 404fea7..8856ef9 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 65eb3a9..059b610 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="NamingResourcesImpl"
diff --git a/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml 
b/java/org/apache/catalina/ha/authenticator/mbeans-descriptors.xml
index 72a3d97..d9034b5 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 3eb1e63..7adbfee 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 2829725..e8ec04d 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 597ea51..6791c08 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/mapper/mbeans-descriptors.xml 
b/java/org/apache/catalina/mapper/mbeans-descriptors.xml
index fc203a4..8cbc77e 100644
--- a/java/org/apache/catalina/mapper/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/mapper/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="Mapper"
diff --git a/java/org/apache/catalina/mbeans-descriptors.xml 
b/java/org/apache/catalina/mbeans-descriptors.xml
index 2dcfe27..c2584d8 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 de4b367..8af469b 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 bb7d791..a75a66d 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 c732672..f46cf0c 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 ec0e94f..3c05f8e 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/storeconfig/mbeans-descriptors.xml 
b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
index f0f402d..4a3f17f 100644
--- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/storeconfig/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="StoreConfig"
diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml 
b/java/org/apache/catalina/users/mbeans-descriptors.xml
index 550a807..32a680c 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 afacb41..2517d27 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/catalina/valves/rewrite/mbeans-descriptors.xml 
b/java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml
index 3f8150e..970a6d1 100644
--- a/java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/valves/rewrite/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="RewriteValve"
diff --git a/java/org/apache/catalina/webresources/mbeans-descriptors.xml 
b/java/org/apache/catalina/webresources/mbeans-descriptors.xml
index 95093db..5c26332 100644
--- a/java/org/apache/catalina/webresources/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/webresources/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="StandardRoot"
diff --git a/java/org/apache/jasper/servlet/mbeans-descriptors.xml 
b/java/org/apache/jasper/servlet/mbeans-descriptors.xml
index 1014420..97132ee 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/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml 
b/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml
index 0fef1f8..90dab0d 100644
--- a/java/org/apache/tomcat/util/descriptor/web/mbeans-descriptors.xml
+++ b/java/org/apache/tomcat/util/descriptor/web/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/tomcat/util/net/mbeans-descriptors.xml 
b/java/org/apache/tomcat/util/net/mbeans-descriptors.xml
index a580e36..fbff758 100644
--- a/java/org/apache/tomcat/util/net/mbeans-descriptors.xml
+++ b/java/org/apache/tomcat/util/net/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="NioEndpoint"
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 ba34d96..279a3ed 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 aa38a15..677a1b4 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: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to