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 47a0064260 Deprecate the jvmRoute system property
47a0064260 is described below
commit 47a0064260d2734d2f3f86cd6f652e5f98bdcffc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 16 14:04:31 2022 +0100
Deprecate the jvmRoute system property
---
java/org/apache/catalina/core/StandardEngine.java | 4 +++-
webapps/docs/changelog.xml | 5 +++++
webapps/docs/config/engine.xml | 6 +++---
webapps/docs/config/systemprops.xml | 3 +++
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/catalina/core/StandardEngine.java
b/java/org/apache/catalina/core/StandardEngine.java
index c29892b6bf..6aa496baa1 100644
--- a/java/org/apache/catalina/core/StandardEngine.java
+++ b/java/org/apache/catalina/core/StandardEngine.java
@@ -47,7 +47,9 @@ 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>
- * You can set the jvmRoute direct or with the System.property <b>jvmRoute</b>.
+ * 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.
*
* @author Craig R. McClanahan
*/
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1b4155f904..c6df09ead8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -127,6 +127,11 @@
using Tomcat Native 1.2.34 onwards built with OpenSSL 3.0.x onwards.
(markt)
</add>
+ <scode>
+ Deprecated the <code>jmvRoute</code> system property used to configure
a
+ default value for the <code>jmvRoute</code> attribute of an Engine.
+ (markt)
+ </scode>
</changelog>
</subsection>
<subsection name="Jasper">
diff --git a/webapps/docs/config/engine.xml b/webapps/docs/config/engine.xml
index ff4fbcdc74..5dfe4dc366 100644
--- a/webapps/docs/config/engine.xml
+++ b/webapps/docs/config/engine.xml
@@ -95,9 +95,9 @@
instance.</p>
<p>
Note that the <code>jvmRoute</code> can also be set using the
- <code>jvmRoute</code> system property. The <code>jvmRoute</code>
- set in an <code><Engine></code> attribute will override
- any <code>jvmRoute</code> system property.
+ 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>
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index fa3be6f2dd..9276cf4845 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -332,6 +332,9 @@
</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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
