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/10/12 14:26:40 UTC
[tomcat] branch 9.0.x updated (26ccce6 -> 84e2f9e)
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 26ccce6 Use SVG logo for a more modern and consistent look
new ace6981 Update import rules to catch issues like BZ 64805
new 84e2f9e Fix BZ 84805 Correct imports
The 2 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:
java/org/apache/catalina/manager/JMXProxyServlet.java | 2 +-
res/checkstyle/org-import-control.xml | 4 ++--
webapps/docs/changelog.xml | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/02: Update import rules to catch issues like BZ 64805
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 ace6981c0a64d2b324cba3fc2447668b0a7d02ef
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 12 15:21:18 2020 +0100
Update import rules to catch issues like BZ 64805
https://bz.apache.org/bugzilla/show_bug.cgi?id=64805
---
res/checkstyle/org-import-control.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/res/checkstyle/org-import-control.xml b/res/checkstyle/org-import-control.xml
index 839ed8d..8938188 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -41,9 +41,9 @@
<allow pkg="javax.ejb"/>
<allow pkg="javax.persistence"/>
<allow pkg="javax.servlet"/>
+ <disallow pkg="org\.apache\.catalina\.ha.*" regex="true"/>
+ <disallow pkg="org\.apache\.catalina\.tribes.*" regex="true"/>
<allow pkg="org.apache.catalina"/>
- <disallow pkg="org.apache.catalina.ha"/>
- <disallow pkg="org.apache.catalina.tribes"/>
<allow pkg="org.apache.coyote"/>
<allow pkg="org.apache.juli"/>
<allow pkg="org.apache.naming"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/02: Fix BZ 84805 Correct imports
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 84e2f9e16459a16396be1b7709fea654f0c6d73a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 12 15:22:16 2020 +0100
Fix BZ 84805 Correct imports
https://bz.apache.org/bugzilla/show_bug.cgi?id=64805
---
java/org/apache/catalina/manager/JMXProxyServlet.java | 2 +-
webapps/docs/changelog.xml | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/manager/JMXProxyServlet.java b/java/org/apache/catalina/manager/JMXProxyServlet.java
index c54121f..10e433e 100644
--- a/java/org/apache/catalina/manager/JMXProxyServlet.java
+++ b/java/org/apache/catalina/manager/JMXProxyServlet.java
@@ -37,8 +37,8 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.catalina.mbeans.MBeanDumper;
-import org.apache.catalina.tribes.util.StringManager;
import org.apache.tomcat.util.modeler.Registry;
+import org.apache.tomcat.util.res.StringManager;
/**
* This servlet will dump JMX attributes in a simple format and implement proxy
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7b35ae9..7cc0676 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -54,6 +54,10 @@
context. This option is only useful when the Realm is defined on the
Context. (markt)
</fix>
+ <fix>
+ <bug>64805</bug>: Correct imports used by <code>JMXPorxyServlet</code>.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subseciton name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org