(tomcat) branch main updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 f75aa51afd Differentiate trace and debug log levels
f75aa51afd is described below
commit f75aa51afd4a1ce3ba736d6018cddf3c5ee4b78f
Author: remm
AuthorDate: Fri Feb 2 10:47:07 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/authenticator/AuthenticatorBase.java | 16
java/org/apache/catalina/authenticator/SingleSignOn.java | 12 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 84856f1f38..b6604d4b9e 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -498,8 +498,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
if (constraints != null) {
// Enforce any user data constraint for this security constraint
-if (log.isDebugEnabled()) {
-log.debug("Calling hasUserDataPermission()");
+if (log.isTraceEnabled()) {
+log.trace("Calling hasUserDataPermission()");
}
if (!realm.hasUserDataPermission(request, response, constraints)) {
if (log.isDebugEnabled()) {
@@ -549,8 +549,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (authRequired) {
-if (log.isDebugEnabled()) {
-log.debug("Calling authenticate()");
+if (log.isTraceEnabled()) {
+log.trace("Calling authenticate()");
}
if (jaspicProvider != null) {
@@ -575,8 +575,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (constraints != null) {
-if (log.isDebugEnabled()) {
-log.debug("Calling accessControl()");
+if (log.isTraceEnabled()) {
+log.trace("Calling accessControl()");
}
if (!realm.hasResourcePermission(request, response, constraints,
this.context)) {
if (log.isDebugEnabled()) {
@@ -591,8 +591,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
// Any and all specified constraints have been satisfied
-if (log.isDebugEnabled()) {
-log.debug("Successfully passed all security constraints");
+if (log.isTraceEnabled()) {
+log.trace("Successfully passed all security constraints");
}
getNext().invoke(request, response);
diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java
b/java/org/apache/catalina/authenticator/SingleSignOn.java
index 78d97b967a..813b37eea9 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -208,8 +208,8 @@ public class SingleSignOn extends ValveBase {
request.removeNote(Constants.REQ_SSOID_NOTE);
// Has a valid user already been authenticated?
-if (containerLog.isDebugEnabled()) {
-containerLog.debug(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
+if (containerLog.isTraceEnabled()) {
+containerLog.trace(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
}
if (request.getUserPrincipal() != null) {
if (containerLog.isDebugEnabled()) {
@@ -221,8 +221,8 @@ public class SingleSignOn extends ValveBase {
}
// Check for the single sign on cookie
-if (containerLog.isDebugEnabled()) {
-containerLog.debug(sm.getString("singleSignOn.debug.cookieCheck"));
+if (containerLog.isTraceEnabled()) {
+containerLog.trace(sm.getString("singleSignOn.debug.cookieCheck"));
}
Cookie cookie = null;
Cookie cookies[] = request.getCookies();
@@ -243,8 +243,8 @@ public class SingleSignOn extends ValveBase {
}
// Look up the cached Principal associated with this cookie value
-if (containerLog.isDebugEnabled()) {
-
containerLog.debug(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
+if (containerLog.isTraceEnabled()) {
+
containerLog.trace(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
}
SingleSignOnEntry entry = cache.get(cookie.getValue());
if (entry != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail:
(tomcat) branch 10.1.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new a705f9cfd4 Differentiate trace and debug log levels
a705f9cfd4 is described below
commit a705f9cfd42bcc241199ef50c74b3a7c8527f40d
Author: remm
AuthorDate: Fri Feb 2 10:47:07 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/authenticator/AuthenticatorBase.java | 16
java/org/apache/catalina/authenticator/SingleSignOn.java | 12 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 84856f1f38..b6604d4b9e 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -498,8 +498,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
if (constraints != null) {
// Enforce any user data constraint for this security constraint
-if (log.isDebugEnabled()) {
-log.debug("Calling hasUserDataPermission()");
+if (log.isTraceEnabled()) {
+log.trace("Calling hasUserDataPermission()");
}
if (!realm.hasUserDataPermission(request, response, constraints)) {
if (log.isDebugEnabled()) {
@@ -549,8 +549,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (authRequired) {
-if (log.isDebugEnabled()) {
-log.debug("Calling authenticate()");
+if (log.isTraceEnabled()) {
+log.trace("Calling authenticate()");
}
if (jaspicProvider != null) {
@@ -575,8 +575,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (constraints != null) {
-if (log.isDebugEnabled()) {
-log.debug("Calling accessControl()");
+if (log.isTraceEnabled()) {
+log.trace("Calling accessControl()");
}
if (!realm.hasResourcePermission(request, response, constraints,
this.context)) {
if (log.isDebugEnabled()) {
@@ -591,8 +591,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
// Any and all specified constraints have been satisfied
-if (log.isDebugEnabled()) {
-log.debug("Successfully passed all security constraints");
+if (log.isTraceEnabled()) {
+log.trace("Successfully passed all security constraints");
}
getNext().invoke(request, response);
diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java
b/java/org/apache/catalina/authenticator/SingleSignOn.java
index 78d97b967a..813b37eea9 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -208,8 +208,8 @@ public class SingleSignOn extends ValveBase {
request.removeNote(Constants.REQ_SSOID_NOTE);
// Has a valid user already been authenticated?
-if (containerLog.isDebugEnabled()) {
-containerLog.debug(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
+if (containerLog.isTraceEnabled()) {
+containerLog.trace(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
}
if (request.getUserPrincipal() != null) {
if (containerLog.isDebugEnabled()) {
@@ -221,8 +221,8 @@ public class SingleSignOn extends ValveBase {
}
// Check for the single sign on cookie
-if (containerLog.isDebugEnabled()) {
-containerLog.debug(sm.getString("singleSignOn.debug.cookieCheck"));
+if (containerLog.isTraceEnabled()) {
+containerLog.trace(sm.getString("singleSignOn.debug.cookieCheck"));
}
Cookie cookie = null;
Cookie cookies[] = request.getCookies();
@@ -243,8 +243,8 @@ public class SingleSignOn extends ValveBase {
}
// Look up the cached Principal associated with this cookie value
-if (containerLog.isDebugEnabled()) {
-
containerLog.debug(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
+if (containerLog.isTraceEnabled()) {
+
containerLog.trace(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
}
SingleSignOnEntry entry = cache.get(cookie.getValue());
if (entry != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-ma
(tomcat) branch 9.0.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 9e0332925a Differentiate trace and debug log levels
9e0332925a is described below
commit 9e0332925a2c97d755370d52a1a40ce2d574da81
Author: remm
AuthorDate: Fri Feb 2 10:47:07 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/authenticator/AuthenticatorBase.java | 16
java/org/apache/catalina/authenticator/SingleSignOn.java | 12 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index c63dedef53..4106d105ab 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -497,8 +497,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
if (constraints != null) {
// Enforce any user data constraint for this security constraint
-if (log.isDebugEnabled()) {
-log.debug("Calling hasUserDataPermission()");
+if (log.isTraceEnabled()) {
+log.trace("Calling hasUserDataPermission()");
}
if (!realm.hasUserDataPermission(request, response, constraints)) {
if (log.isDebugEnabled()) {
@@ -548,8 +548,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (authRequired) {
-if (log.isDebugEnabled()) {
-log.debug("Calling authenticate()");
+if (log.isTraceEnabled()) {
+log.trace("Calling authenticate()");
}
if (jaspicProvider != null) {
@@ -574,8 +574,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (constraints != null) {
-if (log.isDebugEnabled()) {
-log.debug("Calling accessControl()");
+if (log.isTraceEnabled()) {
+log.trace("Calling accessControl()");
}
if (!realm.hasResourcePermission(request, response, constraints,
this.context)) {
if (log.isDebugEnabled()) {
@@ -590,8 +590,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
// Any and all specified constraints have been satisfied
-if (log.isDebugEnabled()) {
-log.debug("Successfully passed all security constraints");
+if (log.isTraceEnabled()) {
+log.trace("Successfully passed all security constraints");
}
getNext().invoke(request, response);
diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java
b/java/org/apache/catalina/authenticator/SingleSignOn.java
index 5b2b8eb5de..fe68b1dd63 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -208,8 +208,8 @@ public class SingleSignOn extends ValveBase {
request.removeNote(Constants.REQ_SSOID_NOTE);
// Has a valid user already been authenticated?
-if (containerLog.isDebugEnabled()) {
-containerLog.debug(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
+if (containerLog.isTraceEnabled()) {
+containerLog.trace(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
}
if (request.getUserPrincipal() != null) {
if (containerLog.isDebugEnabled()) {
@@ -221,8 +221,8 @@ public class SingleSignOn extends ValveBase {
}
// Check for the single sign on cookie
-if (containerLog.isDebugEnabled()) {
-containerLog.debug(sm.getString("singleSignOn.debug.cookieCheck"));
+if (containerLog.isTraceEnabled()) {
+containerLog.trace(sm.getString("singleSignOn.debug.cookieCheck"));
}
Cookie cookie = null;
Cookie cookies[] = request.getCookies();
@@ -243,8 +243,8 @@ public class SingleSignOn extends ValveBase {
}
// Look up the cached Principal associated with this cookie value
-if (containerLog.isDebugEnabled()) {
-
containerLog.debug(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
+if (containerLog.isTraceEnabled()) {
+
containerLog.trace(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
}
SingleSignOnEntry entry = cache.get(cookie.getValue());
if (entry != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail
(tomcat) branch 8.5.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 989f80f612 Differentiate trace and debug log levels
989f80f612 is described below
commit 989f80f612cbb49d877792486b8768ba57c1670e
Author: remm
AuthorDate: Fri Feb 2 10:47:07 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/authenticator/AuthenticatorBase.java | 16
java/org/apache/catalina/authenticator/SingleSignOn.java | 12 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
index 95761e3311..5c4f533eca 100644
--- a/java/org/apache/catalina/authenticator/AuthenticatorBase.java
+++ b/java/org/apache/catalina/authenticator/AuthenticatorBase.java
@@ -499,8 +499,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
if (constraints != null) {
// Enforce any user data constraint for this security constraint
-if (log.isDebugEnabled()) {
-log.debug("Calling hasUserDataPermission()");
+if (log.isTraceEnabled()) {
+log.trace("Calling hasUserDataPermission()");
}
if (!realm.hasUserDataPermission(request, response, constraints)) {
if (log.isDebugEnabled()) {
@@ -550,8 +550,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (authRequired) {
-if (log.isDebugEnabled()) {
-log.debug("Calling authenticate()");
+if (log.isTraceEnabled()) {
+log.trace("Calling authenticate()");
}
if (jaspicProvider != null) {
@@ -576,8 +576,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
if (constraints != null) {
-if (log.isDebugEnabled()) {
-log.debug("Calling accessControl()");
+if (log.isTraceEnabled()) {
+log.trace("Calling accessControl()");
}
if (!realm.hasResourcePermission(request, response, constraints,
this.context)) {
if (log.isDebugEnabled()) {
@@ -592,8 +592,8 @@ public abstract class AuthenticatorBase extends ValveBase
implements Authenticat
}
// Any and all specified constraints have been satisfied
-if (log.isDebugEnabled()) {
-log.debug("Successfully passed all security constraints");
+if (log.isTraceEnabled()) {
+log.trace("Successfully passed all security constraints");
}
getNext().invoke(request, response);
diff --git a/java/org/apache/catalina/authenticator/SingleSignOn.java
b/java/org/apache/catalina/authenticator/SingleSignOn.java
index 5b2b8eb5de..fe68b1dd63 100644
--- a/java/org/apache/catalina/authenticator/SingleSignOn.java
+++ b/java/org/apache/catalina/authenticator/SingleSignOn.java
@@ -208,8 +208,8 @@ public class SingleSignOn extends ValveBase {
request.removeNote(Constants.REQ_SSOID_NOTE);
// Has a valid user already been authenticated?
-if (containerLog.isDebugEnabled()) {
-containerLog.debug(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
+if (containerLog.isTraceEnabled()) {
+containerLog.trace(sm.getString("singleSignOn.debug.invoke",
request.getRequestURI()));
}
if (request.getUserPrincipal() != null) {
if (containerLog.isDebugEnabled()) {
@@ -221,8 +221,8 @@ public class SingleSignOn extends ValveBase {
}
// Check for the single sign on cookie
-if (containerLog.isDebugEnabled()) {
-containerLog.debug(sm.getString("singleSignOn.debug.cookieCheck"));
+if (containerLog.isTraceEnabled()) {
+containerLog.trace(sm.getString("singleSignOn.debug.cookieCheck"));
}
Cookie cookie = null;
Cookie cookies[] = request.getCookies();
@@ -243,8 +243,8 @@ public class SingleSignOn extends ValveBase {
}
// Look up the cached Principal associated with this cookie value
-if (containerLog.isDebugEnabled()) {
-
containerLog.debug(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
+if (containerLog.isTraceEnabled()) {
+
containerLog.trace(sm.getString("singleSignOn.debug.principalCheck",
cookie.getValue()));
}
SingleSignOnEntry entry = cache.get(cookie.getValue());
if (entry != null) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail
(tomcat) branch main updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 fa475b419f Differentiate trace and debug log levels
fa475b419f is described below
commit fa475b419f229c5e72ab112d919de37246af4792
Author: remm
AuthorDate: Fri Feb 2 11:11:57 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/connector/CoyoteAdapter.java | 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index f252a4a0f6..bfd3f6f56b 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -900,10 +900,10 @@ public class CoyoteAdapter implements Adapter {
// encoding that doesn't give the expected result so be explicit
Charset charset = connector.getURICharset();
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
-log.debug(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
-log.debug(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
+log.trace(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
+log.trace(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
}
while (semicolon > -1) {
@@ -934,10 +934,10 @@ public class CoyoteAdapter implements Adapter {
uriBC.setEnd(start + semicolon);
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
-log.debug(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
-log.debug(sm.getString("coyoteAdapter.debug", "pv", pv));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
+log.trace(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
+log.trace(sm.getString("coyoteAdapter.debug", "pv", pv));
}
if (pv != null) {
@@ -946,10 +946,10 @@ public class CoyoteAdapter implements Adapter {
String name = pv.substring(0, equals);
String value = pv.substring(equals + 1);
request.addPathParameter(name, value);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
-log.debug(sm.getString("coyoteAdapter.debug", "name",
name));
-log.debug(sm.getString("coyoteAdapter.debug", "value",
value));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
+log.trace(sm.getString("coyoteAdapter.debug", "name",
name));
+log.trace(sm.getString("coyoteAdapter.debug", "value",
value));
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 9ebddf87b2 Differentiate trace and debug log levels
9ebddf87b2 is described below
commit 9ebddf87b2f8cd0f38b107887354f09fd199cbb8
Author: remm
AuthorDate: Fri Feb 2 11:11:57 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/connector/CoyoteAdapter.java | 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index f60c44d3be..943496e0f9 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -905,10 +905,10 @@ public class CoyoteAdapter implements Adapter {
// encoding that doesn't give the expected result so be explicit
Charset charset = connector.getURICharset();
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
-log.debug(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
-log.debug(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
+log.trace(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
+log.trace(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
}
while (semicolon > -1) {
@@ -939,10 +939,10 @@ public class CoyoteAdapter implements Adapter {
uriBC.setEnd(start + semicolon);
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
-log.debug(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
-log.debug(sm.getString("coyoteAdapter.debug", "pv", pv));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
+log.trace(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
+log.trace(sm.getString("coyoteAdapter.debug", "pv", pv));
}
if (pv != null) {
@@ -951,10 +951,10 @@ public class CoyoteAdapter implements Adapter {
String name = pv.substring(0, equals);
String value = pv.substring(equals + 1);
request.addPathParameter(name, value);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
-log.debug(sm.getString("coyoteAdapter.debug", "name",
name));
-log.debug(sm.getString("coyoteAdapter.debug", "value",
value));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
+log.trace(sm.getString("coyoteAdapter.debug", "name",
name));
+log.trace(sm.getString("coyoteAdapter.debug", "value",
value));
}
}
}
-
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: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 eb0d37635a Differentiate trace and debug log levels
eb0d37635a is described below
commit eb0d37635a8a3553993c9a4806a160208a3cbba9
Author: remm
AuthorDate: Fri Feb 2 11:11:57 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/connector/CoyoteAdapter.java | 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index 7cd5b1246a..a64563425d 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -904,10 +904,10 @@ public class CoyoteAdapter implements Adapter {
// encoding that doesn't give the expected result so be explicit
Charset charset = connector.getURICharset();
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
-log.debug(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
-log.debug(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
+log.trace(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
+log.trace(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
}
while (semicolon > -1) {
@@ -938,10 +938,10 @@ public class CoyoteAdapter implements Adapter {
uriBC.setEnd(start + semicolon);
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
-log.debug(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
-log.debug(sm.getString("coyoteAdapter.debug", "pv", pv));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
+log.trace(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
+log.trace(sm.getString("coyoteAdapter.debug", "pv", pv));
}
if (pv != null) {
@@ -950,10 +950,10 @@ public class CoyoteAdapter implements Adapter {
String name = pv.substring(0, equals);
String value = pv.substring(equals + 1);
request.addPathParameter(name, value);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
-log.debug(sm.getString("coyoteAdapter.debug", "name",
name));
-log.debug(sm.getString("coyoteAdapter.debug", "value",
value));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
+log.trace(sm.getString("coyoteAdapter.debug", "name",
name));
+log.trace(sm.getString("coyoteAdapter.debug", "value",
value));
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new 2c69a2a72b Differentiate trace and debug log levels
2c69a2a72b is described below
commit 2c69a2a72b7f8a72a01dc21411c4b585e5e0ddbd
Author: remm
AuthorDate: Fri Feb 2 11:11:57 2024 +0100
Differentiate trace and debug log levels
---
.../apache/catalina/connector/CoyoteAdapter.java | 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java
b/java/org/apache/catalina/connector/CoyoteAdapter.java
index fec6822add..c88bdce317 100644
--- a/java/org/apache/catalina/connector/CoyoteAdapter.java
+++ b/java/org/apache/catalina/connector/CoyoteAdapter.java
@@ -900,10 +900,10 @@ public class CoyoteAdapter implements Adapter {
// encoding that doesn't give the expected result so be explicit
Charset charset = connector.getURICharset();
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
-log.debug(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
-log.debug(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug", "uriBC",
uriBC.toString()));
+log.trace(sm.getString("coyoteAdapter.debug", "semicolon",
String.valueOf(semicolon)));
+log.trace(sm.getString("coyoteAdapter.debug", "enc",
charset.name()));
}
while (semicolon > -1) {
@@ -934,10 +934,10 @@ public class CoyoteAdapter implements Adapter {
uriBC.setEnd(start + semicolon);
}
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
-log.debug(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
-log.debug(sm.getString("coyoteAdapter.debug", "pv", pv));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"pathParamStart", String.valueOf(pathParamStart)));
+log.trace(sm.getString("coyoteAdapter.debug", "pathParamEnd",
String.valueOf(pathParamEnd)));
+log.trace(sm.getString("coyoteAdapter.debug", "pv", pv));
}
if (pv != null) {
@@ -946,10 +946,10 @@ public class CoyoteAdapter implements Adapter {
String name = pv.substring(0, equals);
String value = pv.substring(equals + 1);
request.addPathParameter(name, value);
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
-log.debug(sm.getString("coyoteAdapter.debug", "name",
name));
-log.debug(sm.getString("coyoteAdapter.debug", "value",
value));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("coyoteAdapter.debug",
"equals", String.valueOf(equals)));
+log.trace(sm.getString("coyoteAdapter.debug", "name",
name));
+log.trace(sm.getString("coyoteAdapter.debug", "value",
value));
}
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 56bbdd6ac9 Differentiate trace and debug log levels
56bbdd6ac9 is described below
commit 56bbdd6ac9c2ee690e33b2e6ceb97d4dbf0d7ad6
Author: remm
AuthorDate: Fri Feb 2 13:51:40 2024 +0100
Differentiate trace and debug log levels
---
.../catalina/core/ApplicationDispatcher.java | 8 +--
.../org/apache/catalina/core/AsyncContextImpl.java | 28 +-
.../apache/catalina/core/LocalStrings.properties | 3 +-
.../catalina/core/NamingContextListener.java | 4 +-
java/org/apache/catalina/core/StandardContext.java | 64 +++---
.../apache/catalina/core/StandardHostValve.java| 14 ++---
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
7 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index ebc5111ecd..0707cf8eb3 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -291,8 +291,8 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
}
// This is not a real close in order to support error processing
-if (wrapper.getLogger().isDebugEnabled()) {
-wrapper.getLogger().debug(" Disabling the response for further
output");
+if (wrapper.getLogger().isTraceEnabled()) {
+wrapper.getLogger().trace(" Disabling the response for further
output");
}
if (response instanceof ResponseFacade) {
@@ -300,9 +300,9 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
} else {
// Servlet SRV.6.2.2. The Request/Response may have been wrapped
// and may no longer be instance of RequestFacade
-if (wrapper.getLogger().isDebugEnabled()) {
+if (wrapper.getLogger().isTraceEnabled()) {
wrapper.getLogger()
-.debug(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
+.trace(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
}
// Close anyway
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java
b/java/org/apache/catalina/core/AsyncContextImpl.java
index ae41532aca..832e9b61bc 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -77,7 +77,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
private final AtomicBoolean hasOnErrorReturned = new AtomicBoolean(false);
public AsyncContextImpl(Request request) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("Constructor");
}
this.request = request;
@@ -85,7 +85,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void complete() {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("complete ");
}
check();
@@ -94,8 +94,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void fireOnComplete() {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnComplete"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnComplete"));
}
List listenersCopy = new ArrayList<>(listeners);
@@ -124,8 +124,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
Context context = this.context;
if (result.get()) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnTimeout"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnTimeout"));
}
ClassLoader oldCL = context.bind(null);
try {
@@ -178,7 +178,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void dispatch(ServletContext servletContext, String path) {
synchronized (asyncContextLock) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("dispatch ");
}
check();
@@ -225,7 +225,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void start(final Runnable run) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
(tomcat) branch 10.1.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 0ee5484741 Differentiate trace and debug log levels
0ee5484741 is described below
commit 0ee548474112ca48aabc5c9c67f8e67461b8c556
Author: remm
AuthorDate: Fri Feb 2 13:51:40 2024 +0100
Differentiate trace and debug log levels
---
.../catalina/core/ApplicationDispatcher.java | 8 +--
.../org/apache/catalina/core/AsyncContextImpl.java | 28 +-
.../apache/catalina/core/LocalStrings.properties | 3 +-
.../catalina/core/NamingContextListener.java | 4 +-
java/org/apache/catalina/core/StandardContext.java | 64 +++---
.../apache/catalina/core/StandardHostValve.java| 14 ++---
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
7 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index 5672ebf823..149ba52ca1 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -347,8 +347,8 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
}
// This is not a real close in order to support error processing
-if (wrapper.getLogger().isDebugEnabled()) {
-wrapper.getLogger().debug(" Disabling the response for further
output");
+if (wrapper.getLogger().isTraceEnabled()) {
+wrapper.getLogger().trace(" Disabling the response for further
output");
}
if (response instanceof ResponseFacade) {
@@ -356,9 +356,9 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
} else {
// Servlet SRV.6.2.2. The Request/Response may have been wrapped
// and may no longer be instance of RequestFacade
-if (wrapper.getLogger().isDebugEnabled()) {
+if (wrapper.getLogger().isTraceEnabled()) {
wrapper.getLogger()
-.debug(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
+.trace(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
}
// Close anyway
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java
b/java/org/apache/catalina/core/AsyncContextImpl.java
index b713f71f10..0840b7a61e 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -78,7 +78,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
private final AtomicBoolean hasOnErrorReturned = new AtomicBoolean(false);
public AsyncContextImpl(Request request) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("Constructor");
}
this.request = request;
@@ -86,7 +86,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void complete() {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("complete ");
}
check();
@@ -95,8 +95,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void fireOnComplete() {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnComplete"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnComplete"));
}
List listenersCopy = new ArrayList<>(listeners);
@@ -125,8 +125,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
Context context = this.context;
if (result.get()) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnTimeout"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnTimeout"));
}
ClassLoader oldCL = context.bind(false, null);
try {
@@ -179,7 +179,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void dispatch(ServletContext servletContext, String path) {
synchronized (asyncContextLock) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("dispatch ");
}
check();
@@ -226,7 +226,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void start(final Runnable run) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled
(tomcat) branch 9.0.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 47b8b35ae0 Differentiate trace and debug log levels
47b8b35ae0 is described below
commit 47b8b35ae05f987ea1c6275da76fd48c8e699889
Author: remm
AuthorDate: Fri Feb 2 13:51:40 2024 +0100
Differentiate trace and debug log levels
---
.../catalina/core/ApplicationDispatcher.java | 8 +--
.../org/apache/catalina/core/AsyncContextImpl.java | 28 +-
.../apache/catalina/core/LocalStrings.properties | 3 +-
.../catalina/core/NamingContextListener.java | 4 +-
java/org/apache/catalina/core/StandardContext.java | 64 +++---
.../apache/catalina/core/StandardHostValve.java| 14 ++---
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
7 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index a9c28ee748..d50bf7c66f 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -364,8 +364,8 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
}
// This is not a real close in order to support error processing
-if (wrapper.getLogger().isDebugEnabled()) {
-wrapper.getLogger().debug(" Disabling the response for further
output");
+if (wrapper.getLogger().isTraceEnabled()) {
+wrapper.getLogger().trace(" Disabling the response for further
output");
}
if (response instanceof ResponseFacade) {
@@ -373,9 +373,9 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
} else {
// Servlet SRV.6.2.2. The Request/Response may have been wrapped
// and may no longer be instance of RequestFacade
-if (wrapper.getLogger().isDebugEnabled()) {
+if (wrapper.getLogger().isTraceEnabled()) {
wrapper.getLogger()
-.debug(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
+.trace(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
}
// Close anyway
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java
b/java/org/apache/catalina/core/AsyncContextImpl.java
index 621053a09c..21a832bc13 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -77,7 +77,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
private final AtomicBoolean hasOnErrorReturned = new AtomicBoolean(false);
public AsyncContextImpl(Request request) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("Constructor");
}
this.request = request;
@@ -85,7 +85,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void complete() {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("complete ");
}
check();
@@ -94,8 +94,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void fireOnComplete() {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnComplete"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnComplete"));
}
List listenersCopy = new ArrayList<>(listeners);
@@ -124,8 +124,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
Context context = this.context;
if (result.get()) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnTimeout"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnTimeout"));
}
ClassLoader oldCL = context.bind(false, null);
try {
@@ -178,7 +178,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void dispatch(ServletContext servletContext, String path) {
synchronized (asyncContextLock) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("dispatch ");
}
check();
@@ -225,7 +225,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void start(final Runnable run) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()
(tomcat) branch 8.5.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new f0f9724fd8 Differentiate trace and debug log levels
f0f9724fd8 is described below
commit f0f9724fd816ccc6ee1bbbcca0ccbfada936f964
Author: remm
AuthorDate: Fri Feb 2 13:51:40 2024 +0100
Differentiate trace and debug log levels
---
.../catalina/core/ApplicationDispatcher.java | 8 +--
.../org/apache/catalina/core/AsyncContextImpl.java | 28 +-
.../apache/catalina/core/LocalStrings.properties | 3 +-
.../catalina/core/NamingContextListener.java | 4 +-
java/org/apache/catalina/core/StandardContext.java | 64 +++---
.../apache/catalina/core/StandardHostValve.java| 14 ++---
java/org/apache/catalina/core/StandardWrapper.java | 4 +-
7 files changed, 63 insertions(+), 62 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationDispatcher.java
b/java/org/apache/catalina/core/ApplicationDispatcher.java
index f20fb0d71a..27f9ded5db 100644
--- a/java/org/apache/catalina/core/ApplicationDispatcher.java
+++ b/java/org/apache/catalina/core/ApplicationDispatcher.java
@@ -367,8 +367,8 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
}
// This is not a real close in order to support error processing
-if (wrapper.getLogger().isDebugEnabled()) {
-wrapper.getLogger().debug(" Disabling the response for further
output");
+if (wrapper.getLogger().isTraceEnabled()) {
+wrapper.getLogger().trace(" Disabling the response for further
output");
}
if (response instanceof ResponseFacade) {
@@ -376,9 +376,9 @@ final class ApplicationDispatcher implements
AsyncDispatcher, RequestDispatcher
} else {
// Servlet SRV.6.2.2. The Request/Response may have been wrapped
// and may no longer be instance of RequestFacade
-if (wrapper.getLogger().isDebugEnabled()) {
+if (wrapper.getLogger().isTraceEnabled()) {
wrapper.getLogger()
-.debug(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
+.trace(" The Response is vehiculed using a wrapper: "
+ response.getClass().getName());
}
// Close anyway
diff --git a/java/org/apache/catalina/core/AsyncContextImpl.java
b/java/org/apache/catalina/core/AsyncContextImpl.java
index aea694a57d..a61ed7c0f2 100644
--- a/java/org/apache/catalina/core/AsyncContextImpl.java
+++ b/java/org/apache/catalina/core/AsyncContextImpl.java
@@ -77,7 +77,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
private final AtomicBoolean hasOnErrorReturned = new AtomicBoolean(false);
public AsyncContextImpl(Request request) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("Constructor");
}
this.request = request;
@@ -85,7 +85,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void complete() {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("complete ");
}
check();
@@ -94,8 +94,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void fireOnComplete() {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnComplete"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnComplete"));
}
List listenersCopy = new ArrayList<>(listeners);
@@ -124,8 +124,8 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
Context context = this.context;
if (result.get()) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("asyncContextImpl.fireOnTimeout"));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("asyncContextImpl.fireOnTimeout"));
}
ClassLoader oldCL = context.bind(false, null);
try {
@@ -178,7 +178,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void dispatch(ServletContext servletContext, String path) {
synchronized (asyncContextLock) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
logDebug("dispatch ");
}
check();
@@ -225,7 +225,7 @@ public class AsyncContextImpl implements AsyncContext,
AsyncContextCallback {
@Override
public void start(final Runnable run) {
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()
Re: February 2024 releases
Mark, On 2/1/24 18:07, Mark Thomas wrote: On 01/02/2024 23:45, Christopher Schultz wrote: All, Friday seems like a good time to roll a release and call for a vote. Does anyone want to fit anything in before this round of releases? Yes. The update to the migration tool. Okay. Does the migration tool need to be voted-on and released before we begin the release process for Tomcat itself? I thought the Migration Tool was just a standalone version of what we had in Tomcat. Maybe it's the opposite...? We might want to think about a Tomcat Native release to pick up the latest OpenSSL releases. We don't need to, but it will probably save some false positives from security scanners. If tcnative needs a refresh, that's a reasonable thing to wait for. There is nothing pressing that I can see in the February releases makes me want to rush-ahead. I also have some other changes locally that I want to merge. +1 -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Fix websocket processor leaks when WsSession expires and server sends close message by WsBackgroundThread [tomcat]
ChristopherSchultz commented on PR #683: URL: https://github.com/apache/tomcat/pull/683#issuecomment-1924044806 > > Fixed and back-ported. Will be in the February releases. > > Hi @markt-asf,What channel can I use to know that this problem has been fixed? Thank you very much. Are you looking for something other than the commit log, the change log, or a release announcement? Because two of those have already happened, and the third (release announcement) will occur after the next release which contains this fix. -- 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-jakartaee-migration) branch main updated: [maven-release-plugin] prepare release 1.0.8
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 7c15596 [maven-release-plugin] prepare release 1.0.8 7c15596 is described below commit 7c1559661980d93e84b947682c67959165abbc4a Author: Mark Thomas AuthorDate: Fri Feb 2 15:40:15 2024 + [maven-release-plugin] prepare release 1.0.8 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a5f89e8..d441d5b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.tomcat jakartaee-migration - 1.0.8-SNAPSHOT + 1.0.8 Apache Tomcat Migration Tool for Jakarta EE The aim of the tool is to take a web application written for Java EE 8 that @@ -62,7 +62,7 @@ scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git -1.0.6 +1.0.8 https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) annotated tag 1.0.8 created (now 5a09083)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to annotated tag 1.0.8 in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git at 5a09083 (tag) tagging 7c1559661980d93e84b947682c67959165abbc4a (commit) replaces 1.0.7 by Mark Thomas on Fri Feb 2 15:40:43 2024 + - Log - [maven-release-plugin] copy for tag 1.0.8 --- No new revisions were added by this update. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-jakartaee-migration) branch main updated: [maven-release-plugin] prepare for next development iteration
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-jakartaee-migration.git The following commit(s) were added to refs/heads/main by this push: new 44abd38 [maven-release-plugin] prepare for next development iteration 44abd38 is described below commit 44abd38ffa36ab3841a7e7d16d506e229a5451de Author: Mark Thomas AuthorDate: Fri Feb 2 15:40:53 2024 + [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d441d5b..4cb9ba3 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.tomcat jakartaee-migration - 1.0.8 + 1.0.9-SNAPSHOT Apache Tomcat Migration Tool for Jakarta EE The aim of the tool is to take a web application written for Java EE 8 that @@ -62,7 +62,7 @@ scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git scm:git:https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git -1.0.8 +1.0.6 https://gitbox.apache.org/repos/asf?p=tomcat-jakartaee-migration.git - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 2c7bda3c2d Differentiate trace and debug log levels
2c7bda3c2d is described below
commit 2c7bda3c2ded4efe3b8871c0a399351d15fe53d7
Author: remm
AuthorDate: Fri Feb 2 16:47:55 2024 +0100
Differentiate trace and debug log levels
---
.../org/apache/catalina/filters/ExpiresFilter.java | 4 +-
.../catalina/filters/LocalStrings.properties | 1 +
.../apache/catalina/filters/RemoteIpFilter.java| 11 +-
java/org/apache/catalina/ha/ClusterListener.java | 6 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 32 +++---
.../catalina/ha/deploy/FileMessageFactory.java | 8 +-
.../apache/catalina/ha/session/BackupManager.java | 8 +-
.../apache/catalina/ha/session/DeltaManager.java | 25 +++--
.../catalina/ha/session/JvmRouteBinderValve.java | 6 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 20 ++--
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 12 +-
.../catalina/loader/WebappClassLoaderBase.java | 122 ++---
12 files changed, 129 insertions(+), 126 deletions(-)
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 7fbb6529aa..fe80faa521 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -1383,7 +1383,9 @@ public class ExpiresFilter extends FilterBase {
}
}
-log.debug(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+}
}
/**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index a0f5bf0f04..e7766c74d3 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -61,6 +61,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP
address. Request denied.
remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP
header [{1}]
remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}]
included a port number which will be ignored
remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidPort=Port [{0}] in HTTP header [{1}] included a port
number which will be ignored
remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host
because the reported remote address [{0}] is not valid
requestFilter.deny=Denied request for [{0}] based on property [{1}]
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 038f4a95b7..0e3a3e74df 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -862,8 +862,8 @@ public class RemoteIpFilter extends GenericFilter {
}
request.setAttribute(Globals.REQUEST_FORWARDED_ATTRIBUTE,
Boolean.TRUE);
-if (log.isDebugEnabled()) {
-log.debug("Incoming request " + request.getRequestURI() + "
with originalRemoteAddr [" +
+if (log.isTraceEnabled()) {
+log.trace("Incoming request " + request.getRequestURI() + "
with originalRemoteAddr [" +
request.getRemoteAddr() + "], originalRemoteHost=[" +
request.getRemoteHost() +
"], originalSecure=[" + request.isSecure() + "],
originalScheme=[" + request.getScheme() +
"], originalServerName=[" + request.getServerName() +
"], originalServerPort=[" +
@@ -882,8 +882,8 @@ public class RemoteIpFilter extends GenericFilter {
}
chain.doFilter(xRequest, response);
} else {
-if (log.isDebugEnabled()) {
-log.debug("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
+if (log.isTraceEnabled()) {
+log.trace("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
request.getRemoteAddr() + "'");
}
chain.doFilter(request, response);
@@ -918,8 +918,7 @@ public class RemoteIpFilter extends GenericFilter {
try {
port = Integer.parseInt(portHeaderValue);
} catch (NumberFormatException nfe) {
-log.debug("Invalid port value [" + portHeaderValue + "]
provided in header [" + getPortHeader() +
-"]");
+log.debug(sm.getString("remoteIpFilter.i
svn commit: r67143 - in /dev/tomcat/jakartaee-migration/v1.0.8: ./ binaries/ source/
Author: markt Date: Fri Feb 2 15:48:36 2024 New Revision: 67143 Log: Upload Tomcat migration tool for Jakarta EE 1.0.8 for voting Added: dev/tomcat/jakartaee-migration/v1.0.8/ dev/tomcat/jakartaee-migration/v1.0.8/binaries/ dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz (with props) dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz.asc dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz.sha512 dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.zip (with props) dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.zip.asc dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.zip.sha512 dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-shaded.jar (with props) dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-shaded.jar.asc dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-shaded.jar.sha512 dev/tomcat/jakartaee-migration/v1.0.8/source/ dev/tomcat/jakartaee-migration/v1.0.8/source/jakartaee-migration-1.0.8-src.tar.gz (with props) dev/tomcat/jakartaee-migration/v1.0.8/source/jakartaee-migration-1.0.8-src.tar.gz.asc dev/tomcat/jakartaee-migration/v1.0.8/source/jakartaee-migration-1.0.8-src.tar.gz.sha512 dev/tomcat/jakartaee-migration/v1.0.8/source/jakartaee-migration-1.0.8-src.zip (with props) dev/tomcat/jakartaee-migration/v1.0.8/source/jakartaee-migration-1.0.8-src.zip.asc dev/tomcat/jakartaee-migration/v1.0.8/source/jakartaee-migration-1.0.8-src.zip.sha512 Added: dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz == Binary file - no diff available. Propchange: dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz -- svn:mime-type = application/octet-stream Added: dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz.asc == --- dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz.asc (added) +++ dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz.asc Fri Feb 2 15:48:36 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmW9Dn4ACgkQEMAcWi9g +WedwjxAAyvS0NiTo6vy2mQtE6XvdhFz+z4IP4f6XWWtCirzRmzgUNgbnWJRJILWW +2VNyz4WoXB1A7AqNw5OZjCnWVBl2Zn0mTn0r29yM96orVM7ItoMGEzdNPCRgk9xi +g7g6bt5bjsX8Ht4Zy3BQwe3D34+DC4s25AVttIgXiz+5Od8kMKPlqFgPhdG11O1m +fn0P69iHR2XnCYI3Z/LgTOq/7oWOAk+XrysDP80GJJseOse7AsL3ZcNLAESSi0Ta +mfeGQF3Vc6vdS67fmYlQNYlqFY2wn4iBEEm5qc1UZ8s32aszohM6Pz5e8vDvJHeI +EXQg7Y0lnXRifUs8IwqYBMtpgK/qIP8Udt24scrRB8X8dyblL8b8VtLlp25meu3r +4zdPlxhZwh6ZH8EmTWZ89b92LEA90ZTx/eq2uCVh9NFxb7S21MVwjsUCFocZq0/H +pnPGsxelwFSSmOpigtJioLOfdnr9/q14ZdPyse34bJqL5uUrk7ffzYIR3RIUhfvv +UltiqxIPVBlZIw0FYtZnTjt9QURcI6Ul8RLryICi/Gfqc8h1Ozh9x4/8AwjZP5DA +J7N3/VlIvDiRgh7z604pTMuzAbs/jg2D0++FiRp3S1pp//3mURpjigSfsSOEnRk5 +UZeKHVTG4gVXybnM/M+JfW8a3PmqhUmd1TxPx1XTNP9W9KBJXb4= +=UFZ6 +-END PGP SIGNATURE- Added: dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz.sha512 == --- dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz.sha512 (added) +++ dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.tar.gz.sha512 Fri Feb 2 15:48:36 2024 @@ -0,0 +1 @@ +f71bc5148105e0dff6f578955db3327a1e181635ab9ef7dc8f89d183b3b9a2cba62ae3de17a27dc3115f199297d66cc7aee1820f887ee8abf97040d3b422b2ec *jakartaee-migration-1.0.8-bin.tar.gz \ No newline at end of file Added: dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.zip == Binary file - no diff available. Propchange: dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.zip -- svn:mime-type = application/octet-stream Added: dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.zip.asc == --- dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.zip.asc (added) +++ dev/tomcat/jakartaee-migration/v1.0.8/binaries/jakartaee-migration-1.0.8-bin.zip.asc Fri Feb 2 15:48:36 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqcXfTSLpmZjZh1pREMAcWi9gWecFAmW9Dn4ACgkQEMAcWi9g +WefxJxAAnhbs+md39YyzVDSp34VyT7PMYV6hhvTAq
[VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.8
The proposed Apache Tomcat migration tool for Jakarta EE 1.0.8 is now available for voting. The significant changes since 1.0.7 are: - Recognize .ear files as archives - Include .jspf and .tagf files in the conversion process - Update dependencies It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.8/ The Maven staging repository is: https://repository.apache.org/content/repositories/orgapachetomcat-1479/ The tag is: https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.8 7c1559661980d93e84b947682c67959165abbc4a The proposed 1.0.8 release is: [ ] -1: Broken. Do not release because... [ ] +1: Acceptable. Go ahead and release. Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.8
On 02/02/2024 15:53, Mark Thomas wrote: The proposed 1.0.8 release is: [ ] -1: Broken. Do not release because... [X] +1: Acceptable. Go ahead and release. The tests pass during the build. When used with Tomcat 11.0.x, the 1.0.8 shaded JAR successfully converts the 9.0.x examples web application. The WebSocket snake and drawing examples work in the migrated web application. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 00454f7a3c Differentiate trace and debug log levels
00454f7a3c is described below
commit 00454f7a3c07feb08c0ab873222e08ecf7e8b35a
Author: remm
AuthorDate: Fri Feb 2 16:47:55 2024 +0100
Differentiate trace and debug log levels
---
.../org/apache/catalina/filters/ExpiresFilter.java | 4 +-
.../catalina/filters/LocalStrings.properties | 1 +
.../apache/catalina/filters/RemoteIpFilter.java| 11 +-
java/org/apache/catalina/ha/ClusterListener.java | 6 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 32 +++---
.../catalina/ha/deploy/FileMessageFactory.java | 8 +-
.../apache/catalina/ha/session/BackupManager.java | 8 +-
.../apache/catalina/ha/session/DeltaManager.java | 25 +++--
.../catalina/ha/session/JvmRouteBinderValve.java | 6 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 20 ++--
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 12 +-
.../catalina/loader/WebappClassLoaderBase.java | 122 ++---
12 files changed, 129 insertions(+), 126 deletions(-)
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 7fbb6529aa..fe80faa521 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -1383,7 +1383,9 @@ public class ExpiresFilter extends FilterBase {
}
}
-log.debug(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+}
}
/**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index a0f5bf0f04..e7766c74d3 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -61,6 +61,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP
address. Request denied.
remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP
header [{1}]
remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}]
included a port number which will be ignored
remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidPort=Port [{0}] in HTTP header [{1}] included a port
number which will be ignored
remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host
because the reported remote address [{0}] is not valid
requestFilter.deny=Denied request for [{0}] based on property [{1}]
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 61bf58ed31..ce812c1178 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -906,8 +906,8 @@ public class RemoteIpFilter extends GenericFilter {
}
request.setAttribute(Globals.REQUEST_FORWARDED_ATTRIBUTE,
Boolean.TRUE);
-if (log.isDebugEnabled()) {
-log.debug("Incoming request " + request.getRequestURI() + "
with originalRemoteAddr [" +
+if (log.isTraceEnabled()) {
+log.trace("Incoming request " + request.getRequestURI() + "
with originalRemoteAddr [" +
request.getRemoteAddr() + "], originalRemoteHost=[" +
request.getRemoteHost() +
"], originalSecure=[" + request.isSecure() + "],
originalScheme=[" + request.getScheme() +
"], originalServerName=[" + request.getServerName() +
"], originalServerPort=[" +
@@ -926,8 +926,8 @@ public class RemoteIpFilter extends GenericFilter {
}
chain.doFilter(xRequest, response);
} else {
-if (log.isDebugEnabled()) {
-log.debug("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
+if (log.isTraceEnabled()) {
+log.trace("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
request.getRemoteAddr() + "'");
}
chain.doFilter(request, response);
@@ -962,8 +962,7 @@ public class RemoteIpFilter extends GenericFilter {
try {
port = Integer.parseInt(portHeaderValue);
} catch (NumberFormatException nfe) {
-log.debug("Invalid port value [" + portHeaderValue + "]
provided in header [" + getPortHeader() +
-"]");
+log.debug(sm.getString("remoteIpFilt
(tomcat) branch 9.0.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 25ba4bc9d9 Differentiate trace and debug log levels
25ba4bc9d9 is described below
commit 25ba4bc9d9fcf98b1db68bc84c50469d435edcf8
Author: remm
AuthorDate: Fri Feb 2 16:47:55 2024 +0100
Differentiate trace and debug log levels
---
.../org/apache/catalina/filters/ExpiresFilter.java | 4 +-
.../catalina/filters/LocalStrings.properties | 1 +
.../apache/catalina/filters/RemoteIpFilter.java| 11 +-
java/org/apache/catalina/ha/ClusterListener.java | 6 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 32 +++---
.../catalina/ha/deploy/FileMessageFactory.java | 8 +-
.../apache/catalina/ha/session/BackupManager.java | 8 +-
.../apache/catalina/ha/session/DeltaManager.java | 25 +++--
.../catalina/ha/session/JvmRouteBinderValve.java | 6 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 20 ++--
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 12 +-
.../catalina/loader/WebappClassLoaderBase.java | 122 ++---
12 files changed, 129 insertions(+), 126 deletions(-)
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index e79f9e8f42..75219aba1d 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -1404,7 +1404,9 @@ public class ExpiresFilter extends FilterBase {
}
}
-log.debug(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+}
}
/**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index a0f5bf0f04..e7766c74d3 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -61,6 +61,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP
address. Request denied.
remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP
header [{1}]
remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}]
included a port number which will be ignored
remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidPort=Port [{0}] in HTTP header [{1}] included a port
number which will be ignored
remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host
because the reported remote address [{0}] is not valid
requestFilter.deny=Denied request for [{0}] based on property [{1}]
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 1d0675d755..0330e0630c 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -906,8 +906,8 @@ public class RemoteIpFilter extends GenericFilter {
}
request.setAttribute(Globals.REQUEST_FORWARDED_ATTRIBUTE,
Boolean.TRUE);
-if (log.isDebugEnabled()) {
-log.debug("Incoming request " + request.getRequestURI() + "
with originalRemoteAddr [" +
+if (log.isTraceEnabled()) {
+log.trace("Incoming request " + request.getRequestURI() + "
with originalRemoteAddr [" +
request.getRemoteAddr() + "], originalRemoteHost=[" +
request.getRemoteHost() +
"], originalSecure=[" + request.isSecure() + "],
originalScheme=[" + request.getScheme() +
"], originalServerName=[" + request.getServerName() +
"], originalServerPort=[" +
@@ -926,8 +926,8 @@ public class RemoteIpFilter extends GenericFilter {
}
chain.doFilter(xRequest, response);
} else {
-if (log.isDebugEnabled()) {
-log.debug("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
+if (log.isTraceEnabled()) {
+log.trace("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
request.getRemoteAddr() + "'");
}
chain.doFilter(request, response);
@@ -962,8 +962,7 @@ public class RemoteIpFilter extends GenericFilter {
try {
port = Integer.parseInt(portHeaderValue);
} catch (NumberFormatException nfe) {
-log.debug("Invalid port value [" + portHeaderValue + "]
provided in header [" + getPortHeader() +
-"]");
+log.debug(sm.getString("remoteIpFilter
(tomcat) branch 8.5.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c330fd7274 Differentiate trace and debug log levels
c330fd7274 is described below
commit c330fd7274a7b4cb071f60fa9da1fc4647994529
Author: remm
AuthorDate: Fri Feb 2 16:47:55 2024 +0100
Differentiate trace and debug log levels
---
.../org/apache/catalina/filters/ExpiresFilter.java | 4 +-
.../catalina/filters/LocalStrings.properties | 1 +
.../apache/catalina/filters/RemoteIpFilter.java| 11 +-
java/org/apache/catalina/ha/ClusterListener.java | 6 +-
.../apache/catalina/ha/deploy/FarmWarDeployer.java | 32 +++---
.../catalina/ha/deploy/FileMessageFactory.java | 8 +-
.../apache/catalina/ha/session/BackupManager.java | 8 +-
.../apache/catalina/ha/session/DeltaManager.java | 25 +++--
.../catalina/ha/session/JvmRouteBinderValve.java | 6 +-
.../apache/catalina/ha/tcp/ReplicationValve.java | 20 ++--
.../apache/catalina/ha/tcp/SimpleTcpCluster.java | 12 +-
.../catalina/loader/WebappClassLoaderBase.java | 122 ++---
12 files changed, 129 insertions(+), 126 deletions(-)
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java
b/java/org/apache/catalina/filters/ExpiresFilter.java
index 98e0799cb3..a4ad475cce 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -1414,7 +1414,9 @@ public class ExpiresFilter extends FilterBase {
}
}
-log.debug(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("expiresFilter.filterInitialized",
this.toString()));
+}
}
/**
diff --git a/java/org/apache/catalina/filters/LocalStrings.properties
b/java/org/apache/catalina/filters/LocalStrings.properties
index a0f5bf0f04..e7766c74d3 100644
--- a/java/org/apache/catalina/filters/LocalStrings.properties
+++ b/java/org/apache/catalina/filters/LocalStrings.properties
@@ -61,6 +61,7 @@ remoteCidrFilter.noRemoteIp=Client does not have an IP
address. Request denied.
remoteIpFilter.invalidHostHeader=Invalid value [{0}] found for Host in HTTP
header [{1}]
remoteIpFilter.invalidHostWithPort=Host value [{0}] in HTTP header [{1}]
included a port number which will be ignored
remoteIpFilter.invalidNumber=Illegal number for parameter [{0}]: [{1}]
+remoteIpFilter.invalidPort=Port [{0}] in HTTP header [{1}] included a port
number which will be ignored
remoteIpFilter.invalidRemoteAddress=Unable to determine the remote host
because the reported remote address [{0}] is not valid
requestFilter.deny=Denied request for [{0}] based on property [{1}]
diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java
b/java/org/apache/catalina/filters/RemoteIpFilter.java
index 6fd69c9668..5cafd30ab2 100644
--- a/java/org/apache/catalina/filters/RemoteIpFilter.java
+++ b/java/org/apache/catalina/filters/RemoteIpFilter.java
@@ -893,8 +893,8 @@ public class RemoteIpFilter implements Filter {
}
request.setAttribute(Globals.REQUEST_FORWARDED_ATTRIBUTE,
Boolean.TRUE);
-if (log.isDebugEnabled()) {
-log.debug("Incoming request " + request.getRequestURI() + "
with originalRemoteAddr [" +
+if (log.isTraceEnabled()) {
+log.trace("Incoming request " + request.getRequestURI() + "
with originalRemoteAddr [" +
request.getRemoteAddr() + "], originalRemoteHost=[" +
request.getRemoteHost() +
"], originalSecure=[" + request.isSecure() + "],
originalScheme=[" + request.getScheme() +
"], originalServerName=[" + request.getServerName() +
"], originalServerPort=[" +
@@ -913,8 +913,8 @@ public class RemoteIpFilter implements Filter {
}
chain.doFilter(xRequest, response);
} else {
-if (log.isDebugEnabled()) {
-log.debug("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
+if (log.isTraceEnabled()) {
+log.trace("Skip RemoteIpFilter for request " +
request.getRequestURI() + " with originalRemoteAddr '" +
request.getRemoteAddr() + "'");
}
chain.doFilter(request, response);
@@ -949,8 +949,7 @@ public class RemoteIpFilter implements Filter {
try {
port = Integer.parseInt(portHeaderValue);
} catch (NumberFormatException nfe) {
-log.debug("Invalid port value [" + portHeaderValue + "]
provided in header [" + getPortHeader() +
-"]");
+log.debug(sm.getString("remoteIpFilter.invalidPort
(tomcat-native) 02/02: Update ignores
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-native.git commit b58545d82de7b970413b5323e68c029cb6fe9782 Author: Mark Thomas AuthorDate: Fri Feb 2 16:25:08 2024 + Update ignores --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5db8bcac8..8db794e69 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ /native/configure~ /native/libtcnative-1.la /native/libtcnative-2.la +/native/libtool /native/tcnative.pc /native/tcnative.spec - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch main updated (369f896b3 -> b58545d82)
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-native.git from 369f896b3 Happy New Year 2024 new c8ed30a9e Update recommended OpenSSL version to 3.0.13 new b58545d82 Update ignores 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: .gitignore| 1 + native/download_deps.sh | 2 +- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) 01/02: Update recommended OpenSSL version to 3.0.13
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-native.git commit c8ed30a9e30b5e6832535adfaee224861d626908 Author: Mark Thomas AuthorDate: Fri Feb 2 16:24:43 2024 + Update recommended OpenSSL version to 3.0.13 --- native/download_deps.sh | 2 +- native/srclib/VERSIONS| 2 +- xdocs/miscellaneous/changelog.xml | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/native/download_deps.sh b/native/download_deps.sh index fee1db225..0fb7a269a 100755 --- a/native/download_deps.sh +++ b/native/download_deps.sh @@ -5,7 +5,7 @@ cd $(dirname $0) -SSL=openssl-3.0.10.tar.gz +SSL=openssl-3.0.13.tar.gz APR=apr-1.7.4.tar.gz mkdir -p deps diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS index 55dac6b37..bcf485a99 100644 --- a/native/srclib/VERSIONS +++ b/native/srclib/VERSIONS @@ -5,7 +5,7 @@ The current minimum versions are: The following version of the libraries are recommended: - APR 1.7.4 or later, http://apr.apache.org -- OpenSSL 3.0.11 or later, http://www.openssl.org +- OpenSSL 3.0.13 or later, http://www.openssl.org Older versions should also work but are not as thoroughly tested by the Tomcat Native team diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml index 42a242b42..a14324ecc 100644 --- a/xdocs/miscellaneous/changelog.xml +++ b/xdocs/miscellaneous/changelog.xml @@ -66,6 +66,9 @@ longer set. Only the explicitly configured trust store, if any, will be used. (michaelo) + + Update the recommended minimum version of OpenSSL to 3.0.13. (markt) + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.8
Mark, On 2/2/24 10:53, Mark Thomas wrote: The proposed Apache Tomcat migration tool for Jakarta EE 1.0.8 is now available for voting. The significant changes since 1.0.7 are: - Recognize .ear files as archives - Include .jspf and .tagf files in the conversion process - Update dependencies It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.8/ The Maven staging repository is: https://repository.apache.org/content/repositories/orgapachetomcat-1479/ The tag is: https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.8 7c1559661980d93e84b947682c67959165abbc4a The proposed 1.0.8 release is: [ ] -1: Broken. Do not release because... [ ] +1: Acceptable. Go ahead and release. +1 for stable release Builds from source and passes the "verify" target (aka unit tests). Running the "shaded" version of the JAR file worked on the first try with an application written using Java EE APIs and associated (legacy) libraries. A quick smoke-test in Tomcat 10.1.18 using the migrated WAR file indicates that everything is working as expected. Details: MacOS X Ventura x86-64 Java 21 Maven 3.8.1 Running "mvn package" results in lots of stack traces being dumped to the console, mostly java.lang.instrument.IllegalClassFormatException coming from JaCoCo and some failed unit tests. I get warnings about weak DSA signatures for the JAR signatures. The "signed" JAR files also say they are not signed when I check with "jarsigned -verify [jar]". Is that expected if I perform the build locally? -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 1.0.8
On 02/02/2024 18:19, Christopher Schultz wrote: Mark, On 2/2/24 10:53, Mark Thomas wrote: The proposed Apache Tomcat migration tool for Jakarta EE 1.0.8 is now available for voting. The significant changes since 1.0.7 are: - Recognize .ear files as archives - Include .jspf and .tagf files in the conversion process - Update dependencies It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v1.0.8/ The Maven staging repository is: https://repository.apache.org/content/repositories/orgapachetomcat-1479/ The tag is: https://github.com/apache/tomcat-jakartaee-migration/tree/1.0.8 7c1559661980d93e84b947682c67959165abbc4a The proposed 1.0.8 release is: [ ] -1: Broken. Do not release because... [ ] +1: Acceptable. Go ahead and release. +1 for stable release Builds from source and passes the "verify" target (aka unit tests). Running the "shaded" version of the JAR file worked on the first try with an application written using Java EE APIs and associated (legacy) libraries. A quick smoke-test in Tomcat 10.1.18 using the migrated WAR file indicates that everything is working as expected. Details: MacOS X Ventura x86-64 Java 21 Maven 3.8.1 Running "mvn package" results in lots of stack traces being dumped to the console, mostly java.lang.instrument.IllegalClassFormatException coming from JaCoCo and some failed unit tests. I get warnings about weak DSA signatures for the JAR signatures. The "signed" JAR files also say they are not signed when I check with "jarsigned -verify [jar]". Is that expected if I perform the build locally? I don't think I've tried the build with Java 21. I'm using Java 17 for that at the moment. I'll try 21 and see what happens. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz 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 7bd5624cda Fix typo 7bd5624cda is described below commit 7bd5624cda984ab133298f9d0a126e0af8fcfbf6 Author: Christopher Schultz AuthorDate: Fri Feb 2 14:54:50 2024 -0500 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 332473489d..6a2b231ae6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -1231,7 +1231,7 @@ 66524 Correct eviction ordering in WebResource cache to -by LRU as intended. (schultz) +be LRU as intended. (schultz) Add support code for custom user attributes in RealmBase. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 10.1.x updated (00454f7a3c -> 0d4cb3c584)
This is an automated email from the ASF dual-hosted git repository. schultz pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 00454f7a3c Differentiate trace and debug log levels new a6c9c0f315 Set git branch correctly. new 0d4cb3c584 Fix typo 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: build.properties.default | 2 +- webapps/docs/changelog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Set git branch correctly.
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit a6c9c0f3157c04326794953062a63de1d8777331 Author: Christopher Schultz AuthorDate: Fri Feb 2 14:47:08 2024 -0500 Set git branch correctly. --- build.properties.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.properties.default b/build.properties.default index d3df06b9c7..1038a90f62 100644 --- a/build.properties.default +++ b/build.properties.default @@ -45,7 +45,7 @@ compile.debug=true compile.deprecation=false # - Documentation properties - -git.branch=main +git.branch=10.1.x # - Code quality tools # Note enabling validation uses Checkstyle which is LGPL licensed - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 0d4cb3c584ed9b3dd29586c2746b9c188d84203c Author: Christopher Schultz AuthorDate: Fri Feb 2 14:54:50 2024 -0500 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 0cf9636f6e..9f72fb2e1c 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -1078,7 +1078,7 @@ 66524 Correct eviction ordering in WebResource cache to -by LRU as intended. (schultz) +be LRU as intended. (schultz) Use server.xml to reduce the default value of - 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: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz 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 dc3af5ce56 Fix typo dc3af5ce56 is described below commit dc3af5ce56a33f5b951aac9153e8eb775a8c81c7 Author: Christopher Schultz AuthorDate: Fri Feb 2 14:54:50 2024 -0500 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 9530ce2c1b..4d747757f4 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -1070,7 +1070,7 @@ 66524 Correct eviction ordering in WebResource cache to -by LRU as intended. (schultz) +be LRU as intended. (schultz) Use server.xml to reduce the default value of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 8.5.x updated: Fix typo
This is an automated email from the ASF dual-hosted git repository. schultz pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/8.5.x by this push: new 745815f9f7 Fix typo 745815f9f7 is described below commit 745815f9f7b7948f60eda9a186f72dd2a90f5687 Author: Christopher Schultz AuthorDate: Fri Feb 2 14:54:50 2024 -0500 Fix typo --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index e44b6c2d2d..e4d17b67a6 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -990,7 +990,7 @@ 66524 Correct eviction ordering in WebResource cache to -by LRU as intended. (schultz) +be LRU as intended. (schultz) Use server.xml to reduce the default value of - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 ec96773985 Differentiate trace and debug log levels
ec96773985 is described below
commit ec96773985a374d320cf75679fd5a753e25e12b7
Author: remm
AuthorDate: Fri Feb 2 22:14:39 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/mapper/Mapper.java| 4 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 26 ++---
java/org/apache/catalina/realm/CombinedRealm.java | 74 ++---
.../catalina/realm/JAASMemoryLoginModule.java | 16 +--
java/org/apache/catalina/realm/JAASRealm.java | 34 +++---
java/org/apache/catalina/realm/JNDIRealm.java | 32 +++---
java/org/apache/catalina/realm/MemoryRealm.java| 4 +-
java/org/apache/catalina/realm/RealmBase.java | 114 ++---
8 files changed, 154 insertions(+), 150 deletions(-)
diff --git a/java/org/apache/catalina/mapper/Mapper.java
b/java/org/apache/catalina/mapper/Mapper.java
index 40c214fd87..c07c6c12ff 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -520,8 +520,8 @@ public final class Mapper {
protected void removeWrapper(ContextVersion context, String path) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("mapper.removeWrapper", context.name,
path));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("mapper.removeWrapper", context.name,
path));
}
synchronized (context) {
diff --git
a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
index c688b6e515..feba89cf8e 100644
--- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
@@ -130,8 +130,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Binding binding = bindings.next();
String name = prefix + binding.getName();
Object value = context.lookup(binding.getName());
-if (log.isDebugEnabled()) {
-log.debug("Checking resource " + name);
+if (log.isTraceEnabled()) {
+log.trace("Checking resource " + name);
}
if (value instanceof Context) {
createMBeans(name + "/", (Context) value);
@@ -162,9 +162,9 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
protected void createMBeans(String name, UserDatabase database) throws
Exception {
// Create the MBean for the UserDatabase itself
-if (log.isDebugEnabled()) {
-log.debug("Creating UserDatabase MBeans for resource " + name);
-log.debug("Database=" + database);
+if (log.isTraceEnabled()) {
+log.trace("Creating UserDatabase MBeans for resource " + name);
+log.trace("Database=" + database);
}
try {
MBeanUtils.createMBean(database);
@@ -181,8 +181,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator roles = database.getRoles();
while (roles.hasNext()) {
Role role = roles.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Role MBean for role " + role);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Role MBean for role " + role);
}
try {
MBeanUtils.createMBean(role);
@@ -196,8 +196,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator groups = database.getGroups();
while (groups.hasNext()) {
Group group = groups.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Group MBean for group " + group);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Group MBean for group " + group);
}
try {
MBeanUtils.createMBean(group);
@@ -211,8 +211,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator users = database.getUsers();
while (users.hasNext()) {
User user = users.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating User MBean for user " + user);
+if (log.isTraceEnabled()) {
+log.trace(" Creating User MBean for user " + user);
}
try {
MBeanUtils.createMBean(user);
@@ -228,8 +228,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListen
(tomcat) branch 10.1.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new fb50c95b0c Differentiate trace and debug log levels
fb50c95b0c is described below
commit fb50c95b0c520c56462f1f3a9acc857cf2e2130c
Author: remm
AuthorDate: Fri Feb 2 22:14:39 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/mapper/Mapper.java| 4 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 26 ++---
java/org/apache/catalina/realm/CombinedRealm.java | 74 ++---
.../catalina/realm/JAASMemoryLoginModule.java | 16 +--
java/org/apache/catalina/realm/JAASRealm.java | 34 +++---
java/org/apache/catalina/realm/JNDIRealm.java | 32 +++---
java/org/apache/catalina/realm/MemoryRealm.java| 4 +-
java/org/apache/catalina/realm/RealmBase.java | 114 ++---
8 files changed, 154 insertions(+), 150 deletions(-)
diff --git a/java/org/apache/catalina/mapper/Mapper.java
b/java/org/apache/catalina/mapper/Mapper.java
index 19f4f7f55a..3edecb151c 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -508,8 +508,8 @@ public final class Mapper {
protected void removeWrapper(ContextVersion context, String path) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("mapper.removeWrapper", context.name,
path));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("mapper.removeWrapper", context.name,
path));
}
synchronized (context) {
diff --git
a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
index c688b6e515..feba89cf8e 100644
--- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
@@ -130,8 +130,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Binding binding = bindings.next();
String name = prefix + binding.getName();
Object value = context.lookup(binding.getName());
-if (log.isDebugEnabled()) {
-log.debug("Checking resource " + name);
+if (log.isTraceEnabled()) {
+log.trace("Checking resource " + name);
}
if (value instanceof Context) {
createMBeans(name + "/", (Context) value);
@@ -162,9 +162,9 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
protected void createMBeans(String name, UserDatabase database) throws
Exception {
// Create the MBean for the UserDatabase itself
-if (log.isDebugEnabled()) {
-log.debug("Creating UserDatabase MBeans for resource " + name);
-log.debug("Database=" + database);
+if (log.isTraceEnabled()) {
+log.trace("Creating UserDatabase MBeans for resource " + name);
+log.trace("Database=" + database);
}
try {
MBeanUtils.createMBean(database);
@@ -181,8 +181,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator roles = database.getRoles();
while (roles.hasNext()) {
Role role = roles.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Role MBean for role " + role);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Role MBean for role " + role);
}
try {
MBeanUtils.createMBean(role);
@@ -196,8 +196,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator groups = database.getGroups();
while (groups.hasNext()) {
Group group = groups.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Group MBean for group " + group);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Group MBean for group " + group);
}
try {
MBeanUtils.createMBean(group);
@@ -211,8 +211,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator users = database.getUsers();
while (users.hasNext()) {
User user = users.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating User MBean for user " + user);
+if (log.isTraceEnabled()) {
+log.trace(" Creating User MBean for user " + user);
}
try {
MBeanUtils.createMBean(user);
@@ -228,8 +228,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleLi
(tomcat) branch 9.0.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm 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 ba6071bed3 Differentiate trace and debug log levels
ba6071bed3 is described below
commit ba6071bed33b4b64091500c7d3603924ac17ccae
Author: remm
AuthorDate: Fri Feb 2 22:14:39 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/mapper/Mapper.java| 4 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 26 ++---
java/org/apache/catalina/realm/CombinedRealm.java | 74 ++---
.../catalina/realm/JAASMemoryLoginModule.java | 16 +--
java/org/apache/catalina/realm/JAASRealm.java | 34 +++---
java/org/apache/catalina/realm/JNDIRealm.java | 32 +++---
java/org/apache/catalina/realm/MemoryRealm.java| 4 +-
java/org/apache/catalina/realm/RealmBase.java | 114 ++---
8 files changed, 154 insertions(+), 150 deletions(-)
diff --git a/java/org/apache/catalina/mapper/Mapper.java
b/java/org/apache/catalina/mapper/Mapper.java
index 61d4c9c177..b46efbe382 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -508,8 +508,8 @@ public final class Mapper {
protected void removeWrapper(ContextVersion context, String path) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("mapper.removeWrapper", context.name,
path));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("mapper.removeWrapper", context.name,
path));
}
synchronized (context) {
diff --git
a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
index c688b6e515..feba89cf8e 100644
--- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
@@ -130,8 +130,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Binding binding = bindings.next();
String name = prefix + binding.getName();
Object value = context.lookup(binding.getName());
-if (log.isDebugEnabled()) {
-log.debug("Checking resource " + name);
+if (log.isTraceEnabled()) {
+log.trace("Checking resource " + name);
}
if (value instanceof Context) {
createMBeans(name + "/", (Context) value);
@@ -162,9 +162,9 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
protected void createMBeans(String name, UserDatabase database) throws
Exception {
// Create the MBean for the UserDatabase itself
-if (log.isDebugEnabled()) {
-log.debug("Creating UserDatabase MBeans for resource " + name);
-log.debug("Database=" + database);
+if (log.isTraceEnabled()) {
+log.trace("Creating UserDatabase MBeans for resource " + name);
+log.trace("Database=" + database);
}
try {
MBeanUtils.createMBean(database);
@@ -181,8 +181,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator roles = database.getRoles();
while (roles.hasNext()) {
Role role = roles.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Role MBean for role " + role);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Role MBean for role " + role);
}
try {
MBeanUtils.createMBean(role);
@@ -196,8 +196,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator groups = database.getGroups();
while (groups.hasNext()) {
Group group = groups.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Group MBean for group " + group);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Group MBean for group " + group);
}
try {
MBeanUtils.createMBean(group);
@@ -211,8 +211,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator users = database.getUsers();
while (users.hasNext()) {
User user = users.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating User MBean for user " + user);
+if (log.isTraceEnabled()) {
+log.trace(" Creating User MBean for user " + user);
}
try {
MBeanUtils.createMBean(user);
@@ -228,8 +228,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleList
(tomcat) branch 8.5.x updated: Differentiate trace and debug log levels
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new c2b1ae0b4e Differentiate trace and debug log levels
c2b1ae0b4e is described below
commit c2b1ae0b4e86e41387e8eea394c76215cefd928e
Author: remm
AuthorDate: Fri Feb 2 22:14:39 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/catalina/mapper/Mapper.java| 4 +-
.../mbeans/GlobalResourcesLifecycleListener.java | 26 ++---
java/org/apache/catalina/realm/CombinedRealm.java | 74 ++---
.../catalina/realm/JAASMemoryLoginModule.java | 16 +--
java/org/apache/catalina/realm/JAASRealm.java | 34 +++---
java/org/apache/catalina/realm/JNDIRealm.java | 32 +++---
java/org/apache/catalina/realm/MemoryRealm.java| 4 +-
java/org/apache/catalina/realm/RealmBase.java | 114 ++---
8 files changed, 154 insertions(+), 150 deletions(-)
diff --git a/java/org/apache/catalina/mapper/Mapper.java
b/java/org/apache/catalina/mapper/Mapper.java
index c38e73fe5b..0d594bedf8 100644
--- a/java/org/apache/catalina/mapper/Mapper.java
+++ b/java/org/apache/catalina/mapper/Mapper.java
@@ -507,8 +507,8 @@ public final class Mapper {
protected void removeWrapper(ContextVersion context, String path) {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("mapper.removeWrapper", context.name,
path));
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("mapper.removeWrapper", context.name,
path));
}
synchronized (context) {
diff --git
a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
index db858028ba..0c2b778aa9 100644
--- a/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
+++ b/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
@@ -137,8 +137,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Binding binding = bindings.next();
String name = prefix + binding.getName();
Object value = context.lookup(binding.getName());
-if (log.isDebugEnabled()) {
-log.debug("Checking resource " + name);
+if (log.isTraceEnabled()) {
+log.trace("Checking resource " + name);
}
if (value instanceof Context) {
createMBeans(name + "/", (Context) value);
@@ -169,9 +169,9 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
protected void createMBeans(String name, UserDatabase database) throws
Exception {
// Create the MBean for the UserDatabase itself
-if (log.isDebugEnabled()) {
-log.debug("Creating UserDatabase MBeans for resource " + name);
-log.debug("Database=" + database);
+if (log.isTraceEnabled()) {
+log.trace("Creating UserDatabase MBeans for resource " + name);
+log.trace("Database=" + database);
}
try {
MBeanUtils.createMBean(database);
@@ -183,8 +183,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator roles = database.getRoles();
while (roles.hasNext()) {
Role role = roles.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Role MBean for role " + role);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Role MBean for role " + role);
}
try {
MBeanUtils.createMBean(role);
@@ -198,8 +198,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator groups = database.getGroups();
while (groups.hasNext()) {
Group group = groups.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating Group MBean for group " + group);
+if (log.isTraceEnabled()) {
+log.trace(" Creating Group MBean for group " + group);
}
try {
MBeanUtils.createMBean(group);
@@ -213,8 +213,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleListener {
Iterator users = database.getUsers();
while (users.hasNext()) {
User user = users.next();
-if (log.isDebugEnabled()) {
-log.debug(" Creating User MBean for user " + user);
+if (log.isTraceEnabled()) {
+log.trace(" Creating User MBean for user " + user);
}
try {
MBeanUtils.createMBean(user);
@@ -230,8 +230,8 @@ public class GlobalResourcesLifecycleListener implements
LifecycleList
[Bug 68572] New: migration tool does not conver xmlrpc-server3.0.jar to be jakarta compliant
https://bz.apache.org/bugzilla/show_bug.cgi?id=68572 Bug ID: 68572 Summary: migration tool does not conver xmlrpc-server3.0.jar to be jakarta compliant Product: Tomcat 10 Version: 10.1.18 Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Servlet Assignee: dev@tomcat.apache.org Reporter: rn...@westwoodone.com Target Milestone: -- I have an application that use this apache xmlrpc jar. xmlrpc-server3.0.jar That jar is non jakarta compliant and so Tomcat !0 fails to load classes in it. I ran the the Tomcat migration tool (jakartaee-migration-1.0.0 )on that jar but tomcat 10 still wants to run some javax.servlet code in it it. I am getting errors .. 02-Feb-2024 15:51:35.420 SEVERE [http-nio-8588-exec-1] org.apache.catalina.core.StandardWrapperValve.invoke Allocate exception for servlet [RVXmlRpcServlet] java.lang.ClassNotFoundException: javax.servlet.http.HttpServlet at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:440) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:587) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:520) at java.base/java.lang.ClassLoader.defineClass1(Native Method) at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1012) at java.base/java.security.SecureClassLoader.defineClass(SecureClassLoader.java:150) at java.base/java.net.URLClassLoader.defineClass(URLClassLoader.java:519) at java.base/java.net.URLClassLoader$1.run(URLClassLoader.java:427) at java.base/java.net.URLClassLoader$1.run(URLClassLoader.java:421) at java.base/java.security.AccessController.doPrivileged(AccessController.java:712) at java.base/java.net.URLClassLoader.findClass(URLClassLoader.java:420) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:587) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:520) at java.base/java.lang.Class.forName0(Native Method) at java.base/java.lang.Class.forName(Class.java:467) at org.apache.catalina.loader.WebappClassLoaderBase.loadClass(WebappClassLoaderBase.java:1337) at org.apache.catalina.loader.WebappClassLoaderBase.loadClass(WebappClassLoaderBase.java:1165) at java.base/java.lang.ClassLoader.defineClass1(Native Method) at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1012) at java.base/java.security.SecureClassLoader.defineClass(SecureClassLoader.java:150) at org.apache.catalina.loader.WebappClassLoaderBase.findClassInternal(WebappClassLoaderBase.java:2352) at org.apache.catalina.loader.WebappClassLoaderBase.findClass(WebappClassLoaderBase.java:800) at org.apache.catalina.loader.WebappClassLoaderBase.loadClass(WebappClassLoaderBase.java:1317) at org.apache.catalina.loader.WebappClassLoaderBase.loadClass(WebappClassLoaderBase.java:1165) at org.apache.catalina.core.DefaultInstanceManager.loadClass(DefaultInstanceManager.java:491) at org.apache.catalina.core.DefaultInstanceManager.loadClassMaybePrivileged(DefaultInstanceManager.java:473) at org.apache.catalina.core.DefaultInstanceManager.newInstance(DefaultInstanceManager.java:143) at org.apache.catalina.core.StandardWrapper.loadServlet(StandardWrapper.java:865) at org.apache.catalina.core.StandardWrapper.allocate(StandardWrapper.java:649) at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:115) at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:90) at org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:482) at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:115) at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:93) at org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:673) at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:74) at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:340) at org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:391) at org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:63) at org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:896) at org.apache.tomcat.util.net.NioEndpoint$SocketProcessor.doRun(
