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 c3e33b6210 Remove the jvmRoute system property
c3e33b6210 is described below
commit c3e33b62101c5ee155808dd1932acde0cac65fe3
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 16 14:07:25 2022 +0100
Remove the jvmRoute system property
---
java/org/apache/catalina/core/StandardEngine.java | 17 ++---------------
webapps/docs/changelog.xml | 2 +-
webapps/docs/config/engine.xml | 6 ------
webapps/docs/config/systemprops.xml | 9 ---------
4 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardEngine.java
b/java/org/apache/catalina/core/StandardEngine.java
index 6aa496baa1..0206369888 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -46,10 +46,7 @@ import org.apache.juli.logging.LogFactory;
/**
* Standard implementation of the <b>Engine</b> interface. Each
* child container must be a Host implementation to process the specific
- * fully qualified host name of that virtual host. <br>
- * The jvmRoute should be set directly like any other property. Using the
- * System property <b>jvmRoute</b> is deprecated and will be removed in Tomcat
- * 10.1 onwards.
+ * fully qualified host name of that virtual host.
*
* @author Craig R. McClanahan
*/
@@ -57,31 +54,21 @@ public class StandardEngine extends ContainerBase
implements Engine {
private static final Log log = LogFactory.getLog(StandardEngine.class);
- // ----------------------------------------------------------- Constructors
+ // ----------------------------------------------------------- Constructors
/**
* Create a new StandardEngine component with the default basic Valve.
*/
public StandardEngine() {
-
- super();
pipeline.setBasic(new StandardEngineValve());
- /* Set the jmvRoute using the system property jvmRoute */
- try {
- setJvmRoute(System.getProperty("jvmRoute"));
- } catch(Exception ex) {
- log.warn(sm.getString("standardEngine.jvmRouteFail"));
- }
// By default, the engine will hold the reloading thread
backgroundProcessorDelay = 10;
-
}
// ----------------------------------------------------- Instance Variables
-
/**
* Host name to use when no server host, or an unknown host,
* is specified in the request.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 828eb99617..694eefbb79 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -133,7 +133,7 @@
(markt)
</add>
<scode>
- Deprecated the <code>jmvRoute</code> system property used to configure
a
+ Remove the <code>jmvRoute</code> system property used to configure a
default value for the <code>jmvRoute</code> attribute of an Engine.
(markt)
</scode>
diff --git a/webapps/docs/config/engine.xml b/webapps/docs/config/engine.xml
index 5dfe4dc366..054eb78baa 100644
--- a/webapps/docs/config/engine.xml
+++ b/webapps/docs/config/engine.xml
@@ -93,12 +93,6 @@
the generated session identifier, therefore allowing the front end
proxy to always forward a particular session to the same Tomcat
instance.</p>
- <p>
- Note that the <code>jvmRoute</code> can also be set using the
- deprecated <code>jvmRoute</code> system property. The
- <code>jvmRoute</code> set in an <code><Engine></code>
- attribute will override any <code>jvmRoute</code> system property.
- </p>
</attribute>
<attribute name="name" required="true">
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index d1ee6a7fce..42262b3e04 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -308,15 +308,6 @@
<code>org.apache.naming.factory.MailSessionFactory</code> is used.</p>
</property>
- <property name="jvmRoute">
- <p>Deprecated. Use the <code>jvmRoute</code> attribute of the
- <a href="engine.html">Engine</a> element. This will be removed in Tomcat
- 10.1.</p>
- <p>Provides a default value for the <code>jvmRoute</code> attribute of
the
- <a href="engine.html">Engine</a> element. It does not override the value
- configured on the <a href="engine.html">Engine</a> element.</p>
- </property>
-
<property name="catalina.config">
<p>The location from which to load the catalina.properties configuration
file. This may be an absolute URL, a relative (to the current working
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
