This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 472eb85713 Additional deprecations
472eb85713 is described below
commit 472eb85713bb6c75bae48bac8eef14317fc9e5de
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 a6859476a7..1efffd59ba 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -195,7 +195,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 7a4c8db903..9c8c662831 100644
--- a/java/org/apache/jasper/EmbeddedServletOptions.java
+++ b/java/org/apache/jasper/EmbeddedServletOptions.java
@@ -347,7 +347,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 ca6f8fb5f1..0ae9069959 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 5f8d6dab54..04fe5c1592 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 782a30ae64..0e8ecd9d29 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
