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 2021/06/18 16:05:07 UTC
[tomcat] 02/02: Back-port rename as newer tests depend on it
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 e7062590b39bc7cd61972c32dbaadc17c38cc790
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Jun 18 17:04:09 2021 +0100
Back-port rename as newer tests depend on it
---
test/org/apache/jasper/compiler/TestGenerator.java | 2 +-
test/webapp/WEB-INF/bugs.tld | 4 ++--
test/webapp/jsp/generator/customtag-02.jsp | 4 ++--
test/webapp/jsp/generator/try-catch-finally.jsp | 8 ++++----
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test/org/apache/jasper/compiler/TestGenerator.java b/test/org/apache/jasper/compiler/TestGenerator.java
index 4589b8a..4ce2af4 100644
--- a/test/org/apache/jasper/compiler/TestGenerator.java
+++ b/test/org/apache/jasper/compiler/TestGenerator.java
@@ -393,7 +393,7 @@ public class TestGenerator extends TomcatBaseTest {
}
}
- public static class TryCatchFinallyTag extends BodyTagSupport implements TryCatchFinally {
+ public static class TryCatchFinallyBodyTag extends BodyTagSupport implements TryCatchFinally {
private static final long serialVersionUID = 1L;
diff --git a/test/webapp/WEB-INF/bugs.tld b/test/webapp/WEB-INF/bugs.tld
index 6428e87..81d050e 100644
--- a/test/webapp/WEB-INF/bugs.tld
+++ b/test/webapp/WEB-INF/bugs.tld
@@ -85,8 +85,8 @@
<body-content>JSP</body-content>
</tag>
<tag>
- <name>TryCatchFinallyTag</name>
- <tag-class>org.apache.jasper.compiler.TestGenerator$TryCatchFinallyTag</tag-class>
+ <name>TryCatchFinallyBodyTag</name>
+ <tag-class>org.apache.jasper.compiler.TestGenerator$TryCatchFinallyBodyTag</tag-class>
<body-content>JSP</body-content>
</tag>
<tag>
diff --git a/test/webapp/jsp/generator/customtag-02.jsp b/test/webapp/jsp/generator/customtag-02.jsp
index 14e33eb..57cd254 100644
--- a/test/webapp/jsp/generator/customtag-02.jsp
+++ b/test/webapp/jsp/generator/customtag-02.jsp
@@ -16,8 +16,8 @@
--%>
<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %>
<bugs:TesterBodyTag>
- <bugs:TryCatchFinallyTag>
+ <bugs:TryCatchFinallyBodyTag>
<bugs:TesterBodyTag>
</bugs:TesterBodyTag>
- </bugs:TryCatchFinallyTag>
+ </bugs:TryCatchFinallyBodyTag>
</bugs:TesterBodyTag>
\ No newline at end of file
diff --git a/test/webapp/jsp/generator/try-catch-finally.jsp b/test/webapp/jsp/generator/try-catch-finally.jsp
index 73ac9d8..d954046 100644
--- a/test/webapp/jsp/generator/try-catch-finally.jsp
+++ b/test/webapp/jsp/generator/try-catch-finally.jsp
@@ -15,7 +15,7 @@
limitations under the License.
--%>
<%@ taglib uri="http://tomcat.apache.org/bugs" prefix="bugs" %>
-<bugs:TryCatchFinallyTag>
- <bugs:TryCatchFinallyTag>
- </bugs:TryCatchFinallyTag>
-</bugs:TryCatchFinallyTag>
+<bugs:TryCatchFinallyBodyTag>
+ <bugs:TryCatchFinallyBodyTag>
+ </bugs:TryCatchFinallyBodyTag>
+</bugs:TryCatchFinallyBodyTag>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org