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 2020/04/23 21:13:18 UTC
[tomcat] branch 9.0.x updated (9091fa0 -> fd81ab9)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 9091fa0 Remove implicit unboxing
new b2c2b7f pageContext is never null
new 3c4c1a0 Generics fixes for JSPs
new 228dae2 Add DTD definition to all mbean-descriptor files
new ce4622e Attributes don't have an impact attribute
new d2f9341 Order matters
new fd81ab9 Default value not supported
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../catalina/authenticator/mbeans-descriptors.xml | 3 +++
.../catalina/connector/mbeans-descriptors.xml | 3 +++
.../apache/catalina/core/mbeans-descriptors.xml | 3 +++
.../apache/catalina/deploy/mbeans-descriptors.xml | 3 +++
.../ha/authenticator/mbeans-descriptors.xml | 3 +++
.../catalina/ha/deploy/mbeans-descriptors.xml | 3 +++
.../catalina/ha/session/mbeans-descriptors.xml | 4 +--
.../apache/catalina/loader/mbeans-descriptors.xml | 3 +++
.../apache/catalina/mapper/mbeans-descriptors.xml | 3 +++
java/org/apache/catalina/mbeans-descriptors.xml | 3 +++
.../apache/catalina/mbeans/mbeans-descriptors.xml | 3 +++
.../apache/catalina/realm/mbeans-descriptors.xml | 3 +++
.../apache/catalina/session/mbeans-descriptors.xml | 3 +++
.../apache/catalina/startup/mbeans-descriptors.xml | 3 +++
.../catalina/storeconfig/mbeans-descriptors.xml | 6 +++--
.../apache/catalina/users/mbeans-descriptors.xml | 4 ++-
.../apache/catalina/valves/mbeans-descriptors.xml | 3 +++
.../catalina/valves/rewrite/mbeans-descriptors.xml | 3 +++
.../catalina/webresources/mbeans-descriptors.xml | 3 +++
java/org/apache/coyote/mbeans-descriptors.xml | 3 +++
.../apache/jasper/servlet/mbeans-descriptors.xml | 3 +++
.../util/descriptor/web/mbeans-descriptors.xml | 3 +++
.../apache/tomcat/util/net/mbeans-descriptors.xml | 3 +++
.../jdbc/pool/interceptor/mbeans-descriptors.xml | 6 ++++-
.../apache/tomcat/jdbc/pool/mbeans-descriptors.xml | 3 +++
test/webapp/WEB-INF/tags/bug49297.tag | 2 +-
test/webapp/bug49nnn/bug49297MultipleImport1.jsp | 2 +-
test/webapp/bug49nnn/bug49297MultipleImport2.jsp | 2 +-
test/webapp/jsp/pageContext1.jsp | 30 ++++++++++------------
webapps/examples/jsp/tagplugin/foreach.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 4 +--
31 files changed, 96 insertions(+), 29 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/06: Add DTD definition to all mbean-descriptor files
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 228dae2bf2a1b16dcbd8756c10e41fcb5d484a5b
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/coyote/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 +++
25 files changed, 74 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 20c068e..cf691ae 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 af61621..1c0733f 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 dcfa7f9..fae03b9 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 0991650..303d628 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/coyote/mbeans-descriptors.xml b/java/org/apache/coyote/mbeans-descriptors.xml
index a17a59b..2c1713c 100644
--- a/java/org/apache/coyote/mbeans-descriptors.xml
+++ b/java/org/apache/coyote/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="RequestGroupInfo"
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 94d2e19..0216cb1 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 05/06: Order matters
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d2f9341ed16084389e44a6ea104a44801e79cad0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 22:07:26 2020 +0100
Order matters
---
.../org/apache/tomcat/jdbc/pool/interceptor/mbeans-descriptors.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 279a3ed..4db1108 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
@@ -26,7 +26,6 @@
<attribute description="The name of the connection pool this Jmx bean is representing" name="poolName" type="java.lang.String" writeable="false"/>
<attribute description="List of all registered connections pools" name="poolNames" type="[java.lang.String;" writeable="false"/>
<attribute description="All the recorded query stats. " name="slowQueriesCD" type="[javax.management.openmbean.CompositeData;" writeable="false"/>
- <operation description="Clears all the query stats" impact="ACTION" name="resetStats" returnType="void"/>
<notification description="Notification sent out by the slow query report when a query exceeds the threshold" name="slow-query">
<notification-type>Slow query</notification-type>
@@ -35,5 +34,7 @@
<notification description="Notification sent out by the slow query report when a query fails execution" name="failed-query">
<notification-type>Failed query execution</notification-type>
</notification>
+
+ <operation description="Clears all the query stats" impact="ACTION" name="resetStats" returnType="void"/>
</mbean>
</mbeans-descriptors>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/06: Generics fixes for JSPs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 3c4c1a048147baa032ab8ec409dbbe573c59b7fb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 21:02:10 2020 +0100
Generics fixes for JSPs
---
test/webapp/WEB-INF/tags/bug49297.tag | 2 +-
test/webapp/bug49nnn/bug49297MultipleImport1.jsp | 2 +-
test/webapp/bug49nnn/bug49297MultipleImport2.jsp | 2 +-
webapps/examples/jsp/tagplugin/foreach.jsp | 2 +-
webapps/manager/WEB-INF/jsp/sessionDetail.jsp | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/webapp/WEB-INF/tags/bug49297.tag b/test/webapp/WEB-INF/tags/bug49297.tag
index f3fc275..940d968 100644
--- a/test/webapp/WEB-INF/tags/bug49297.tag
+++ b/test/webapp/WEB-INF/tags/bug49297.tag
@@ -16,6 +16,6 @@
--%><%@ tag import="java.util.List" import="java.util.ArrayList"%><%@
tag body-content="empty" %><%
// Make sure the imports above do work
- List<String> l = new ArrayList<String>();
+ List<String> l = new ArrayList<>();
l.add("OK");
%><p><%=l.get(0)%></p>
\ No newline at end of file
diff --git a/test/webapp/bug49nnn/bug49297MultipleImport1.jsp b/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
index 63c102b..01fa614 100644
--- a/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
+++ b/test/webapp/bug49nnn/bug49297MultipleImport1.jsp
@@ -20,7 +20,7 @@
<body>
<%
// Make sure the imports above do work
- List<String> l = new ArrayList<String>();
+ List<String> l = new ArrayList<>();
l.add("OK");
%>
<p><%=l.get(0)%></p>
diff --git a/test/webapp/bug49nnn/bug49297MultipleImport2.jsp b/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
index 28629a4..33b0dbd 100644
--- a/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
+++ b/test/webapp/bug49nnn/bug49297MultipleImport2.jsp
@@ -21,7 +21,7 @@
<body>
<%
// Make sure the imports above do work
- List<String> l = new ArrayList<String>();
+ List<String> l = new ArrayList<>();
l.add("OK");
%>
<p><%=l.get(0)%></p>
diff --git a/webapps/examples/jsp/tagplugin/foreach.jsp b/webapps/examples/jsp/tagplugin/foreach.jsp
index 81621cc..4803506 100644
--- a/webapps/examples/jsp/tagplugin/foreach.jsp
+++ b/webapps/examples/jsp/tagplugin/foreach.jsp
@@ -39,7 +39,7 @@
${item}
</c:forEach>
- <% Vector v = new Vector();
+ <% Vector<String> v = new Vector<>();
v.add("One"); v.add("Two"); v.add("Three"); v.add("Four");
pageContext.setAttribute("vector", v);
diff --git a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
index 3771fe3..b2482e1 100644
--- a/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
+++ b/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
@@ -119,7 +119,7 @@
<table style="text-align: left;" border="1" cellpadding="2" cellspacing="2">
<% int nAttributes = 0;
- Enumeration attributeNamesEnumeration = currentHttpSession.getAttributeNames();
+ Enumeration<String> attributeNamesEnumeration = currentHttpSession.getAttributeNames();
while (attributeNamesEnumeration.hasMoreElements()) {
attributeNamesEnumeration.nextElement();
++nAttributes;
@@ -143,7 +143,7 @@
<tbody>
<% attributeNamesEnumeration = currentHttpSession.getAttributeNames();
while (attributeNamesEnumeration.hasMoreElements()) {
- String attributeName = (String) attributeNamesEnumeration.nextElement();
+ String attributeName = attributeNamesEnumeration.nextElement();
%>
<tr>
<td align="center">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/06: pageContext is never null
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit b2c2b7f90a1629bddf09997a02e29546dd9023a1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 20:17:40 2020 +0100
pageContext is never null
---
test/webapp/jsp/pageContext1.jsp | 30 +++++++++++++-----------------
1 file changed, 13 insertions(+), 17 deletions(-)
diff --git a/test/webapp/jsp/pageContext1.jsp b/test/webapp/jsp/pageContext1.jsp
index d4bb322..1f44f97 100644
--- a/test/webapp/jsp/pageContext1.jsp
+++ b/test/webapp/jsp/pageContext1.jsp
@@ -17,23 +17,19 @@
<%@ page import="java.io.IOException" contentType="text/plain"%>
<%
boolean flush = Boolean.parseBoolean(request.getParameter("flush"));
- if (pageContext != null) {
- try {
- if (flush) {
- out.println("Flush");
- pageContext.include("/jsp/pageContext2.jsp", true);
- } else {
- pageContext.include("/jsp/pageContext2.jsp");
- }
- } catch (IOException e) {
- out.println("OK");
- return;
- } catch (Throwable t) {
- out.println("FAILED. Expected IOException, received: " + t.getClass().getName());
- return;
+ try {
+ if (flush) {
+ out.println("Flush");
+ pageContext.include("/jsp/pageContext2.jsp", true);
+ } else {
+ pageContext.include("/jsp/pageContext2.jsp");
}
- out.println("FAILED. Expected IOException.");
- } else {
- out.println("FAILED. Expected IOException.");
+ } catch (IOException e) {
+ out.println("OK");
+ return;
+ } catch (Throwable t) {
+ out.println("FAILED. Expected IOException, received: " + t.getClass().getName());
+ return;
}
+ out.println("FAILED. Expected IOException.");
%>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 06/06: Default value not supported
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fd81ab91ae52bf6a47bcc07d2264a46c14cebb8d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 22:12:38 2020 +0100
Default value not supported
---
java/org/apache/catalina/storeconfig/mbeans-descriptors.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
index 4a3f17f..06aad64 100644
--- a/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml
@@ -34,8 +34,7 @@
impact="ACTION" returnType="void" >
<parameter name="objectname"
description="Objectname from Server"
- type="java.lang.String"
- default="Catalina:type=Server"/>
+ type="java.lang.String"/>
<parameter name="backup"
description="store Context with backup"
type="boolean"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/06: Attributes don't have an impact attribute
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ce4622e1891ae9defd73d5353599c5d050d0318d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 22:05:47 2020 +0100
Attributes don't have an impact attribute
---
java/org/apache/catalina/users/mbeans-descriptors.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/java/org/apache/catalina/users/mbeans-descriptors.xml b/java/org/apache/catalina/users/mbeans-descriptors.xml
index 32a680c..ea7acfd 100644
--- a/java/org/apache/catalina/users/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/users/mbeans-descriptors.xml
@@ -52,7 +52,6 @@
<attribute name="writeable"
description="Check if user database is writeable"
- impact="INFO"
is="true"
writeable="false"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org