[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
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" />
-
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Deprecated unused attribute.
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 2111776ac8 Deprecated unused attribute.
2111776ac8 is described below
commit 2111776ac8e9f904afef24afa9f642d683e5b218
Author: Mark Thomas
AuthorDate: Thu Jun 16 19:48:10 2022 +0100
Deprecated unused attribute.
---
java/org/apache/catalina/core/StandardContext.java | 18 ++
java/org/apache/catalina/core/mbeans-descriptors.xml | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index afe45f22e9..bb15fa9d81 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -6458,10 +6458,28 @@ 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;
}
diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml
b/java/org/apache/catalina/core/mbeans-descriptors.xml
index b329a0331a..7a820432a6 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -156,7 +156,7 @@
type="org.apache.tomcat.InstanceManager" />
[tomcat] branch 10.0.x updated: Deprecated unused attribute.
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 e10494fdc4 Deprecated unused attribute.
e10494fdc4 is described below
commit e10494fdc4f4d2d359d534a302184b5a19767013
Author: Mark Thomas
AuthorDate: Thu Jun 16 19:48:10 2022 +0100
Deprecated unused attribute.
---
java/org/apache/catalina/core/StandardContext.java | 18 ++
java/org/apache/catalina/core/mbeans-descriptors.xml | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index a12ed93e98..fa429303c0 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -6407,10 +6407,28 @@ 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;
}
diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml
b/java/org/apache/catalina/core/mbeans-descriptors.xml
index 6fa6a85a02..77f642664f 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -156,7 +156,7 @@
type="org.apache.tomcat.InstanceManager" />
[tomcat] branch main updated: Deprecated unused attribute.
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 4547ab2d9d Deprecated unused attribute.
4547ab2d9d is described below
commit 4547ab2d9d99de8119232bf2d55801ac8cb92ed9
Author: Mark Thomas
AuthorDate: Thu Jun 16 19:48:10 2022 +0100
Deprecated unused attribute.
---
java/org/apache/catalina/core/StandardContext.java | 18 ++
java/org/apache/catalina/core/mbeans-descriptors.xml | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index f5e7fb5c72..e66b285f51 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -6391,10 +6391,28 @@ 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;
}
diff --git a/java/org/apache/catalina/core/mbeans-descriptors.xml
b/java/org/apache/catalina/core/mbeans-descriptors.xml
index a86207780f..c97efe1df5 100644
--- a/java/org/apache/catalina/core/mbeans-descriptors.xml
+++ b/java/org/apache/catalina/core/mbeans-descriptors.xml
@@ -156,7 +156,7 @@
type="org.apache.tomcat.InstanceManager" />
[tomcat] branch main updated: Reviewed remaining system properties
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 581665b29b Reviewed remaining system properties 581665b29b is described below commit 581665b29b794dfaa8a2a55dc9ef3acef2b6c1fd Author: Mark Thomas AuthorDate: Thu Jun 16 19:35:04 2022 +0100 Reviewed remaining system properties --- TOMCAT-NEXT.txt | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt index 05d471759f..fc80b54e2b 100644 --- a/TOMCAT-NEXT.txt +++ b/TOMCAT-NEXT.txt @@ -19,10 +19,7 @@ Notes of things to consider for the next major Tomcat release (10.1.x) Items carried over from the 9.0.x list: - 1. Remove the use of system properties to control configuration wherever -possible. - - 2. Reduce instances of setters and getters for the same property existing on an + 1. Reduce instances of setters and getters for the same property existing on an object and its parent. This may require new objects to be exposed via JMX. Deferred until 10.1.x: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] funkman commented on pull request #524: Dir redirect use301
funkman commented on PR #524: URL: https://github.com/apache/tomcat/pull/524#issuecomment-1157999153 Merge latest apache/main in. Then additionally renamed parameter so it is transformed to an int and restricted it to 302 302 307 308 Did find one gap that I'm not sure if its worth fixing. There is a sendRedirect in CoyoteAdapter (which defaults to 302) when the mapper detects a context. For example `/docs` will 302 to `/docs/` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Deprecate code that will be removed in Tomcat 10.1
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
The following commit(s) were added to refs/heads/9.0.x by this push:
new 0c472e8089 Deprecate code that will be removed in Tomcat 10.1
0c472e8089 is described below
commit 0c472e80896be83fd7dc228bdd9b36b2be7398b4
Author: Mark Thomas
AuthorDate: Thu Jun 16 14:35:20 2022 +0100
Deprecate code that will be removed in Tomcat 10.1
As of WebSocket 2.1, the deployment restriction described in section 6.4
of the Jakarta WebSocket specification is removed so these settings will
no longer be required.
---
java/org/apache/tomcat/websocket/Constants.java| 7 +++
java/org/apache/tomcat/websocket/server/Constants.java | 9 +
java/org/apache/tomcat/websocket/server/WsServerContainer.java | 5 -
webapps/docs/config/systemprops.xml| 2 ++
4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/Constants.java
b/java/org/apache/tomcat/websocket/Constants.java
index 466a541611..8c1982bc64 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -139,6 +139,13 @@ public class Constants {
static final boolean ALLOW_UNSUPPORTED_EXTENSIONS =
Boolean.getBoolean("org.apache.tomcat.websocket.ALLOW_UNSUPPORTED_EXTENSIONS");
+/**
+ * WebSocket specification compliance flag.
+ *
+ * @deprecated This is no longer required in Jakarta EE 10 onwards and
will
+ * be removed in Tomcat 10.1.
+ */
+@Deprecated
public static final boolean STRICT_SPEC_COMPLIANCE =
Boolean.getBoolean("org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE");
diff --git a/java/org/apache/tomcat/websocket/server/Constants.java
b/java/org/apache/tomcat/websocket/server/Constants.java
index 876f1b8074..de5041a527 100644
--- a/java/org/apache/tomcat/websocket/server/Constants.java
+++ b/java/org/apache/tomcat/websocket/server/Constants.java
@@ -25,6 +25,15 @@ public class Constants {
"org.apache.tomcat.websocket.binaryBufferSize";
public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.textBufferSize";
+
+/**
+ * Allows the deployment restriction defined in section 6.4 of the Jakarta
+ * WebSocket specification to be ignored.
+ *
+ * @deprecated This is no longer required in Jakarta EE 10 onwards and
will
+ * be removed in Tomcat 10.1.
+ */
+@Deprecated
public static final String
ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.noAddAfterHandshake";
diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index 74815a7fe7..c5336d6d57 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -73,6 +73,7 @@ public class WsServerContainer extends WsWebSocketContainer
private final Map configExactMatchMap = new
ConcurrentHashMap<>();
private final Map>
configTemplateMatchMap =
new ConcurrentHashMap<>();
+@SuppressWarnings("deprecation")
private volatile boolean enforceNoAddAfterHandshake =
org.apache.tomcat.websocket.Constants.STRICT_SPEC_COMPLIANCE;
private volatile boolean addAllowed = true;
@@ -80,6 +81,7 @@ public class WsServerContainer extends WsWebSocketContainer
private volatile boolean endpointsRegistered = false;
private volatile boolean deploymentFailed = false;
+@SuppressWarnings("deprecation")
WsServerContainer(ServletContext servletContext) {
this.servletContext = servletContext;
@@ -419,12 +421,13 @@ public class WsServerContainer extends
WsWebSocketContainer
}
-
+@Deprecated
public boolean isEnforceNoAddAfterHandshake() {
return enforceNoAddAfterHandshake;
}
+@Deprecated
public void setEnforceNoAddAfterHandshake(
boolean enforceNoAddAfterHandshake) {
this.enforceNoAddAfterHandshake = enforceNoAddAfterHandshake;
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index d5463c4e41..42e83ac600 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -366,6 +366,8 @@
org.apache.tomcat.websocket.server#isEnforceNoAddAfterHandshake
(default changes from false to true)
+ This system property is deprecated and will be removed in Tomcat
+ 10.1.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail:
[tomcat] branch 10.0.x updated: Deprecate code that will be removed in Tomcat 10.1
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 d5139d4e96 Deprecate code that will be removed in Tomcat 10.1
d5139d4e96 is described below
commit d5139d4e96d226c35d1c0fa0acf55b800d64b631
Author: Mark Thomas
AuthorDate: Thu Jun 16 14:35:20 2022 +0100
Deprecate code that will be removed in Tomcat 10.1
As of WebSocket 2.1, the deployment restriction described in section 6.4
of the Jakarta WebSocket specification is removed so these settings will
no longer be required.
---
java/org/apache/tomcat/websocket/Constants.java| 7 +++
java/org/apache/tomcat/websocket/server/Constants.java | 9 +
java/org/apache/tomcat/websocket/server/WsServerContainer.java | 5 -
webapps/docs/config/systemprops.xml| 2 ++
4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/Constants.java
b/java/org/apache/tomcat/websocket/Constants.java
index 5e1d1242ae..682fff4b9b 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -139,6 +139,13 @@ public class Constants {
static final boolean ALLOW_UNSUPPORTED_EXTENSIONS =
Boolean.getBoolean("org.apache.tomcat.websocket.ALLOW_UNSUPPORTED_EXTENSIONS");
+/**
+ * WebSocket specification compliance flag.
+ *
+ * @deprecated This is no longer required in Jakarta EE 10 onwards and
will
+ * be removed in Tomcat 10.1.
+ */
+@Deprecated
public static final boolean STRICT_SPEC_COMPLIANCE =
Boolean.getBoolean("org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE");
diff --git a/java/org/apache/tomcat/websocket/server/Constants.java
b/java/org/apache/tomcat/websocket/server/Constants.java
index 16768617d8..e900a540a9 100644
--- a/java/org/apache/tomcat/websocket/server/Constants.java
+++ b/java/org/apache/tomcat/websocket/server/Constants.java
@@ -25,6 +25,15 @@ public class Constants {
"org.apache.tomcat.websocket.binaryBufferSize";
public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.textBufferSize";
+
+/**
+ * Allows the deployment restriction defined in section 6.4 of the Jakarta
+ * WebSocket specification to be ignored.
+ *
+ * @deprecated This is no longer required in Jakarta EE 10 onwards and
will
+ * be removed in Tomcat 10.1.
+ */
+@Deprecated
public static final String
ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.noAddAfterHandshake";
diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index e28846796d..6d2171989a 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -74,6 +74,7 @@ public class WsServerContainer extends WsWebSocketContainer
private final Map configExactMatchMap = new
ConcurrentHashMap<>();
private final Map>
configTemplateMatchMap =
new ConcurrentHashMap<>();
+@SuppressWarnings("deprecation")
private volatile boolean enforceNoAddAfterHandshake =
org.apache.tomcat.websocket.Constants.STRICT_SPEC_COMPLIANCE;
private volatile boolean addAllowed = true;
@@ -81,6 +82,7 @@ public class WsServerContainer extends WsWebSocketContainer
private volatile boolean endpointsRegistered = false;
private volatile boolean deploymentFailed = false;
+@SuppressWarnings("deprecation")
WsServerContainer(ServletContext servletContext) {
this.servletContext = servletContext;
@@ -420,12 +422,13 @@ public class WsServerContainer extends
WsWebSocketContainer
}
-
+@Deprecated
public boolean isEnforceNoAddAfterHandshake() {
return enforceNoAddAfterHandshake;
}
+@Deprecated
public void setEnforceNoAddAfterHandshake(
boolean enforceNoAddAfterHandshake) {
this.enforceNoAddAfterHandshake = enforceNoAddAfterHandshake;
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index 9276cf4845..bf637353ab 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -148,6 +148,8 @@
org.apache.tomcat.websocket.server.WsServerContainer#isEnforceNoAddAfterHandshake
+ This system property is deprecated and will be removed in Tomcat
+ 10.1.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail:
[tomcat] 02/02: The limit on endpoint registration was removed in WebSocket 2.1
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
commit 3bfd1044d5cf8689f16e416de12af76a8ffcdd74
Author: Mark Thomas
AuthorDate: Thu Jun 16 18:24:06 2022 +0100
The limit on endpoint registration was removed in WebSocket 2.1
---
java/org/apache/tomcat/websocket/Constants.java| 10 ---
.../apache/tomcat/websocket/server/Constants.java | 11 ---
.../websocket/server/LocalStrings.properties | 1 -
.../websocket/server/LocalStrings_fr.properties| 1 -
.../websocket/server/LocalStrings_ja.properties| 1 -
.../websocket/server/LocalStrings_ko.properties| 1 -
.../websocket/server/LocalStrings_zh_CN.properties | 1 -
.../tomcat/websocket/server/WsServerContainer.java | 34 --
webapps/docs/changelog.xml | 9 ++
webapps/docs/config/systemprops.xml| 11 ---
webapps/docs/web-socket-howto.xml | 10 ---
11 files changed, 9 insertions(+), 81 deletions(-)
diff --git a/java/org/apache/tomcat/websocket/Constants.java
b/java/org/apache/tomcat/websocket/Constants.java
index 73503186e4..e8b0ffaf1b 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -140,16 +140,6 @@ public class Constants {
public static final String WS_AUTHENTICATION_USER_NAME =
"org.apache.tomcat.websocket.WS_AUTHENTICATION_USER_NAME";
public static final String WS_AUTHENTICATION_PASSWORD =
"org.apache.tomcat.websocket.WS_AUTHENTICATION_PASSWORD";
-/**
- * WebSocket specification compliance flag.
- *
- * @deprecated This is no longer required in Jakarta EE 10 onwards and
will
- * be removed in Tomcat 10.1.
- */
-@Deprecated
-public static final boolean STRICT_SPEC_COMPLIANCE =
-
Boolean.getBoolean("org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE");
-
public static final List INSTALLED_EXTENSIONS;
static {
diff --git a/java/org/apache/tomcat/websocket/server/Constants.java
b/java/org/apache/tomcat/websocket/server/Constants.java
index e900a540a9..d30c880af0 100644
--- a/java/org/apache/tomcat/websocket/server/Constants.java
+++ b/java/org/apache/tomcat/websocket/server/Constants.java
@@ -26,17 +26,6 @@ public class Constants {
public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.textBufferSize";
-/**
- * Allows the deployment restriction defined in section 6.4 of the Jakarta
- * WebSocket specification to be ignored.
- *
- * @deprecated This is no longer required in Jakarta EE 10 onwards and
will
- * be removed in Tomcat 10.1.
- */
-@Deprecated
-public static final String
ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM =
-"org.apache.tomcat.websocket.noAddAfterHandshake";
-
public static final String SERVER_CONTAINER_SERVLET_CONTEXT_ATTRIBUTE =
"jakarta.websocket.server.ServerContainer";
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings.properties
b/java/org/apache/tomcat/websocket/server/LocalStrings.properties
index 0b6dfb1277..063b2c8ad4 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings.properties
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-serverContainer.addNotAllowed=No further Endpoints may be registered once an
attempt has been made to use one of the previously registered endpoints
serverContainer.configuratorFail=Failed to create configurator of type [{0}]
for POJO of type [{1}]
serverContainer.duplicatePaths=Multiple Endpoints may not be deployed to the
same path [{0}] : existing endpoint was [{1}] and new endpoint is [{2}]
serverContainer.encoderFail=Unable to create encoder of type [{0}]
diff --git a/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
b/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
index 872dd7c855..ee86986ba8 100644
--- a/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/server/LocalStrings_fr.properties
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-serverContainer.addNotAllowed=Aucune terminaison ne peut être enregistré une
fois qu'une tentative d'utilisation d'une des terminaisons précédemment
enregistrée a été faite
serverContainer.configuratorFail=Echec de création du configurateur de type
[{0}] pour le POJO de type [{1}]
serverContainer.duplicatePaths=Plusieurs terminaisons ne peuvent pas être
déployés vers le même chemin [{0}] : la terminaison existante était [{1}] et la
nouvelle est [{2}]
[tomcat] 01/02: Deprecate code that will be removed in Tomcat 10.1
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
commit f528b957e1c3460c8c1b3ab9930109e7eb20c70c
Author: Mark Thomas
AuthorDate: Thu Jun 16 14:35:20 2022 +0100
Deprecate code that will be removed in Tomcat 10.1
As of WebSocket 2.1, the deployment restriction described in section 6.4
of the Jakarta WebSocket specification is removed so these settings will
no longer be required.
---
java/org/apache/tomcat/websocket/Constants.java| 7 +++
java/org/apache/tomcat/websocket/server/Constants.java | 9 +
java/org/apache/tomcat/websocket/server/WsServerContainer.java | 4 +++-
webapps/docs/config/systemprops.xml| 2 ++
4 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/websocket/Constants.java
b/java/org/apache/tomcat/websocket/Constants.java
index 85a60347b4..73503186e4 100644
--- a/java/org/apache/tomcat/websocket/Constants.java
+++ b/java/org/apache/tomcat/websocket/Constants.java
@@ -140,6 +140,13 @@ public class Constants {
public static final String WS_AUTHENTICATION_USER_NAME =
"org.apache.tomcat.websocket.WS_AUTHENTICATION_USER_NAME";
public static final String WS_AUTHENTICATION_PASSWORD =
"org.apache.tomcat.websocket.WS_AUTHENTICATION_PASSWORD";
+/**
+ * WebSocket specification compliance flag.
+ *
+ * @deprecated This is no longer required in Jakarta EE 10 onwards and
will
+ * be removed in Tomcat 10.1.
+ */
+@Deprecated
public static final boolean STRICT_SPEC_COMPLIANCE =
Boolean.getBoolean("org.apache.tomcat.websocket.STRICT_SPEC_COMPLIANCE");
diff --git a/java/org/apache/tomcat/websocket/server/Constants.java
b/java/org/apache/tomcat/websocket/server/Constants.java
index 16768617d8..e900a540a9 100644
--- a/java/org/apache/tomcat/websocket/server/Constants.java
+++ b/java/org/apache/tomcat/websocket/server/Constants.java
@@ -25,6 +25,15 @@ public class Constants {
"org.apache.tomcat.websocket.binaryBufferSize";
public static final String TEXT_BUFFER_SIZE_SERVLET_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.textBufferSize";
+
+/**
+ * Allows the deployment restriction defined in section 6.4 of the Jakarta
+ * WebSocket specification to be ignored.
+ *
+ * @deprecated This is no longer required in Jakarta EE 10 onwards and
will
+ * be removed in Tomcat 10.1.
+ */
+@Deprecated
public static final String
ENFORCE_NO_ADD_AFTER_HANDSHAKE_CONTEXT_INIT_PARAM =
"org.apache.tomcat.websocket.noAddAfterHandshake";
diff --git a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
index 0a29137557..5fa9d3c675 100644
--- a/java/org/apache/tomcat/websocket/server/WsServerContainer.java
+++ b/java/org/apache/tomcat/websocket/server/WsServerContainer.java
@@ -74,6 +74,7 @@ public class WsServerContainer extends WsWebSocketContainer
private final Map configExactMatchMap = new
ConcurrentHashMap<>();
private final Map>
configTemplateMatchMap =
new ConcurrentHashMap<>();
+@SuppressWarnings("deprecation")
private volatile boolean enforceNoAddAfterHandshake =
org.apache.tomcat.websocket.Constants.STRICT_SPEC_COMPLIANCE;
private volatile boolean addAllowed = true;
@@ -363,12 +364,13 @@ public class WsServerContainer extends
WsWebSocketContainer
}
-
+@Deprecated
public boolean isEnforceNoAddAfterHandshake() {
return enforceNoAddAfterHandshake;
}
+@Deprecated
public void setEnforceNoAddAfterHandshake(
boolean enforceNoAddAfterHandshake) {
this.enforceNoAddAfterHandshake = enforceNoAddAfterHandshake;
diff --git a/webapps/docs/config/systemprops.xml
b/webapps/docs/config/systemprops.xml
index 42262b3e04..a555cd109a 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -147,6 +147,8 @@
org.apache.tomcat.websocket.server.WsServerContainer#isEnforceNoAddAfterHandshake
+ This system property is deprecated and will be removed in Tomcat
+ 10.1.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated (e6a3fd58f4 -> 3bfd1044d5)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from e6a3fd58f4 Update Java 17 Panama module to OpenSSL 3.0 new f528b957e1 Deprecate code that will be removed in Tomcat 10.1 new 3bfd1044d5 The limit on endpoint registration was removed in WebSocket 2.1 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: java/org/apache/tomcat/websocket/Constants.java| 3 -- .../apache/tomcat/websocket/server/Constants.java | 2 -- .../websocket/server/LocalStrings.properties | 1 - .../websocket/server/LocalStrings_fr.properties| 1 - .../websocket/server/LocalStrings_ja.properties| 1 - .../websocket/server/LocalStrings_ko.properties| 1 - .../websocket/server/LocalStrings_zh_CN.properties | 1 - .../tomcat/websocket/server/WsServerContainer.java | 32 -- webapps/docs/changelog.xml | 9 ++ webapps/docs/config/systemprops.xml| 9 -- webapps/docs/web-socket-howto.xml | 10 --- 11 files changed, 9 insertions(+), 61 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Deprecate the jvmRoute system property
On 16/06/2022 16:23, Christopher Schultz wrote:
Mark,
On 6/16/22 09:04, ma...@apache.org wrote:
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 3b76da87e3 Deprecate the jvmRoute system property
3b76da87e3 is described below
commit 3b76da87e355fc4b637cd1ea57c2e651b9075b5f
Author: Mark Thomas
AuthorDate: Thu Jun 16 14:04:31 2022 +0100
Deprecate the jvmRoute system property
Just checking: this is only removing the automatic fall-back to the
"jvmRoute" system property when none is specified in the jvmRoute
attribute, right?
Correct.
Anyone who wants to restore the essence of the previous behavior just
needs to:
jvmRoute="${jvmRoute}"
and that's that?
Also correct. To be safe, I checked this works and it does.
For background, I am working through TOMCAT-NEXT.txt and removing
unnecessary configuration via system properties is one of the items on
the list.
We won't be able to get rid of all of them and Rémy fixed a bunch of
them a while back. I'm just cleaning up a few odds and ends.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] funkman commented on pull request #524: Dir redirect use301
funkman commented on PR #524: URL: https://github.com/apache/tomcat/pull/524#issuecomment-1157813163 yeah - I'll redo this as an int option instead. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62611] Compress log files after rotation
https://bz.apache.org/bugzilla/show_bug.cgi?id=62611 --- Comment #10 from Christopher Schultz --- The quality of this patch/PR is low. Several unresolved comments have been made on the PR already. There isn't any proper resource-management. The CompressFileUtils class appears to be added twice under two separate packages (why the duplication?). I have to ask again why this is being added as a feature of the AccessLogValve and not just sending access logs to a proper logging framework which already supports compression, rotation, etc.? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch main updated: Deprecate the jvmRoute system property
Mark,
On 6/16/22 09:04, ma...@apache.org wrote:
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 3b76da87e3 Deprecate the jvmRoute system property
3b76da87e3 is described below
commit 3b76da87e355fc4b637cd1ea57c2e651b9075b5f
Author: Mark Thomas
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 Engine interface. Each
* child container must be a Host implementation to process the specific
* fully qualified host name of that virtual host.
- * You can set the jvmRoute direct or with the System.property jvmRoute.
+ * The jvmRoute should be set directly like any other property. Using the
+ * System property jvmRoute 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 2c609b519e..828eb99617 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -132,6 +132,11 @@
using Tomcat Native 1.2.34 onwards built with OpenSSL 3.0.x onwards.
(markt)
+
+Deprecated the jmvRoute system property used to configure
a
+default value for the jmvRoute attribute of an Engine.
+(markt)
+
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.
Note that the jvmRoute can also be set using the
-jvmRoute system property. The jvmRoute
-set in an Engine attribute will override
-any jvmRoute system property.
+deprecated jvmRoute system property. The
+jvmRoute set in an Engine
+attribute will override any jvmRoute system property.
diff --git a/webapps/docs/config/systemprops.xml b/webapps/docs/config/systemprops.xml
index bdb77bc721..d1ee6a7fce 100644
--- a/webapps/docs/config/systemprops.xml
+++ b/webapps/docs/config/systemprops.xml
@@ -309,6 +309,9 @@
+ Deprecated. Use the jvmRoute attribute of the
+ Engine element. This will be removed in Tomcat
+ 10.1.
Provides a default value for the jvmRoute attribute of
the
Engine element. It does not override the value
configured on the Engine element.
Just checking: this is only removing the automatic fall-back to the
"jvmRoute" system property when none is specified in the jvmRoute
attribute, right?
Anyone who wants to restore the essence of the previous behavior just
needs to:
jvmRoute="${jvmRoute}"
and that's that?
Thanks,
-chris
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 62611] Compress log files after rotation
https://bz.apache.org/bugzilla/show_bug.cgi?id=62611 --- Comment #9 from HanLi --- hi all, Can I continue with this task based on PR#223? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove unused term
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 bf7ec77cfe Remove unused term
bf7ec77cfe is described below
commit bf7ec77cfe79baacd88400264800b34c70f6e0ad
Author: Mark Thomas
AuthorDate: Thu Jun 16 14:29:12 2022 +0100
Remove unused term
---
java/org/apache/catalina/core/LocalStrings.properties | 1 -
java/org/apache/catalina/core/LocalStrings_es.properties| 1 -
java/org/apache/catalina/core/LocalStrings_fr.properties| 1 -
java/org/apache/catalina/core/LocalStrings_ja.properties| 1 -
java/org/apache/catalina/core/LocalStrings_ko.properties| 1 -
java/org/apache/catalina/core/LocalStrings_zh_CN.properties | 1 -
6 files changed, 6 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 4f64fe0a8d..242259f157 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -236,7 +236,6 @@ standardContext.workPath=Exception obtaining work path for
context [{0}]
standardContextValve.acknowledgeException=Failed to acknowledge request with a
100 (Continue) response
-standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from
system property
standardEngine.notHost=Child of an Engine must be a Host
standardEngine.notParent=Engine cannot have a parent Container
standardEngine.start=Starting Servlet engine: [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_es.properties
b/java/org/apache/catalina/core/LocalStrings_es.properties
index 7e8748f1b7..0a76519c96 100644
--- a/java/org/apache/catalina/core/LocalStrings_es.properties
+++ b/java/org/apache/catalina/core/LocalStrings_es.properties
@@ -139,7 +139,6 @@ standardContext.workPath=Excepción obteniendo ruta de
trabajo para el contexto
standardContextValve.acknowledgeException=No pude reconocer el requerimiento
con una respuesta 100 (Continuar)
-standardEngine.jvmRouteFail=No pude poner el atributo jvmRoute del Motor para
la propiedad del sistema
standardEngine.notHost=El Hijo de un Motor debe de ser un Máquina
standardEngine.notParent=El Motor no puede tener un Contenedor padre
diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index b9cf7865e4..4b4f6783ca 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -233,7 +233,6 @@ standardContext.workPath=Impossible d''obtenir le chemin de
travail pour le cont
standardContextValve.acknowledgeException=Impossible de confirmer la requête
avec une réponse 100 (continuer)
-standardEngine.jvmRouteFail=Impossible de fixer la jvmRoute de l'Engine à
partir d'une propriété système
standardEngine.notHost=Le fils d'un moteur (child of an Engine) doit être un
hôte
standardEngine.notParent=Un moteur (engine) ne peut avoir de conteneur parent
(container)
standardEngine.start=Démarrage du moteur de Servlets : [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ja.properties
b/java/org/apache/catalina/core/LocalStrings_ja.properties
index ff7c9067b1..041b633ac5 100644
--- a/java/org/apache/catalina/core/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ja.properties
@@ -233,7 +233,6 @@ standardContext.workPath=コンテキスト [{0}] のworkパスを取得中の
standardContextValve.acknowledgeException=100 (Continue)
レスポンスでリクエストを確認できませんでした。
-standardEngine.jvmRouteFail=EngineのjvmRoute属性をシステムプロパティから設定できませんでした
standardEngine.notHost=Engineの子供はHostでなければいけません
standardEngine.notParent=エンジンは親のコンテナを持つことはできません
standardEngine.start=サーブレットエンジンの起動：[{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_ko.properties
b/java/org/apache/catalina/core/LocalStrings_ko.properties
index aee66ed4fb..befd287f63 100644
--- a/java/org/apache/catalina/core/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/core/LocalStrings_ko.properties
@@ -232,7 +232,6 @@ standardContext.workPath=컨텍스트 [{0}]을(를) 위한 작업 경로를 구
standardContextValve.acknowledgeException=요청에 대해, 100 (Continue) 응답과 함께, ACK을
보내지 못했습니다.
-standardEngine.jvmRouteFail=엔진의 jvmRoute 속성을 시스템 프로퍼티로부터 설정하지 못했습니다.
standardEngine.notHost=엔진의 자식은 반드시 호스트여야 합니다.
standardEngine.notParent=엔진은 부모 컨테이너를 가질 수 없습니다.
standardEngine.start=서버 엔진을 시작합니다: [{0}]
diff --git a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
index e1bc10e3b1..4dff7a5a49 100644
--- a/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/core/LocalStrings_zh_CN.properties
@@ -233,7 +233,6 @@ standardContext.workPath=获取上下文[{0}]的工作路径时发生异常
[tomcat] branch 9.0.x updated: Deprecate the jvmRoute system property
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 The following commit(s) were added to refs/heads/9.0.x by this push: new 9dbb71c9db Deprecate the jvmRoute system property 9dbb71c9db is described below commit 9dbb71c9db90cfbd54cbd8c8306024724ed71c67 Author: Mark Thomas 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 Engine interface. Each * child container must be a Host implementation to process the specific * fully qualified host name of that virtual host. - * You can set the jvmRoute direct or with the System.property jvmRoute. + * The jvmRoute should be set directly like any other property. Using the + * System property jvmRoute 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 eca857cc50..bb1fcd65e7 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) + +Deprecated the jmvRoute system property used to configure a +default value for the jmvRoute attribute of an Engine. +(markt) + 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. Note that the jvmRoute can also be set using the -jvmRoute system property. The jvmRoute -set in an Engine attribute will override -any jvmRoute system property. +deprecated jvmRoute system property. The +jvmRoute set in an Engine +attribute will override any jvmRoute system property. diff --git a/webapps/docs/config/systemprops.xml b/webapps/docs/config/systemprops.xml index ed63102b34..d5463c4e41 100644 --- a/webapps/docs/config/systemprops.xml +++ b/webapps/docs/config/systemprops.xml @@ -595,6 +595,9 @@ + Deprecated. Use the jvmRoute attribute of the + Engine element. This will be removed in Tomcat + 10.1. Provides a default value for the jvmRoute attribute of the Engine element. It does not override the value configured on the Engine element. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Remove the jvmRoute system property
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
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 Engine interface. Each
* child container must be a Host implementation to process the specific
- * fully qualified host name of that virtual host.
- * The jvmRoute should be set directly like any other property. Using the
- * System property jvmRoute 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)
-Deprecated the jmvRoute system property used to configure
a
+Remove the jmvRoute system property used to configure a
default value for the jmvRoute attribute of an Engine.
(markt)
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.
-
-Note that the jvmRoute can also be set using the
-deprecated jvmRoute system property. The
-jvmRoute set in an Engine
-attribute will override any jvmRoute system property.
-
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 @@
org.apache.naming.factory.MailSessionFactory is used.
-
- Deprecated. Use the jvmRoute attribute of the
- Engine element. This will be removed in Tomcat
- 10.1.
- Provides a default value for the jvmRoute attribute of
the
- Engine element. It does not override the value
- configured on the Engine element.
-
-
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
[tomcat] branch main updated: Deprecate the jvmRoute system property
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 3b76da87e3 Deprecate the jvmRoute system property 3b76da87e3 is described below commit 3b76da87e355fc4b637cd1ea57c2e651b9075b5f Author: Mark Thomas 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 Engine interface. Each * child container must be a Host implementation to process the specific * fully qualified host name of that virtual host. - * You can set the jvmRoute direct or with the System.property jvmRoute. + * The jvmRoute should be set directly like any other property. Using the + * System property jvmRoute 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 2c609b519e..828eb99617 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -132,6 +132,11 @@ using Tomcat Native 1.2.34 onwards built with OpenSSL 3.0.x onwards. (markt) + +Deprecated the jmvRoute system property used to configure a +default value for the jmvRoute attribute of an Engine. +(markt) + 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. Note that the jvmRoute can also be set using the -jvmRoute system property. The jvmRoute -set in an Engine attribute will override -any jvmRoute system property. +deprecated jvmRoute system property. The +jvmRoute set in an Engine +attribute will override any jvmRoute system property. diff --git a/webapps/docs/config/systemprops.xml b/webapps/docs/config/systemprops.xml index bdb77bc721..d1ee6a7fce 100644 --- a/webapps/docs/config/systemprops.xml +++ b/webapps/docs/config/systemprops.xml @@ -309,6 +309,9 @@ + Deprecated. Use the jvmRoute attribute of the + Engine element. This will be removed in Tomcat + 10.1. Provides a default value for the jvmRoute attribute of the Engine element. It does not override the value configured on the Engine element. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 10.0.x updated: Deprecate the jvmRoute system property
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 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 Engine interface. Each * child container must be a Host implementation to process the specific * fully qualified host name of that virtual host. - * You can set the jvmRoute direct or with the System.property jvmRoute. + * The jvmRoute should be set directly like any other property. Using the + * System property jvmRoute 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) + +Deprecated the jmvRoute system property used to configure a +default value for the jmvRoute attribute of an Engine. +(markt) + 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. Note that the jvmRoute can also be set using the -jvmRoute system property. The jvmRoute -set in an Engine attribute will override -any jvmRoute system property. +deprecated jvmRoute system property. The +jvmRoute set in an Engine +attribute will override any jvmRoute system property. 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 @@ + Deprecated. Use the jvmRoute attribute of the + Engine element. This will be removed in Tomcat + 10.1. Provides a default value for the jvmRoute attribute of the Engine element. It does not override the value configured on the Engine element. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #524: Dir redirect use301
markt-asf commented on PR #524: URL: https://github.com/apache/tomcat/pull/524#issuecomment-1157622064 You need to update your fork. It appears to be over 12 months out of date (which is why conflicts are reported for this PR). I wonder if we are going to get folks asking for 307/308 at some point and if we should make this an int rather than a boolean. If we do that, we should probably limit it to known valid values - or at least log a large warning if something unexpected is set. Worth adding this to the change log too. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66125] JMProxy - enhance security restrictions
https://bz.apache.org/bugzilla/show_bug.cgi?id=66125 --- Comment #4 from Tim Funk --- True - if that is the case - there is this: /manager/status?XML=true which is xml, not JSON. I'd wonder what additional metrics users were interested that are missing. (As well as if its worth it to optionally exclude processes currently being requested) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66125] JMProxy - enhance security restrictions
https://bz.apache.org/bugzilla/show_bug.cgi?id=66125 --- Comment #3 from Mark Thomas --- If we want to support provision of metrics to unprivileged or minimally privileged users then I think we should consider a mechanism that doesn't involve those users providing the JMX query that gets executed. For example, a new status servlet could be implemented that provides system admin selected metrics in a single page - possibly in JSON format. JMX is likely to be the underlying mechanism used to populate the results and a set of JMX queries could be used to configure it but all end users would be able to do is request the page. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66125] JMProxy - enhance security restrictions
https://bz.apache.org/bugzilla/show_bug.cgi?id=66125 --- Comment #2 from Tim Funk --- 100% agreed. I definitely need to add more to the docs to call this out. For example - in manager-howto.xml - one tweak was the say WARNING instead of NOTE. I was hoping to hit the use case of people using JMXProxy for monitoring and this is a flexible way to limit usage to the "get' operations as well as limit the scope for what get can see. I wasn't sure if this was an OK approach to limit usage as compared to other possibilities. For example: another approach is to moving "op" query string to a path. In which case: Its easier to add different roles in each of those paths. (But this approach would have backwards compatibility challenges) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66125] JMProxy - enhance security restrictions
https://bz.apache.org/bugzilla/show_bug.cgi?id=66125 --- Comment #1 from Remy Maucherat --- This enhancement is risky since if there's a problem somehow it will be an immediate RCE CVE (once people start assuming they can safely expose JMX to the world). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 66125] New: JMProxy - enhance security restrictions
https://bz.apache.org/bugzilla/show_bug.cgi?id=66125 Bug ID: 66125 Summary: JMProxy - enhance security restrictions Product: Tomcat 10 Version: unspecified Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Manager Assignee: dev@tomcat.apache.org Reporter: funk...@apache.org Target Milestone: -- Use case: Allow an admin to restrict the scope of available queries for finding beans. Also allow the scope to be restricted per operation. Done by allowing for a servlet init parameter or a servlet context init param. Naming of the parameter is the same (except the context version has a "JMXProxyServlet." prefix to the name) By allowing servlet context init param, then the manager.xml context file can be updated instead of the more risky (when versions update) server admin change of web.xml The value is a comma or whitespace separated list of allowable regex's to be checked against the query param before running the JMX query. This can allow the effective disable of set or generic query while preserving get to a finite namespace and invoke to just garbage collection. (Per example in docs) Patch preview for the basic concept (disclaimer: untested but up for ideas in renaming the param names or general approach) https://github.com/apache/tomcat/compare/main...funkman:jmx_lockdown?expand=1 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update to Jakarta Common Annotations 2.1.1
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 aa80348b8b Update to Jakarta Common Annotations 2.1.1
aa80348b8b is described below
commit aa80348b8baf6efc0d3258b15da523b2458d52c6
Author: Mark Thomas
AuthorDate: Thu Jun 16 11:43:50 2022 +0100
Update to Jakarta Common Annotations 2.1.1
---
build.xml| 2 +-
java/jakarta/annotation/ManagedBean.java | 4
webapps/docs/changelog.xml | 5 +
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index b6eb51a348..86684d3a73 100644
--- a/build.xml
+++ b/build.xml
@@ -68,7 +68,7 @@
-
+
diff --git a/java/jakarta/annotation/ManagedBean.java
b/java/jakarta/annotation/ManagedBean.java
index d7827812fc..ded1f047d4 100644
--- a/java/jakarta/annotation/ManagedBean.java
+++ b/java/jakarta/annotation/ManagedBean.java
@@ -23,9 +23,13 @@ import java.lang.annotation.Target;
/**
* @since Common Annotations 1.1
+ *
+ * @deprecated This will be removed no earlier than Jakarta EE 11. Use CDI
beans
+ * instead.
*/
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
+@Deprecated(since = "2.1.1", forRemoval = true)
public @interface ManagedBean {
/**
* @return Name of the managed bean
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 059e3a9d77..2c609b519e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -112,6 +112,11 @@
files from the logging directory before the directory has been created.
Based on 521 by HanLi. (markt)
+
+Update the Jakarta Common Annotations API to 2.1.1. This deprecates the
+ManagedBean annotation which will be removed in a future
+release. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Tomcat Native and OpenSSL 3.0.x
Hi all, OpenSSL will be producing security releases on 21st June. This will include 3.0.4. OpenSSL 3.0.3 won't build for Windows using our build tool chain because of a dependency on a method that doesn't exist in the runtime libraries we build against. The fix will be in 3.0.4. I have been able to build OpenSSL 3.0.x HEAD for Windows using our build tool chain. Given all of the above, my plan for Tomcat Native 2.0.0 is as follows: - test the build once OpenSSL 3.0.4 is released, including running the 10.1.x unit tests with it - tag and release Tomcat Native 2.0.0 - update Tomcat 10.1.x to use Tomcat Native 2.0.x - tag and release Tomcat 10.1.x A separate question is do we want to continue building Tomcat Native 1.2.x with OpenSSL 1.1.1 or do we want to switch to OpenSSL 3.0.x? Thoughts? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
