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 68ad5d3bebc51c2d453f245fb01907a5fddb273b Author: Mark Thomas <ma...@apache.org> AuthorDate: Thu Apr 21 11:51:22 2022 +0100 Additional deprecations --- conf/web.xml | 3 ++- java/org/apache/jasper/EmbeddedServletOptions.java | 3 +++ java/org/apache/jasper/JspC.java | 9 ++++++--- java/org/apache/jasper/Options.java | 3 +++ webapps/docs/jasper-howto.xml | 3 ++- 5 files changed, 16 insertions(+), 5 deletions(-) diff --git a/conf/web.xml b/conf/web.xml index a9e29eee86..9d82319ba9 100644 --- a/conf/web.xml +++ b/conf/web.xml @@ -190,7 +190,8 @@ <!-- arrays, to improve performance in some cases? --> <!-- [false] --> <!-- --> - <!-- ieClassId The class-id value to be sent to Internet --> + <!-- ieClassId Deprecated. Will be removed in Tomcat 10.1 --> + <!-- The class-id value to be sent to Internet --> <!-- Explorer when using <jsp:plugin> tags. --> <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] --> <!-- --> diff --git a/java/org/apache/jasper/EmbeddedServletOptions.java b/java/org/apache/jasper/EmbeddedServletOptions.java index 0acc7cf72b..91813aba79 100644 --- a/java/org/apache/jasper/EmbeddedServletOptions.java +++ b/java/org/apache/jasper/EmbeddedServletOptions.java @@ -321,7 +321,10 @@ public final class EmbeddedServletOptions implements Options { /** * Class ID for use in the plugin tag when the browser is IE. + * + * @deprecated Will be removed in Tomcat 10.1 */ + @Deprecated @Override public String getIeClassId() { return ieClassId; diff --git a/java/org/apache/jasper/JspC.java b/java/org/apache/jasper/JspC.java index c37680dc08..0623db9709 100644 --- a/java/org/apache/jasper/JspC.java +++ b/java/org/apache/jasper/JspC.java @@ -104,6 +104,7 @@ public class JspC extends Task implements Options { JspFactory.setDefaultFactory(new JspFactoryImpl()); } + @Deprecated public static final String DEFAULT_IE_CLASS_ID = "clsid:8AD9C840-044E-11D1-B3E9-00805F499D93"; @@ -185,6 +186,7 @@ public class JspC extends Task implements Options { protected boolean mappedFile = false; protected boolean poolingEnabled = true; protected File scratchDir; + protected String ieClassId = DEFAULT_IE_CLASS_ID; protected String targetPackage; protected String targetClassName; @@ -707,14 +709,15 @@ public class JspC extends Task implements Options { * * @param ieClassId * Class-id value + * + * @deprecated Will be removed in Tomcat 10.1 */ + @Deprecated public void setIeClassId(String ieClassId) { this.ieClassId = ieClassId; } - /** - * {@inheritDoc} - */ + @Deprecated @Override public String getIeClassId() { return ieClassId; diff --git a/java/org/apache/jasper/Options.java b/java/org/apache/jasper/Options.java index 32e59fd7a2..e50c9411a6 100644 --- a/java/org/apache/jasper/Options.java +++ b/java/org/apache/jasper/Options.java @@ -113,7 +113,10 @@ public interface Options { * Gets the class-id value that is sent to Internet Explorer when using * <jsp:plugin> tags. * @return Class-id value + * + * @deprecated Will be removed in Tomcat 10.1.x */ + @Deprecated public String getIeClassId(); /** diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml index a3ec42cef7..0a6d8ce813 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -147,7 +147,8 @@ performed in a separate JVM from Tomcat? <code>true</code> or <li><strong>genStringAsCharArray</strong> - Should text strings be generated as char arrays, to improve performance in some cases? Default <code>false</code>.</li> -<li><strong>ieClassId</strong> - The class-id value to be sent to Internet +<li><strong>ieClassId</strong> - Deprecated. Will be removed in Tomact 10.1. +The class-id value to be sent to Internet Explorer when using <jsp:plugin> tags. Default <code>clsid:8AD9C840-044E-11D1-B3E9-00805F499D93</code>.</li> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org