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 2022/06/16 18:49:39 UTC
[tomcat] branch main updated: Remove deprecated code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 9cebd8fd3f Remove deprecated code
9cebd8fd3f is described below
commit 9cebd8fd3f56f742585cf9660f06a7a61af296e1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 16 19:49:34 2022 +0100
Remove deprecated code
---
java/org/apache/catalina/core/StandardContext.java | 31 ----------------------
.../apache/catalina/core/mbeans-descriptors.xml | 4 ---
2 files changed, 35 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java
index e66b285f51..6c75f88e9c 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -6378,11 +6378,6 @@ public class StandardContext extends ContainerBase
*/
private String server = null;
- /**
- * The Java virtual machines on which this module is running.
- */
- private String[] javaVMs = null;
-
public String getServer() {
return server;
}
@@ -6391,32 +6386,6 @@ public class StandardContext extends ContainerBase
return this.server=server;
}
- /**
- * Unused.
- *
- * @return The current array.
- *
- * @deprecated Unused. Will be removed in Tomcat 10.1.
- */
- @Deprecated
- public String[] getJavaVMs() {
- return javaVMs;
- }
-
- /**
- * Unused.
- *
- * @param javaVMs The new value for the array.
- *
- * @return The new value for the array.
- *
- * @deprecated Unused. Will be removed in Tomcat 10.1.
- */
- @Deprecated
- public String[] setJavaVMs(String[] javaVMs) {
- return this.javaVMs = javaVMs;
- }
-
/**
* Gets the time this context was started.
*
diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml b/java/org/apache/catalina/core/mbeans-descriptors.xml
index c97efe1df5..8000b3d18f 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -155,10 +155,6 @@
description="Object that creates and destroys servlets, filters, and listeners. Include dependency injection and postConstruct/preDestroy handling"
type="org.apache.tomcat.InstanceManager" />
- <attribute name="javaVMs"
- description="Deprecated. Will be removed in Tomact 10.1. The Java virtual machines on which this module is running"
- type="[Ljava.lang.String;"/>
-
<attribute name="loader"
description="Associated loader."
type="org.apache.catalina.Loader" />
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org