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:29:51 UTC
[tomcat] branch 7.0.x updated (e99071e -> 1b37380)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from e99071e Fix URI parsing with encodedSolidusHandling="passthrough"
new 50f3929 Fix BZ 84805 Correct imports
new 1b37380 Update import rules to catch issues like BZ 64805
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: 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 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 50f39298ddbe829997368f0951c936d714650371
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 d6eeb70..d64087f 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 6cb12cf..c23ba40 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -83,6 +83,10 @@
options to enable reflection required by the memory leak prevention /
detection code. (markt)
</add>
+ <fix>
+ <bug>64805</bug>: Correct imports used by <code>JMXPorxyServlet</code>.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/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 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1b37380457c7245e44541851eea871d24d9e7272
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 c277886..3db9639 100644
--- a/res/checkstyle/org-import-control.xml
+++ b/res/checkstyle/org-import-control.xml
@@ -40,9 +40,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