Buildbot success in on tomcat-9.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/844 Blamelist: Mark Thomas , remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 9.0.x] 8cc2348e8e3a27997fc17493fe6ed9405130a513 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Update JSign to 6.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d5fd9d409f70c6a308c4c3bfdcb1b6376f7d5f8b
Author: Mark Thomas
AuthorDate: Mon Feb 5 21:16:46 2024 +
Update JSign to 6.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 4209720c90..ffce6fa232 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -307,10 +307,10 @@ spotbugs.jar=${spotbugs.home}/lib/spotbugs-ant.jar
spotbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${spotbugs.version}/spotbugs-${spotbugs.version}.tgz
# - JSign, version 4.1 or later -
-jsign.version=5.0
+jsign.version=6.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
+jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 175dc9e226..17f429cb78 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -172,6 +172,9 @@
Update Checkstyle to 10.13.0. (markt)
+
+Update JSign to 6.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Update Checkstyle to 10.13.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit f56a7776a6ac548c19aa585d2c178c1a576504b5
Author: Mark Thomas
AuthorDate: Mon Feb 5 21:14:54 2024 +
Update Checkstyle to 10.13.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ec7021c685..4209720c90 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -280,10 +280,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.7
+checkstyle.version=10.13.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=6cb52796a8c52d190b881068b027fd18437a098e4cdaa89ddd70c29992ef6a4e1e50696f9246ff6a77a95743449d109068e215896b09cb98fc27afbe489596be
+checkstyle.checksum.value=209f015d6d2d1a7fb44e6552e090ab77e78ac7dc8aff1c4fa96ce413a1f9715d0e7896b10213f643b140d376a7861ae51893f878cc27fcefb70d73731e2213a0
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d4f0d0697f..175dc9e226 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -167,6 +167,13 @@
+
+
+
+Update Checkstyle to 10.13.0. (markt)
+
+
+
-
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 (25549013df -> d5fd9d409f)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 25549013df Add missing strings new f56a7776a6 Update Checkstyle to 10.13.0 new d5fd9d409f Update JSign to 6.0 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 | 8 webapps/docs/changelog.xml | 10 ++ 2 files changed, 14 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/02: Update JSign to 6.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 8cc2348e8e3a27997fc17493fe6ed9405130a513
Author: Mark Thomas
AuthorDate: Mon Feb 5 21:16:46 2024 +
Update JSign to 6.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index b8dadced12..2ec1dbfb16 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -314,10 +314,10 @@ bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
# - JSign, version 4.1 or later -
-jsign.version=5.0
+jsign.version=6.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
+jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e7febeb757..7cbb3c3d9e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -178,6 +178,9 @@
Update Checkstyle to 10.13.0. (markt)
+
+Update JSign to 6.0. (markt)
+
-
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 (6116c09e4a -> 8cc2348e8e)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 6116c09e4a Add missing strings new c84b39bc56 Update Checkstyle to 10.13.0 new 8cc2348e8e Update JSign to 6.0 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 | 8 webapps/docs/changelog.xml | 10 ++ 2 files changed, 14 insertions(+), 4 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: Update Checkstyle to 10.13.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c84b39bc561b11cb574046a1bab4d02488937e0e
Author: Mark Thomas
AuthorDate: Mon Feb 5 21:14:54 2024 +
Update Checkstyle to 10.13.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 7 +++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 1f75f1f0d1..b8dadced12 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -276,10 +276,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.7
+checkstyle.version=10.13.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=6cb52796a8c52d190b881068b027fd18437a098e4cdaa89ddd70c29992ef6a4e1e50696f9246ff6a77a95743449d109068e215896b09cb98fc27afbe489596be
+checkstyle.checksum.value=209f015d6d2d1a7fb44e6552e090ab77e78ac7dc8aff1c4fa96ce413a1f9715d0e7896b10213f643b140d376a7861ae51893f878cc27fcefb70d73731e2213a0
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index cc664889e5..e7febeb757 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -173,6 +173,13 @@
+
+
+
+Update Checkstyle to 10.13.0. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Update the migration tool for Jakarta EE to 1.0.8
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 4f916e54e255094cf03ae31307c63d289dd8b981
Author: Mark Thomas
AuthorDate: Tue Feb 6 22:21:22 2024 +
Update the migration tool for Jakarta EE to 1.0.8
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 4
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index ca72ca23cd..5054a8a65b 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -312,10 +312,10 @@ bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
# - Tomcat Migration Tool for Jakarta EE -
-migration-lib.version=1.0.7
+migration-lib.version=1.0.8
migration-lib.checksum.enabled=true
migration-lib.checksum.algorithm=MD5|SHA-1
-migration-lib.checksum.value=378eeda7171284210688349f31e60e73|2baf7f729b409b47467c2ea998216441bf1c33cc
+migration-lib.checksum.value=bc5265465d7c641bbd5c9f2b057decc1|56eb518000183b5f3eface92fb9e9ccd1cbaee09
migration-lib.home=${base.path}/migration-${migration-lib.version}
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.version}-shaded.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5dd92d309e..b9e76cf398 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,10 @@
Update JSign to 6.0. (markt)
+
+Update the packaged version of the Tomcat Migration Tool for Jakarta EE
+to 1.0.7. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Update JSign to 6.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit ee143fba518cbe30264cb75e7742a056203028ef
Author: Mark Thomas
AuthorDate: Mon Feb 5 21:16:46 2024 +
Update JSign to 6.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0961db54ed..ca72ca23cd 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -334,10 +334,10 @@
openssl-lib.jar=${openssl-lib.home}/tomcat-coyote-openssl-java17-${openssl-lib.v
openssl-lib.loc=${base-maven.loc}/org/apache/tomcat/tomcat-coyote-openssl-java17/${openssl-lib.version}/tomcat-coyote-openssl-java17-${openssl-lib.version}.jar
# - JSign, version 4.1 or later -
-jsign.version=5.0
+jsign.version=6.0
jsign.checksum.enabled=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=79c4f9bdff74a4ccee3d72f020ad45b7|5a6677625413e0d8acb52f80fa6fbb9031a6a9d0
+jsign.checksum.value=c14fe256b5bc42dc6934d3ce7b659cdf|d2f1a60711c3b51123f84cd9e04dd9d482d95f5e
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 98db9379d9..5dd92d309e 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -188,6 +188,9 @@
Update Checkstyle to 10.13.0. (markt)
+
+Update JSign to 6.0. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Update Checkstyle to 10.13.0
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit a0fb026df75d3bd4c89ecab7ec38a151a0d2acd7
Author: Mark Thomas
AuthorDate: Mon Feb 5 21:14:54 2024 +
Update Checkstyle to 10.13.0
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 1038a90f62..0961db54ed 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -274,10 +274,10 @@
unboundid.jar=${unboundid.home}/unboundid-ldapsdk-${unboundid.version}.jar
unboundid.loc=${base-maven.loc}/com/unboundid/unboundid-ldapsdk/${unboundid.version}/unboundid-ldapsdk-${unboundid.version}.jar
# - Checkstyle, version 6.16 or later -
-checkstyle.version=10.12.7
+checkstyle.version=10.13.0
checkstyle.checksum.enabled=true
checkstyle.checksum.algorithm=SHA-512
-checkstyle.checksum.value=6cb52796a8c52d190b881068b027fd18437a098e4cdaa89ddd70c29992ef6a4e1e50696f9246ff6a77a95743449d109068e215896b09cb98fc27afbe489596be
+checkstyle.checksum.value=209f015d6d2d1a7fb44e6552e090ab77e78ac7dc8aff1c4fa96ce413a1f9715d0e7896b10213f643b140d376a7861ae51893f878cc27fcefb70d73731e2213a0
checkstyle.home=${base.path}/checkstyle-${checkstyle.version}
checkstyle.jar=${checkstyle.home}/checkstyle-${checkstyle.version}-all.jar
checkstyle.loc=${base-gh.loc}/checkstyle/checkstyle/releases/download/checkstyle-${checkstyle.version}/checkstyle-${checkstyle.version}-all.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4771cdb309..98db9379d9 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -185,6 +185,9 @@
names. Based on pull request 685 provided by Paul A.
Nicolucci.
(markt)
+
+Update Checkstyle to 10.13.0. (markt)
+
-
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 (3537cda971 -> 4f916e54e2)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/tomcat.git from 3537cda971 Add missing strings new a0fb026df7 Update Checkstyle to 10.13.0 new ee143fba51 Update JSign to 6.0 new 4f916e54e2 Update the migration tool for Jakarta EE to 1.0.8 The 3 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 | 12 ++-- webapps/docs/changelog.xml | 10 ++ 2 files changed, 16 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Update the migration tool for Jakarta EE to 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.git
The following commit(s) were added to refs/heads/main by this push:
new 4187f2b577 Update the migration tool for Jakarta EE to 1.0.8
4187f2b577 is described below
commit 4187f2b5772063aa6e215bd570c095abfb17b50b
Author: Mark Thomas
AuthorDate: Tue Feb 6 22:21:22 2024 +
Update the migration tool for Jakarta EE to 1.0.8
---
build.properties.default | 4 ++--
webapps/docs/changelog.xml | 4
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 54f679fdd7..dd326dc16f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -291,10 +291,10 @@ bnd.jar=${bnd.home}/biz.aQute.bnd-${bnd.version}.jar
bnd.loc=${base-maven.loc}/biz/aQute/bnd/biz.aQute.bnd/${bnd.version}/biz.aQute.bnd-${bnd.version}.jar
# - Tomcat Migration Tool for Jakarta EE -
-migration-lib.version=1.0.7
+migration-lib.version=1.0.8
migration-lib.checksum.enabled=true
migration-lib.checksum.algorithm=MD5|SHA-1
-migration-lib.checksum.value=378eeda7171284210688349f31e60e73|2baf7f729b409b47467c2ea998216441bf1c33cc
+migration-lib.checksum.value=bc5265465d7c641bbd5c9f2b057decc1|56eb518000183b5f3eface92fb9e9ccd1cbaee09
migration-lib.home=${base.path}/migration-${migration-lib.version}
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.version}-shaded.jar
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1bd714f60c..725f0ee94d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -206,6 +206,10 @@
Update JSign to 6.0. (markt)
+
+Update the packaged version of the Tomcat Migration Tool for Jakarta EE
+to 1.0.7. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Moving to Tomcat Native 1.3.x
Mark, On 2/6/24 11:44, Mark Thomas wrote: On 06/02/2024 11:22, Michael Osipov wrote: On 2024/02/04 19:54:25 Mark Thomas wrote: Hi all, AS you have probably noticed I am working on another round of Tomcat Native releases. We are overdue on switching to 1.3.x so I would like to propose the following with this release round: - create a new 1.3.x branch from the current 1.2.x HEAD - update minimum OpenSSL to 1.1.1 - update minimum APR to 1.6.3 - remove code supporting OpenSSL < 1.1.1 Good, you have basically picked up https://bz.apache.org/bugzilla/show_bug.cgi?id=67683. You have missed at least two spots: * https://github.com/apache/tomcat-native/blob/f6e1474c6b05e9cab0ad308647a3bde533c1cbce/native/build/tcnative.m4#L41-L45 * https://github.com/apache/tomcat-native/blob/f6e1474c6b05e9cab0ad308647a3bde533c1cbce/native/src/jnilib.c#L77-L81 Thanks for pointing those out. There may be more. I'll fix them as we spot them. I don't see either of these as reasons to halt the 1.3.0 release. If anyone has a different view, please comment on the vote thread. The next 8.5.x and 9.0.x releases would then ship with Tomcat Native 1.3.0 but minimum required/recommended Tomcat Native versions would not change. I wouldn't bother with 8.5 and 1.3, I'd use 1.2.x until end of 8.5 and the put 1.2.x EOL. I'm still leaning towards switching 8.5.x to 1.3.0 but if the consensus is to stcik with the current 1.2.x release I'm fine with that. I'm mainly trying to avoid another 1.2.x release on top of all the other releases I am juggling at the moment. I'm not sure I would bother. Just leave 8.5.x at the current libtcnative level. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68593] Request Context is replaced after restoreRequest()
https://bz.apache.org/bugzilla/show_bug.cgi?id=68593 Christopher Schultz changed: What|Removed |Added Status|NEW |NEEDINFO OS||All --- Comment #1 from Christopher Schultz --- Can you be specific about the term "context"? If you have specific steps-to-reproduce this issue, please post them including what was expected and what happened instead of what was expected. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r67215 - /release/tomcat/jakartaee-migration/v1.0.7/
Author: markt Date: Tue Feb 6 22:18:06 2024 New Revision: 67215 Log: Drop 1.0.7 from CDN Removed: release/tomcat/jakartaee-migration/v1.0.7/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1915601 - in /tomcat/site/trunk: docs/download-migration.html docs/index.html docs/oldnews.html xdocs/download-migration.xml xdocs/index.xml xdocs/oldnews.xml
Author: markt Date: Tue Feb 6 22:16:34 2024 New Revision: 1915601 URL: http://svn.apache.org/viewvc?rev=1915601=rev Log: Update site for release of migration tool for Jakarta EE 1.0.8 Modified: tomcat/site/trunk/docs/download-migration.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/download-migration.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/download-migration.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-migration.html?rev=1915601=1915600=1915601=diff == --- tomcat/site/trunk/docs/download-migration.html (original) +++ tomcat/site/trunk/docs/download-migration.html Tue Feb 6 22:16:34 2024 @@ -7,7 +7,7 @@ Quick Navigation -[define v]1.0.7[end] +[define v]1.0.8[end] https://downloads.apache.org/tomcat/jakartaee-migration/KEYS;>KEYS | [v] | Browse | Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1915601=1915600=1915601=diff == --- tomcat/site/trunk/docs/index.html (original) +++ tomcat/site/trunk/docs/index.html Tue Feb 6 22:16:34 2024 @@ -34,6 +34,25 @@ wiki page. Apache Tomcat, Tomcat, Apache, the Apache feather, and the Apache Tomcat project logo are trademarks of the Apache Software Foundation. +2024-02-06 Tomcat Migration Tool for Jakarta EE 1.0.8 Released + +The Apache Tomcat Project is proud to announce the release of 1.0.8 of the +Apache Tomcat Migration Tool for Jakarta EE. This release contains a number of +bug fixes and improvements compared to version 1.0.7. +The notable changes in this release are: + +Recognize .ear files as archives +Include .jspf and .tagf files in the conversion process +Update dependencies + + +Full details of these changes, and all the other changes, are available in the +https://github.com/apache/tomcat-jakartaee-migration/blob/main/CHANGES.md;>changelog. + + + +https://tomcat.apache.org/download-migration.cgi;>Download + 2024-01-09 Tomcat 9.0.85 Released The Apache Tomcat Project is proud to announce the release of version 9.0.85 @@ -200,31 +219,6 @@ This version fixes a number of bugs foun https://tomcat.apache.org/download-connectors.cgi;>Download | ChangeLog for 1.2.49 -2023-05-02 Tomcat Migration Tool for Jakarta EE 1.0.7 Released - -The Apache Tomcat Project is proud to announce the release of 1.0.7 of the -Apache Tomcat Migration Tool for Jakarta EE. This release contains a number of -bug fixes and improvements compared to version 1.0.6. -The notable changes in this release are: - -Update OSGI servlet specification versions if present in manifest file. PR -#42 provided by Ivan Furnadjiev. -Add configuration option, matchExcludesAgainstPathName that can be used to -configure exclusions based on path name rather than just file name. PR 38 -provided by Rda Housni Alaoui. -When converting directories, rename files according to the chosen profile. - -Work-around a known JDK bug when converting using the streaming approach. - - - -Full details of these changes, and all the other changes, are available in the -https://github.com/apache/tomcat-jakartaee-migration/blob/main/CHANGES.md;>changelog. - - - -https://tomcat.apache.org/download-migration.cgi;>Download - 2015-03-17 Apache Standard Taglib 1.2.5 Released The Apache Tomcat Project is proud to announce the release of version 1.2.5 of Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1915601=1915600=1915601=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Tue Feb 6 22:16:34 2024 @@ -1156,6 +1156,31 @@ Full details of these changes, and all t https://tomcat.apache.org/download-11.cgi;>Download +2023-05-02 Tomcat Migration Tool for Jakarta EE 1.0.7 Released + +The Apache Tomcat Project is proud to announce the release of 1.0.7 of the +Apache Tomcat Migration Tool for Jakarta EE. This release contains a number of +bug fixes and improvements compared to version 1.0.6. +The notable changes in this release are: + +Update OSGI servlet specification versions if present in manifest file. PR +#42 provided by Ivan Furnadjiev. +Add configuration option, matchExcludesAgainstPathName that can be used to +configure exclusions based on path name rather than just file name. PR 38 +provided by Rda Housni Alaoui. +When converting directories, rename files according to the chosen profile. + +Work-around a known JDK bug when converting using the streaming approach. + + + +Full details of these changes, and all the other changes, are available in the
svn commit: r67214 - /dev/tomcat/jakartaee-migration/v1.0.8/ /release/tomcat/jakartaee-migration/v1.0.8/
Author: markt Date: Tue Feb 6 21:43:58 2024 New Revision: 67214 Log: Release Tomcat migration tool for Jakarta EE 1.0.8 Added: release/tomcat/jakartaee-migration/v1.0.8/ - copied from r67213, dev/tomcat/jakartaee-migration/v1.0.8/ Removed: dev/tomcat/jakartaee-migration/v1.0.8/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot failure in on tomcat-9.0.x
Build status: BUILD FAILED: failed compile (failure) Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/37/builds/843 Blamelist: remm Build Text: failed compile (failure) Status Detected: new failure Build Source Stamp: [branch 9.0.x] 6116c09e4a72ec144f46b8f5be1045c39dfb0785 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 2 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE][RESULT] Apache Tomcat migration tool for Jakarta EE 1.0.8
The following votes were cast: Binding: +1: markt, schultz, remm No other votes were cast. The vote therefore passes. Thanks to everyone who contributed to this release. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Moving to Tomcat Native 1.3.x
On 06/02/2024 11:22, Michael Osipov wrote: On 2024/02/04 19:54:25 Mark Thomas wrote: Hi all, AS you have probably noticed I am working on another round of Tomcat Native releases. We are overdue on switching to 1.3.x so I would like to propose the following with this release round: - create a new 1.3.x branch from the current 1.2.x HEAD - update minimum OpenSSL to 1.1.1 - update minimum APR to 1.6.3 - remove code supporting OpenSSL < 1.1.1 Good, you have basically picked up https://bz.apache.org/bugzilla/show_bug.cgi?id=67683. You have missed at least two spots: * https://github.com/apache/tomcat-native/blob/f6e1474c6b05e9cab0ad308647a3bde533c1cbce/native/build/tcnative.m4#L41-L45 * https://github.com/apache/tomcat-native/blob/f6e1474c6b05e9cab0ad308647a3bde533c1cbce/native/src/jnilib.c#L77-L81 Thanks for pointing those out. There may be more. I'll fix them as we spot them. I don't see either of these as reasons to halt the 1.3.0 release. If anyone has a different view, please comment on the vote thread. The next 8.5.x and 9.0.x releases would then ship with Tomcat Native 1.3.0 but minimum required/recommended Tomcat Native versions would not change. I wouldn't bother with 8.5 and 1.3, I'd use 1.2.x until end of 8.5 and the put 1.2.x EOL. I'm still leaning towards switching 8.5.x to 1.3.0 but if the consensus is to stcik with the current 1.2.x release I'm fine with that. I'm mainly trying to avoid another 1.2.x release on top of all the other releases I am juggling at the moment. Overall sounds like a good plan. I will do also testing here on my side. Tx. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat-native) branch 1.3.x updated: Update minimum APR version in a few more places
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
The following commit(s) were added to refs/heads/1.3.x by this push:
new ef40b6d00 Update minimum APR version in a few more places
ef40b6d00 is described below
commit ef40b6d00c4bdaa23960b5dc0eaac28cce758d29
Author: Mark Thomas
AuthorDate: Tue Feb 6 16:40:25 2024 +
Update minimum APR version in a few more places
---
native/build/tcnative.m4 | 4 ++--
native/src/jnilib.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/native/build/tcnative.m4 b/native/build/tcnative.m4
index eee9710dc..5e663e36e 100644
--- a/native/build/tcnative.m4
+++ b/native/build/tcnative.m4
@@ -38,9 +38,9 @@ AC_DEFUN(TCN_FIND_APR,[
set $sapr_version
IFS=$tc_save_IFS
decimal_apr_version=`printf %02d%02d%03d ${1} ${2} ${3}`
- if test "${decimal_apr_version}" -lt "0104003"
+ if test "${decimal_apr_version}" -lt "0106003"
then
-AC_MSG_ERROR(Found APR $sapr_version. You need version 1.4.3 or newer
installed.)
+AC_MSG_ERROR(Found APR $sapr_version. You need version 1.6.3 or newer
installed.)
fi
AC_MSG_NOTICE(APR $sapr_version detected.)
diff --git a/native/src/jnilib.c b/native/src/jnilib.c
index 6f20dd94f..f46774ac2 100644
--- a/native/src/jnilib.c
+++ b/native/src/jnilib.c
@@ -75,7 +75,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
apr_version();
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
if (apvn < 1603) {
-tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at
least 1.4.3",
+tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at
least 1.6.3",
apr_version_string());
return JNI_ERR;
}
-
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: Add missing strings
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 25549013df Add missing strings
25549013df is described below
commit 25549013df5b8ea7db29db3e5a2916599260c475
Author: remm
AuthorDate: Tue Feb 6 16:01:43 2024 +0100
Add missing strings
---
.../apache/catalina/core/LocalStrings.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 2 +-
.../catalina/session/LocalStrings.properties | 5 +
.../catalina/session/PersistentManagerBase.java| 2 +-
java/org/apache/catalina/session/StoreBase.java| 6 +++---
.../apache/catalina/valves/LocalStrings.properties | 1 +
.../apache/catalina/valves/PersistentValve.java| 2 +-
java/org/apache/tomcat/util/Diagnostics.java | 24 +++---
.../org/apache/tomcat/util/LocalStrings.properties | 2 ++
9 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 84fdc9732b..2be22cd18b 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -233,6 +233,7 @@ standardContext.reloadingCompleted=Reloading Context with
name [{0}] is complete
standardContext.reloadingStarted=Reloading Context with name [{0}] has started
standardContext.requestListener.requestDestroyed=Exception sending request
destroyed lifecycle event to listener instance of class [{0}]
standardContext.requestListener.requestInit=Exception sending request
initialized lifecycle event to listener instance of class [{0}]
+standardContext.resetContextFail=Error resetting Context with name [{0}]
standardContext.resourcesInit=Error initializing static Resources
standardContext.resourcesStart=Error starting static Resources
standardContext.resourcesStop=Error stopping static Resources
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 41b9db4ddc..831be22bb4 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5191,7 +5191,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
try {
resetContext();
} catch (Exception ex) {
-log.error("Error resetting context " + this + " " + ex, ex);
+log.error(sm.getString("standardContext.resetContextFail",
getName()), ex);
}
// reset the instance manager
diff --git a/java/org/apache/catalina/session/LocalStrings.properties
b/java/org/apache/catalina/session/LocalStrings.properties
index 499e98e94d..8f0e54e846 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -49,6 +49,7 @@ persistentManager.backupMaxIdle=Backing up session [{0}] to
Store, idle for [{1}
persistentManager.deserializeError=Error deserializing Session [{0}]
persistentManager.isLoadedError=Error checking if session [{0}] is loaded in
memory
persistentManager.loading=Loading [{0}] persisted sessions
+persistentManager.noStore=No Store configured, persistence disabled
persistentManager.removeError=Error removing session [{0}] from the store
persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
persistentManager.storeClearError=Error clearning all sessions from the store
@@ -94,3 +95,7 @@ standardSession.sessionEvent=Session event listener threw
exception
standardSession.setAttribute.iae=setAttribute: Non-serializable attribute [{0}]
standardSession.setAttribute.ise=setAttribute: Session [{0}] has already been
invalidated
standardSession.setAttribute.namenull=setAttribute: name parameter cannot be
null
+
+store.expireFail=Error processing session expiration for key [{0}]
+store.keysFail=Error getting keys
+store.removeFail=Error removing key [{0}]
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 01e90fa591..c914d2b17a 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -830,7 +830,7 @@ public abstract class PersistentManagerBase extends
ManagerBase implements Store
super.startInternal();
if (store == null) {
-log.error("No Store configured, persistence disabled");
+log.error(sm.getString("persistentManager.noStore"));
} else if (store instanceof Lifecycle) {
((Lifecycle) store).start();
}
diff --git a/java/org/apache/catalina/session/StoreBase.java
b/java/org/apache/catalina/session/StoreBase.java
index 4c0bc1422d..31ddfe9b70 100644
---
(tomcat) branch 9.0.x updated: Add missing strings
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 6116c09e4a Add missing strings
6116c09e4a is described below
commit 6116c09e4a72ec144f46b8f5be1045c39dfb0785
Author: remm
AuthorDate: Tue Feb 6 16:01:43 2024 +0100
Add missing strings
---
.../apache/catalina/core/LocalStrings.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 2 +-
.../catalina/session/LocalStrings.properties | 5 +
.../catalina/session/PersistentManagerBase.java| 2 +-
java/org/apache/catalina/session/StoreBase.java| 6 +++---
.../apache/catalina/valves/LocalStrings.properties | 1 +
.../apache/catalina/valves/PersistentValve.java| 2 +-
java/org/apache/tomcat/util/Diagnostics.java | 24 +++---
.../org/apache/tomcat/util/LocalStrings.properties | 3 +++
9 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index fb2ce9c641..99a0636ae0 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -229,6 +229,7 @@ standardContext.reloadingCompleted=Reloading Context with
name [{0}] is complete
standardContext.reloadingStarted=Reloading Context with name [{0}] has started
standardContext.requestListener.requestDestroyed=Exception sending request
destroyed lifecycle event to listener instance of class [{0}]
standardContext.requestListener.requestInit=Exception sending request
initialized lifecycle event to listener instance of class [{0}]
+standardContext.resetContextFail=Error resetting Context with name [{0}]
standardContext.resourcesInit=Error initializing static Resources
standardContext.resourcesStart=Error starting static Resources
standardContext.resourcesStop=Error stopping static Resources
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 06881238c7..da108e8f41 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5211,7 +5211,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
try {
resetContext();
} catch (Exception ex) {
-log.error("Error resetting context " + this + " " + ex, ex);
+log.error(sm.getString("standardContext.resetContextFail",
getName()), ex);
}
// reset the instance manager
diff --git a/java/org/apache/catalina/session/LocalStrings.properties
b/java/org/apache/catalina/session/LocalStrings.properties
index 499e98e94d..8f0e54e846 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -49,6 +49,7 @@ persistentManager.backupMaxIdle=Backing up session [{0}] to
Store, idle for [{1}
persistentManager.deserializeError=Error deserializing Session [{0}]
persistentManager.isLoadedError=Error checking if session [{0}] is loaded in
memory
persistentManager.loading=Loading [{0}] persisted sessions
+persistentManager.noStore=No Store configured, persistence disabled
persistentManager.removeError=Error removing session [{0}] from the store
persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
persistentManager.storeClearError=Error clearning all sessions from the store
@@ -94,3 +95,7 @@ standardSession.sessionEvent=Session event listener threw
exception
standardSession.setAttribute.iae=setAttribute: Non-serializable attribute [{0}]
standardSession.setAttribute.ise=setAttribute: Session [{0}] has already been
invalidated
standardSession.setAttribute.namenull=setAttribute: name parameter cannot be
null
+
+store.expireFail=Error processing session expiration for key [{0}]
+store.keysFail=Error getting keys
+store.removeFail=Error removing key [{0}]
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 26af3478a4..0f21277b69 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -826,7 +826,7 @@ public abstract class PersistentManagerBase extends
ManagerBase implements Store
super.startInternal();
if (store == null) {
-log.error("No Store configured, persistence disabled");
+log.error(sm.getString("persistentManager.noStore"));
} else if (store instanceof Lifecycle) {
((Lifecycle) store).start();
}
diff --git a/java/org/apache/catalina/session/StoreBase.java
b/java/org/apache/catalina/session/StoreBase.java
index 4c0bc1422d..31ddfe9b70 100644
---
(tomcat) branch 10.1.x updated: Add missing strings
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 3537cda971 Add missing strings
3537cda971 is described below
commit 3537cda97136be3cca659923a34a6ea89c6f6077
Author: remm
AuthorDate: Tue Feb 6 16:01:43 2024 +0100
Add missing strings
---
.../apache/catalina/core/LocalStrings.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 2 +-
.../catalina/session/LocalStrings.properties | 5 +
.../catalina/session/PersistentManagerBase.java| 2 +-
java/org/apache/catalina/session/StoreBase.java| 6 +++---
.../apache/catalina/valves/LocalStrings.properties | 1 +
.../apache/catalina/valves/PersistentValve.java| 2 +-
java/org/apache/tomcat/util/Diagnostics.java | 24 +++---
.../org/apache/tomcat/util/IntrospectionUtils.java | 2 +-
.../org/apache/tomcat/util/LocalStrings.properties | 3 +++
10 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 7095750a91..14a9f73763 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -222,6 +222,7 @@ standardContext.reloadingCompleted=Reloading Context with
name [{0}] is complete
standardContext.reloadingStarted=Reloading Context with name [{0}] has started
standardContext.requestListener.requestDestroyed=Exception sending request
destroyed lifecycle event to listener instance of class [{0}]
standardContext.requestListener.requestInit=Exception sending request
initialized lifecycle event to listener instance of class [{0}]
+standardContext.resetContextFail=Error resetting Context with name [{0}]
standardContext.resourcesInit=Error initializing static Resources
standardContext.resourcesStart=Error starting static Resources
standardContext.resourcesStop=Error stopping static Resources
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 0aa846988b..ae06417582 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5173,7 +5173,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
try {
resetContext();
} catch (Exception ex) {
-log.error("Error resetting context " + this + " " + ex, ex);
+log.error(sm.getString("standardContext.resetContextFail",
getName()), ex);
}
// reset the instance manager
diff --git a/java/org/apache/catalina/session/LocalStrings.properties
b/java/org/apache/catalina/session/LocalStrings.properties
index eba297f8d9..d2e79e9414 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -47,6 +47,7 @@ persistentManager.backupMaxIdle=Backing up session [{0}] to
Store, idle for [{1}
persistentManager.deserializeError=Error deserializing Session [{0}]
persistentManager.isLoadedError=Error checking if session [{0}] is loaded in
memory
persistentManager.loading=Loading [{0}] persisted sessions
+persistentManager.noStore=No Store configured, persistence disabled
persistentManager.removeError=Error removing session [{0}] from the store
persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
persistentManager.storeClearError=Error clearning all sessions from the store
@@ -92,3 +93,7 @@ standardSession.sessionEvent=Session event listener threw
exception
standardSession.setAttribute.iae=setAttribute: Non-serializable attribute [{0}]
standardSession.setAttribute.ise=setAttribute: Session [{0}] has already been
invalidated
standardSession.setAttribute.namenull=setAttribute: name parameter cannot be
null
+
+store.expireFail=Error processing session expiration for key [{0}]
+store.keysFail=Error getting keys
+store.removeFail=Error removing key [{0}]
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 26af3478a4..0f21277b69 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -826,7 +826,7 @@ public abstract class PersistentManagerBase extends
ManagerBase implements Store
super.startInternal();
if (store == null) {
-log.error("No Store configured, persistence disabled");
+log.error(sm.getString("persistentManager.noStore"));
} else if (store instanceof Lifecycle) {
((Lifecycle) store).start();
}
diff --git a/java/org/apache/catalina/session/StoreBase.java
(tomcat) branch main updated: Add missing strings
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 15ae6ca309 Add missing strings
15ae6ca309 is described below
commit 15ae6ca309f875239db50b44858f220b0ee93e5b
Author: remm
AuthorDate: Tue Feb 6 16:01:43 2024 +0100
Add missing strings
---
.../apache/catalina/core/LocalStrings.properties | 1 +
java/org/apache/catalina/core/StandardContext.java | 2 +-
.../catalina/session/LocalStrings.properties | 9 +++-
.../catalina/session/PersistentManagerBase.java| 2 +-
java/org/apache/catalina/session/StoreBase.java| 6 +++---
.../apache/catalina/valves/LocalStrings.properties | 1 +
.../apache/catalina/valves/PersistentValve.java| 2 +-
java/org/apache/tomcat/util/Diagnostics.java | 24 +++---
.../org/apache/tomcat/util/IntrospectionUtils.java | 2 +-
.../org/apache/tomcat/util/LocalStrings.properties | 3 +++
10 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 3a8ecc8c37..17892d6c61 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -222,6 +222,7 @@ standardContext.reloadingCompleted=Reloading Context with
name [{0}] is complete
standardContext.reloadingStarted=Reloading Context with name [{0}] has started
standardContext.requestListener.requestDestroyed=Exception sending request
destroyed lifecycle event to listener instance of class [{0}]
standardContext.requestListener.requestInit=Exception sending request
initialized lifecycle event to listener instance of class [{0}]
+standardContext.resetContextFail=Error resetting Context with name [{0}]
standardContext.resourcesInit=Error initializing static Resources
standardContext.resourcesStart=Error starting static Resources
standardContext.resourcesStop=Error stopping static Resources
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index 11417130b2..1e74c6aa51 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5141,7 +5141,7 @@ public class StandardContext extends ContainerBase
implements Context, Notificat
try {
resetContext();
} catch (Exception ex) {
-log.error("Error resetting context " + this + " " + ex, ex);
+log.error(sm.getString("standardContext.resetContextFail",
getName()), ex);
}
// reset the instance manager
diff --git a/java/org/apache/catalina/session/LocalStrings.properties
b/java/org/apache/catalina/session/LocalStrings.properties
index 6e8344ad02..f2844effd1 100644
--- a/java/org/apache/catalina/session/LocalStrings.properties
+++ b/java/org/apache/catalina/session/LocalStrings.properties
@@ -47,6 +47,7 @@ persistentManager.backupMaxIdle=Backing up session [{0}] to
Store, idle for [{1}
persistentManager.deserializeError=Error deserializing Session [{0}]
persistentManager.isLoadedError=Error checking if session [{0}] is loaded in
memory
persistentManager.loading=Loading [{0}] persisted sessions
+persistentManager.noStore=No Store configured, persistence disabled
persistentManager.removeError=Error removing session [{0}] from the store
persistentManager.serializeError=Error serializing Session [{0}]: [{1}]
persistentManager.storeClearError=Error clearning all sessions from the store
@@ -98,4 +99,10 @@ standardSessionAccessor.access.end=Unexpected error during
the call to Session.e
standardSessionAccessor.access.invalid=Unable to access the session [{0}] as
the session has already been invalidated
standardSessionAccessor.access.ioe=Unable to access the session [{0}] as an
IOException occurred retrieving the session from the session manager
standardSessionAccessor.nullId=Unable to create Accessor instance as session
ID is null
-standardSessionAccessor.nullManager=Unable to create Accessor instance as
session manager is null
\ No newline at end of file
+standardSessionAccessor.nullManager=Unable to create Accessor instance as
session manager is null
+
+store.expireFail=Error processing session expiration for key [{0}]
+store.keysFail=Error getting keys
+store.removeFail=Error removing key [{0}]
+
+
diff --git a/java/org/apache/catalina/session/PersistentManagerBase.java
b/java/org/apache/catalina/session/PersistentManagerBase.java
index 345c83ced4..4b495550f6 100644
--- a/java/org/apache/catalina/session/PersistentManagerBase.java
+++ b/java/org/apache/catalina/session/PersistentManagerBase.java
@@ -695,7 +695,7 @@ public abstract class PersistentManagerBase extends
ManagerBase implements Store
super.startInternal();
if (store ==
Re: [VOTE] Release Apache Tomcat Native 1.3.0
Mark, Thanks for RMing. On 2/5/24 15:43, Mark Thomas wrote: This is the first release of the 1.3.x branch. The main differences compared to the 1.2.x branch are - Minimum OpenSSL version of 1.1.1 - Minimum APR version of 1.6.3 - Minimum LibreSSL version of 3.5.2 - The windows binaries in this release have been built with OpenSSL 3.0.13 and APR 1.7.4 The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.3.0 release is [ ] Stable, go ahead and release [ ] Broken because of ... +1 for stable release. Builds cleanly with (expected) deprecation warnings on MacOS x86-64 with Clang 12.0.5 and APR 1.7.4 and OpenSSL 3.2.0. Unit tests pass for Tomcat 8.5.x in this environment running Java 17. -chris - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68558] Redundant calls to ByteChunk.toString()
https://bz.apache.org/bugzilla/show_bug.cgi?id=68558 --- Comment #2 from John Engebretson --- > Are you sure about the request parameters being parsed multiple times? They > should only be parsed once per request. Yes - this appears to be triggered when an extra param is added by a JSP include, for example: ApplicationDispatcher.wrapRequest is invoked and creates a new ApplicationHttpRequest with un-parsed parameters. If the included JSP ever checks the parameters, the full set of parameters is parsed: the original plus any new ones added by the . Nested JSP includes can trigger reparsing once per nest. Relevant stack trace: org.apache.catalina.core.ApplicationDispatcher.org.apache.catalina.core.ApplicationDispatcher.doInclude org.apache.catalina.core.ApplicationDispatcher.doInclude org.apache.catalina.core.ApplicationDispatcher.include org.apache.jasper.runtime.JspRuntimeLibrary.include > Is org.apache.tomcat.util.buf.StringCache not caching the Strings or is just > that local caching has much lower latency (which wouldn't surprise me)? Lower latency. 70% of StringCache.toString() is spent in org.apache.tomcat.util.buf.StringCache.findClosest() which does appear to function as intended. > Caching the String in ByteChunk.toString() is an option. I did look at that > when I last worked on this code but it raises all sorts of complications > around cache invalidation as the byte array is directly accessible. Makes sense. :( This may be easier for org.apache.coyote.Request, where a reference to MessageBytes could be replaced by a reference to String (possibly lazy-loaded). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.3.0
Mark, It's odd that the Java unit tests pass without any native library having been built. I find that confusing. -chris On 2/5/24 15:43, Mark Thomas wrote: This is the first release of the 1.3.x branch. The main differences compared to the 1.2.x branch are - Minimum OpenSSL version of 1.1.1 - Minimum APR version of 1.6.3 - Minimum LibreSSL version of 3.5.2 - The windows binaries in this release have been built with OpenSSL 3.0.13 and APR 1.7.4 The proposed release artifacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.3.0 release is [ ] Stable, go ahead and release [ ] Broken because of ... Thanks, Mark [1] https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/1.3.0 [2] https://github.com/apache/tomcat-native/commit/998746966815e1ae105cba9f2681d37cc30249bc - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Buildbot success in on tomcat-8.5.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/36/builds/740 Blamelist: remm Build Text: build successful Status Detected: restored build Build Source Stamp: [branch 8.5.x] 7d7f83d2c9527be5ef9237ebd6c222ef0abd27d1 Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 compile: 1 shell_6: 0 shell_7: 0 shell_8: 0 shell_9: 0 Rsync docs to nightlies.apache.org: 0 shell_10: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_11: 0 Rsync Logs to nightlies.apache.org: 0 -- ASF Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [PR] Added option to use custom SSLContext [tomcat]
Hakky54 commented on PR #673: URL: https://github.com/apache/tomcat/pull/673#issuecomment-1929460593 Hi team, is there any progress on this topic. Is there something what I can do on my side? Like backporting to other branches or anything else maybe? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 68593] New: Request Context is replaced after restoreRequest()
https://bz.apache.org/bugzilla/show_bug.cgi?id=68593 Bug ID: 68593 Summary: Request Context is replaced after restoreRequest() Product: Tomcat 9 Version: 9.0.83 Hardware: PC Status: NEW Severity: major Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: nareshnk1...@gmail.com Target Milestone: - When restoring the body of the request after login org.apache.catalina.authenticator.FormAuthenticator#restoreRequest the context is replaced with the content in the saved request body. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 67683] C source code is not compatible with OpenSSL 1.0.2
https://bz.apache.org/bugzilla/show_bug.cgi?id=67683 Michael Osipov changed: What|Removed |Added CC||micha...@apache.org -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Moving to Tomcat Native 1.3.x
On 2024/02/04 19:54:25 Mark Thomas wrote: > Hi all, > > AS you have probably noticed I am working on another round of Tomcat > Native releases. > > We are overdue on switching to 1.3.x so I would like to propose the > following with this release round: > > - create a new 1.3.x branch from the current 1.2.x HEAD > - update minimum OpenSSL to 1.1.1 > - update minimum APR to 1.6.3 > - remove code supporting OpenSSL < 1.1.1 Good, you have basically picked up https://bz.apache.org/bugzilla/show_bug.cgi?id=67683. You have missed at least two spots: * https://github.com/apache/tomcat-native/blob/f6e1474c6b05e9cab0ad308647a3bde533c1cbce/native/build/tcnative.m4#L41-L45 * https://github.com/apache/tomcat-native/blob/f6e1474c6b05e9cab0ad308647a3bde533c1cbce/native/src/jnilib.c#L77-L81 > The next 8.5.x and 9.0.x releases would then ship with Tomcat Native > 1.3.0 but minimum required/recommended Tomcat Native versions would not > change. I wouldn't bother with 8.5 and 1.3, I'd use 1.2.x until end of 8.5 and the put 1.2.x EOL. Overall sounds like a good plan. I will do also testing here on my side. M - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 2.0.7
On Sun, Feb 4, 2024 at 9:42 PM Mark Thomas wrote: > > The key differences of version 2.0.7 compared to 2.0.6 are: > > - Align default pass phrase prompt with httpd on Windows > - The windows binaries in this release have been built with OpenSSL >3.0.13 and APR 1.7.4 > > The 2.0.x branch is primarily intended for use with Tomcat 10.1.x > onwards but can be used with earlier versions as long as the APR/native > connector is not used. > > The proposed release artifacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 2.0.7 release is > [X] Stable, go ahead and release > [ ] Broken because of ... Rémy > Thanks, > > Mark > > > [1] > https://dist.apache.org/repos/dist/dev/tomcat/tomcat-connectors/native/2.0.7 > [2] > https://github.com/apache/tomcat-native/commit/feefd3b9cf9dc60063860c173c6d027125bac843 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: 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 cccf2df1b7 Differentiate trace and debug log levels
cccf2df1b7 is described below
commit cccf2df1b772334af8ff26c4b961a66b33563536
Author: remm
AuthorDate: Tue Feb 6 11:51:57 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/jasper/compiler/AntCompiler.java | 8 +--
java/org/apache/jasper/compiler/Compiler.java | 16 +++---
.../apache/jasper/compiler/JspRuntimeContext.java | 22
java/org/apache/jasper/compiler/SmapUtil.java | 60 +++---
.../optimizations/ELInterpreterTagSetters.java | 4 +-
java/org/apache/jasper/servlet/JspServlet.java | 18 +++
java/org/apache/jasper/servlet/TldScanner.java | 24 -
java/org/apache/tomcat/websocket/WsFrameBase.java | 4 +-
java/org/apache/tomcat/websocket/WsSession.java| 12 ++---
.../tomcat/websocket/WsWebSocketContainer.java | 8 +--
.../tomcat/websocket/server/WsFrameServer.java | 8 +--
webapps/docs/changelog.xml | 8 +++
12 files changed, 100 insertions(+), 92 deletions(-)
diff --git a/java/org/apache/jasper/compiler/AntCompiler.java
b/java/org/apache/jasper/compiler/AntCompiler.java
index 3e14bc7d33..c9ff0307bd 100644
--- a/java/org/apache/jasper/compiler/AntCompiler.java
+++ b/java/org/apache/jasper/compiler/AntCompiler.java
@@ -81,8 +81,8 @@ public class AntCompiler extends Compiler {
}
if( options.getCompiler() != null ) {
-if( log.isDebugEnabled() ) {
-log.debug("Compiler " + options.getCompiler() );
+if( log.isTraceEnabled() ) {
+log.trace("Compiler " + options.getCompiler() );
}
project.setProperty("build.compiler", options.getCompiler() );
}
@@ -157,8 +157,8 @@ public class AntCompiler extends Compiler {
info.append("cp=" + repository + "\n");
}
-if (log.isDebugEnabled()) {
-log.debug( "Using classpath: " +
System.getProperty("java.class.path") +
+if (log.isTraceEnabled()) {
+log.trace( "Using classpath: " +
System.getProperty("java.class.path") +
File.pathSeparator + classpath);
}
diff --git a/java/org/apache/jasper/compiler/Compiler.java
b/java/org/apache/jasper/compiler/Compiler.java
index 5668065c59..80fa1c7293 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -263,9 +263,9 @@ public abstract class Compiler {
// to be GC'd and save memory.
ctxt.setWriter(null);
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
t4 = System.currentTimeMillis();
-log.debug("Generated " + javaFileName + " total=" + (t4 - t1)
+log.trace("Generated " + javaFileName + " total=" + (t4 - t1)
+ " generate=" + (t4 - t3) + " validate=" + (t2 - t1));
}
@@ -490,8 +490,8 @@ public abstract class Compiler {
}
if (targetLastModified != jspRealLastModified.longValue()) {
-if (log.isDebugEnabled()) {
-log.debug("Compiler: outdated: " + targetFile + " "
+if (log.isTraceEnabled()) {
+log.trace("Compiler: outdated: " + targetFile + " "
+ targetLastModified);
}
return true;
@@ -581,8 +581,8 @@ public abstract class Compiler {
try {
File javaFile = new File(ctxt.getServletJavaFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + javaFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + javaFile);
}
if (javaFile.exists()) {
if (!javaFile.delete()) {
@@ -601,8 +601,8 @@ public abstract class Compiler {
public void removeGeneratedClassFiles() {
try {
File classFile = new File(ctxt.getClassFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + classFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + classFile);
}
if (classFile.exists()) {
if (!classFile.delete()) {
diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java
b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index 5bb4591b67..12f53c434a 100644
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -96,12 +96,12 @@ public final class JspRuntimeContext {
loader = this.getClass().getClassLoader();
}
-if
(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 7d7f83d2c9 Differentiate trace and debug log levels
7d7f83d2c9 is described below
commit 7d7f83d2c9527be5ef9237ebd6c222ef0abd27d1
Author: remm
AuthorDate: Tue Feb 6 11:51:57 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/jasper/compiler/AntCompiler.java | 8 +--
java/org/apache/jasper/compiler/Compiler.java | 16 +++---
.../apache/jasper/compiler/JspRuntimeContext.java | 22
java/org/apache/jasper/compiler/SmapUtil.java | 60 +++---
.../optimizations/ELInterpreterTagSetters.java | 4 +-
java/org/apache/jasper/servlet/JspServlet.java | 18 +++
java/org/apache/jasper/servlet/TldScanner.java | 24 -
java/org/apache/tomcat/websocket/WsFrameBase.java | 4 +-
java/org/apache/tomcat/websocket/WsSession.java| 12 ++---
.../tomcat/websocket/WsWebSocketContainer.java | 8 +--
.../tomcat/websocket/server/WsFrameServer.java | 8 +--
webapps/docs/changelog.xml | 8 +++
12 files changed, 100 insertions(+), 92 deletions(-)
diff --git a/java/org/apache/jasper/compiler/AntCompiler.java
b/java/org/apache/jasper/compiler/AntCompiler.java
index 96d6275d7f..d22983d21a 100644
--- a/java/org/apache/jasper/compiler/AntCompiler.java
+++ b/java/org/apache/jasper/compiler/AntCompiler.java
@@ -80,8 +80,8 @@ public class AntCompiler extends Compiler {
}
if( options.getCompiler() != null ) {
-if( log.isDebugEnabled() ) {
-log.debug("Compiler " + options.getCompiler() );
+if( log.isTraceEnabled() ) {
+log.trace("Compiler " + options.getCompiler() );
}
project.setProperty("build.compiler", options.getCompiler() );
}
@@ -156,8 +156,8 @@ public class AntCompiler extends Compiler {
info.append("cp=" + repository + "\n");
}
-if (log.isDebugEnabled()) {
-log.debug( "Using classpath: " +
System.getProperty("java.class.path") +
+if (log.isTraceEnabled()) {
+log.trace( "Using classpath: " +
System.getProperty("java.class.path") +
File.pathSeparator + classpath);
}
diff --git a/java/org/apache/jasper/compiler/Compiler.java
b/java/org/apache/jasper/compiler/Compiler.java
index 935c19ca1b..e0c1a5c766 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -259,9 +259,9 @@ public abstract class Compiler {
// to be GC'd and save memory.
ctxt.setWriter(null);
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
t4 = System.currentTimeMillis();
-log.debug("Generated " + javaFileName + " total=" + (t4 - t1)
+log.trace("Generated " + javaFileName + " total=" + (t4 - t1)
+ " generate=" + (t4 - t3) + " validate=" + (t2 - t1));
}
@@ -480,8 +480,8 @@ public abstract class Compiler {
}
if (targetLastModified != jspRealLastModified.longValue()) {
-if (log.isDebugEnabled()) {
-log.debug("Compiler: outdated: " + targetFile + " "
+if (log.isTraceEnabled()) {
+log.trace("Compiler: outdated: " + targetFile + " "
+ targetLastModified);
}
return true;
@@ -571,8 +571,8 @@ public abstract class Compiler {
try {
File javaFile = new File(ctxt.getServletJavaFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + javaFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + javaFile);
}
if (javaFile.exists()) {
if (!javaFile.delete()) {
@@ -591,8 +591,8 @@ public abstract class Compiler {
public void removeGeneratedClassFiles() {
try {
File classFile = new File(ctxt.getClassFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + classFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + classFile);
}
if (classFile.exists()) {
if (!classFile.delete()) {
diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java
b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index 88798b9d04..b684472abd 100644
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -96,12 +96,12 @@ public final class JspRuntimeContext {
loader = this.getClass().getClassLoader();
}
-if
(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 aeccd95c43 Differentiate trace and debug log levels
aeccd95c43 is described below
commit aeccd95c4398cd143d2841dfc4a2c954b72dc320
Author: remm
AuthorDate: Tue Feb 6 11:51:57 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/jasper/compiler/AntCompiler.java | 8 +--
java/org/apache/jasper/compiler/Compiler.java | 16 +++---
.../apache/jasper/compiler/JspRuntimeContext.java | 22
java/org/apache/jasper/compiler/SmapUtil.java | 60 +++---
.../optimizations/ELInterpreterTagSetters.java | 4 +-
java/org/apache/jasper/servlet/JspServlet.java | 18 +++
java/org/apache/jasper/servlet/TldScanner.java | 24 -
java/org/apache/tomcat/websocket/WsFrameBase.java | 4 +-
java/org/apache/tomcat/websocket/WsSession.java| 12 ++---
.../tomcat/websocket/WsWebSocketContainer.java | 8 +--
.../tomcat/websocket/server/WsFrameServer.java | 8 +--
webapps/docs/changelog.xml | 8 +++
12 files changed, 100 insertions(+), 92 deletions(-)
diff --git a/java/org/apache/jasper/compiler/AntCompiler.java
b/java/org/apache/jasper/compiler/AntCompiler.java
index bbd6d7c2a4..b615c2395f 100644
--- a/java/org/apache/jasper/compiler/AntCompiler.java
+++ b/java/org/apache/jasper/compiler/AntCompiler.java
@@ -81,8 +81,8 @@ public class AntCompiler extends Compiler {
}
if( options.getCompiler() != null ) {
-if( log.isDebugEnabled() ) {
-log.debug("Compiler " + options.getCompiler() );
+if( log.isTraceEnabled() ) {
+log.trace("Compiler " + options.getCompiler() );
}
project.setProperty("build.compiler", options.getCompiler() );
}
@@ -157,8 +157,8 @@ public class AntCompiler extends Compiler {
info.append("cp=" + repository + "\n");
}
-if (log.isDebugEnabled()) {
-log.debug( "Using classpath: " +
System.getProperty("java.class.path") +
+if (log.isTraceEnabled()) {
+log.trace( "Using classpath: " +
System.getProperty("java.class.path") +
File.pathSeparator + classpath);
}
diff --git a/java/org/apache/jasper/compiler/Compiler.java
b/java/org/apache/jasper/compiler/Compiler.java
index 6dca35c4a3..89f11919cc 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -267,9 +267,9 @@ public abstract class Compiler {
// to be GC'd and save memory.
ctxt.setWriter(null);
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
t4 = System.currentTimeMillis();
-log.debug("Generated " + javaFileName + " total=" + (t4 - t1)
+log.trace("Generated " + javaFileName + " total=" + (t4 - t1)
+ " generate=" + (t4 - t3) + " validate=" + (t2 - t1));
}
@@ -494,8 +494,8 @@ public abstract class Compiler {
}
if (targetLastModified != jspRealLastModified.longValue()) {
-if (log.isDebugEnabled()) {
-log.debug("Compiler: outdated: " + targetFile + " "
+if (log.isTraceEnabled()) {
+log.trace("Compiler: outdated: " + targetFile + " "
+ targetLastModified);
}
return true;
@@ -585,8 +585,8 @@ public abstract class Compiler {
try {
File javaFile = new File(ctxt.getServletJavaFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + javaFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + javaFile);
}
if (javaFile.exists()) {
if (!javaFile.delete()) {
@@ -605,8 +605,8 @@ public abstract class Compiler {
public void removeGeneratedClassFiles() {
try {
File classFile = new File(ctxt.getClassFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + classFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + classFile);
}
if (classFile.exists()) {
if (!classFile.delete()) {
diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java
b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index 5069bf2a04..668561538f 100644
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -96,12 +96,12 @@ public final class JspRuntimeContext {
loader = this.getClass().getClassLoader();
}
-if
(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 8df28a289a Differentiate trace and debug log levels
8df28a289a is described below
commit 8df28a289a8080d640f4b08019f87b02ec8e29d6
Author: remm
AuthorDate: Tue Feb 6 11:51:57 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/jasper/compiler/AntCompiler.java | 8 +--
java/org/apache/jasper/compiler/Compiler.java | 16 +++---
.../apache/jasper/compiler/JspRuntimeContext.java | 22
java/org/apache/jasper/compiler/SmapUtil.java | 60 +++---
.../optimizations/ELInterpreterTagSetters.java | 4 +-
java/org/apache/jasper/servlet/JspServlet.java | 18 +++
java/org/apache/jasper/servlet/TldScanner.java | 24 -
java/org/apache/tomcat/websocket/WsFrameBase.java | 4 +-
java/org/apache/tomcat/websocket/WsSession.java| 12 ++---
.../tomcat/websocket/WsWebSocketContainer.java | 8 +--
.../tomcat/websocket/server/WsFrameServer.java | 8 +--
webapps/docs/changelog.xml | 8 +++
12 files changed, 100 insertions(+), 92 deletions(-)
diff --git a/java/org/apache/jasper/compiler/AntCompiler.java
b/java/org/apache/jasper/compiler/AntCompiler.java
index bbd6d7c2a4..b615c2395f 100644
--- a/java/org/apache/jasper/compiler/AntCompiler.java
+++ b/java/org/apache/jasper/compiler/AntCompiler.java
@@ -81,8 +81,8 @@ public class AntCompiler extends Compiler {
}
if( options.getCompiler() != null ) {
-if( log.isDebugEnabled() ) {
-log.debug("Compiler " + options.getCompiler() );
+if( log.isTraceEnabled() ) {
+log.trace("Compiler " + options.getCompiler() );
}
project.setProperty("build.compiler", options.getCompiler() );
}
@@ -157,8 +157,8 @@ public class AntCompiler extends Compiler {
info.append("cp=" + repository + "\n");
}
-if (log.isDebugEnabled()) {
-log.debug( "Using classpath: " +
System.getProperty("java.class.path") +
+if (log.isTraceEnabled()) {
+log.trace( "Using classpath: " +
System.getProperty("java.class.path") +
File.pathSeparator + classpath);
}
diff --git a/java/org/apache/jasper/compiler/Compiler.java
b/java/org/apache/jasper/compiler/Compiler.java
index 6dca35c4a3..89f11919cc 100644
--- a/java/org/apache/jasper/compiler/Compiler.java
+++ b/java/org/apache/jasper/compiler/Compiler.java
@@ -267,9 +267,9 @@ public abstract class Compiler {
// to be GC'd and save memory.
ctxt.setWriter(null);
-if (log.isDebugEnabled()) {
+if (log.isTraceEnabled()) {
t4 = System.currentTimeMillis();
-log.debug("Generated " + javaFileName + " total=" + (t4 - t1)
+log.trace("Generated " + javaFileName + " total=" + (t4 - t1)
+ " generate=" + (t4 - t3) + " validate=" + (t2 - t1));
}
@@ -494,8 +494,8 @@ public abstract class Compiler {
}
if (targetLastModified != jspRealLastModified.longValue()) {
-if (log.isDebugEnabled()) {
-log.debug("Compiler: outdated: " + targetFile + " "
+if (log.isTraceEnabled()) {
+log.trace("Compiler: outdated: " + targetFile + " "
+ targetLastModified);
}
return true;
@@ -585,8 +585,8 @@ public abstract class Compiler {
try {
File javaFile = new File(ctxt.getServletJavaFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + javaFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + javaFile);
}
if (javaFile.exists()) {
if (!javaFile.delete()) {
@@ -605,8 +605,8 @@ public abstract class Compiler {
public void removeGeneratedClassFiles() {
try {
File classFile = new File(ctxt.getClassFileName());
-if (log.isDebugEnabled()) {
-log.debug("Deleting " + classFile);
+if (log.isTraceEnabled()) {
+log.trace("Deleting " + classFile);
}
if (classFile.exists()) {
if (!classFile.delete()) {
diff --git a/java/org/apache/jasper/compiler/JspRuntimeContext.java
b/java/org/apache/jasper/compiler/JspRuntimeContext.java
index ed11a2d9f4..9f3b69c6ae 100644
--- a/java/org/apache/jasper/compiler/JspRuntimeContext.java
+++ b/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -89,12 +89,12 @@ public final class JspRuntimeContext {
loader = this.getClass().getClassLoader();
}
-if
(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 f71bb5a44c Differentiate trace and debug log levels
f71bb5a44c is described below
commit f71bb5a44c71781394d379ac1ccbb8d5d360e4f0
Author: remm
AuthorDate: Tue Feb 6 11:08:42 2024 +0100
Differentiate trace and debug log levels
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 8 ++--
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 40
java/org/apache/tomcat/util/net/NioEndpoint.java | 54 +++---
.../apache/tomcat/util/net/SecureNio2Channel.java | 4 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 4 +-
.../apache/tomcat/util/net/SocketWrapperBase.java | 8 ++--
.../tomcat/util/net/openssl/OpenSSLContext.java| 28 +--
7 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index c01943871c..e6d170c260 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1163,8 +1163,8 @@ public abstract class AbstractEndpoint {
// That causes delays when running the unit tests. Explicitly
enableing linger but with a timeout of
// zero seconds seems to fix the issue.
s.setSoLinger(true, 0);
-if (getLog().isDebugEnabled()) {
-getLog().debug("About to unlock socket for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("About to unlock socket for:" +
unlockAddress);
}
s.connect(unlockAddress,utmo);
if (getDeferAccept()) {
@@ -1180,8 +1180,8 @@ public abstract class AbstractEndpoint {
"User-Agent: Tomcat wakeup connection\r\n\r\n");
sw.flush();
}
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket unlock completed for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket unlock completed for:" +
unlockAddress);
}
}
// Wait for up to 1000ms acceptor threads to unlock. Particularly
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index ec6c13ff6b..1c018e60a0 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -622,8 +622,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint() {
@Override
public void completed(Integer nBytes, ByteBuffer attachment) {
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
}
boolean notify = false;
synchronized (readCompletionHandler) {
@@ -835,8 +835,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
}
} else {
// Fill the read buffer as best we can.
nRead = fillReadBuffer(block);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
}
// Fill as much of the remaining byte array as possible
with the
// data that was just read
@@ -973,8 +973,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint
*/
@Override
public void unbind() throws Exception {
-if (log.isDebugEnabled()) {
-log.debug("Destroy initiated for " +
+if (log.isTraceEnabled()) {
+log.trace("Destroy initiated for " +
new InetSocketAddress(getAddress(),getPortWithOffset()));
}
if (running) {
@@ -335,8 +335,8 @@
(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 ac8c8002d0 Differentiate trace and debug log levels
ac8c8002d0 is described below
commit ac8c8002d08d06ddf747782fdfba9643a962a96f
Author: remm
AuthorDate: Tue Feb 6 11:08:42 2024 +0100
Differentiate trace and debug log levels
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 8 ++--
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 40
java/org/apache/tomcat/util/net/NioEndpoint.java | 54 +++---
.../apache/tomcat/util/net/SecureNio2Channel.java | 4 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 4 +-
.../apache/tomcat/util/net/SocketWrapperBase.java | 8 ++--
.../tomcat/util/net/openssl/OpenSSLContext.java| 28 +--
7 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 002c4b7da8..53fcea14b7 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1169,8 +1169,8 @@ public abstract class AbstractEndpoint {
// That causes delays when running the unit tests. Explicitly
enableing linger but with a timeout of
// zero seconds seems to fix the issue.
s.setSoLinger(true, 0);
-if (getLog().isDebugEnabled()) {
-getLog().debug("About to unlock socket for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("About to unlock socket for:" +
unlockAddress);
}
s.connect(unlockAddress,utmo);
if (getDeferAccept()) {
@@ -1186,8 +1186,8 @@ public abstract class AbstractEndpoint {
"User-Agent: Tomcat wakeup connection\r\n\r\n");
sw.flush();
}
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket unlock completed for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket unlock completed for:" +
unlockAddress);
}
}
// Wait for up to 1000ms acceptor threads to unlock. Particularly
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 53733cd93a..b2966ac5b6 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -619,8 +619,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint() {
@Override
public void completed(Integer nBytes, ByteBuffer attachment) {
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
}
boolean notify = false;
synchronized (readCompletionHandler) {
@@ -832,8 +832,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
}
} else {
// Fill the read buffer as best we can.
nRead = fillReadBuffer(block);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
}
// Fill as much of the remaining byte array as possible
with the
// data that was just read
@@ -970,8 +970,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint
*/
@Override
public void unbind() throws Exception {
-if (log.isDebugEnabled()) {
-log.debug("Destroy initiated for " +
+if (log.isTraceEnabled()) {
+log.trace("Destroy initiated for " +
new InetSocketAddress(getAddress(),getPortWithOffset()));
}
if (running) {
@@ -385,8 +385,8 @@
(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 5d22c85c15 Differentiate trace and debug log levels
5d22c85c15 is described below
commit 5d22c85c150fbc1abed4ec809f4373fcfb49fd9c
Author: remm
AuthorDate: Tue Feb 6 11:08:42 2024 +0100
Differentiate trace and debug log levels
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 8 ++--
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 40
java/org/apache/tomcat/util/net/NioEndpoint.java | 54 +++---
.../apache/tomcat/util/net/SecureNio2Channel.java | 4 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 4 +-
.../apache/tomcat/util/net/SocketWrapperBase.java | 8 ++--
.../tomcat/util/net/openssl/OpenSSLContext.java| 28 +--
7 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 43d5ee4f94..8602b8ae7f 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1117,8 +1117,8 @@ public abstract class AbstractEndpoint {
// That causes delays when running the unit tests. Explicitly
enableing linger but with a timeout of
// zero seconds seems to fix the issue.
s.setSoLinger(true, 0);
-if (getLog().isDebugEnabled()) {
-getLog().debug("About to unlock socket for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("About to unlock socket for:" +
unlockAddress);
}
s.connect(unlockAddress,utmo);
if (getDeferAccept()) {
@@ -1134,8 +1134,8 @@ public abstract class AbstractEndpoint {
"User-Agent: Tomcat wakeup connection\r\n\r\n");
sw.flush();
}
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket unlock completed for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket unlock completed for:" +
unlockAddress);
}
}
// Wait for up to 1000ms acceptor threads to unlock. Particularly
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index b10f1cc510..69c4540d9d 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -608,8 +608,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint() {
@Override
public void completed(Integer nBytes, ByteBuffer attachment) {
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
}
boolean notify = false;
synchronized (readCompletionHandler) {
@@ -821,8 +821,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
}
} else {
// Fill the read buffer as best we can.
nRead = fillReadBuffer(block);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
}
// Fill as much of the remaining byte array as possible
with the
// data that was just read
@@ -959,8 +959,8 @@ public class Nio2Endpoint extends
AbstractJsseEndpoint
*/
@Override
public void unbind() throws Exception {
-if (log.isDebugEnabled()) {
-log.debug("Destroy initiated for " +
+if (log.isTraceEnabled()) {
+log.trace("Destroy initiated for " +
new InetSocketAddress(getAddress(),getPortWithOffset()));
}
if (running) {
@@ -358,8 +358,8
(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 1532c4f51c Differentiate trace and debug log levels
1532c4f51c is described below
commit 1532c4f51c5cdaf603e984146c8391dcac1507b7
Author: remm
AuthorDate: Tue Feb 6 11:08:42 2024 +0100
Differentiate trace and debug log levels
---
.../apache/tomcat/util/net/AbstractEndpoint.java | 8 ++--
java/org/apache/tomcat/util/net/Nio2Endpoint.java | 40
java/org/apache/tomcat/util/net/NioEndpoint.java | 54 +++---
.../apache/tomcat/util/net/SecureNio2Channel.java | 4 +-
.../apache/tomcat/util/net/SecureNioChannel.java | 4 +-
.../apache/tomcat/util/net/SocketWrapperBase.java | 8 ++--
.../tomcat/util/net/openssl/OpenSSLContext.java| 28 +--
.../util/net/openssl/panama/OpenSSLContext.java| 36 +++
.../util/net/openssl/panama/OpenSSLEngine.java | 12 ++---
9 files changed, 97 insertions(+), 97 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
index 29cbef3b80..dfc0eb65f9 100644
--- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java
+++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java
@@ -1263,12 +1263,12 @@ public abstract class AbstractEndpoint {
// That causes delays when running the unit tests. Explicitly
enableing linger but with a timeout of
// zero seconds seems to fix the issue.
s.setSoLinger(true, 0);
-if (getLog().isDebugEnabled()) {
-getLog().debug("About to unlock socket for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("About to unlock socket for:" +
unlockAddress);
}
s.connect(unlockAddress,utmo);
-if (getLog().isDebugEnabled()) {
-getLog().debug("Socket unlock completed for:" +
unlockAddress);
+if (getLog().isTraceEnabled()) {
+getLog().trace("Socket unlock completed for:" +
unlockAddress);
}
}
// Wait for up to 1000ms acceptor threads to unlock. Particularly
diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
index 9a8d2fd134..8f831fd70e 100644
--- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java
+++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java
@@ -611,8 +611,8 @@ public class Nio2Endpoint extends
AbstractNetworkChannelEndpoint() {
@Override
public void completed(Integer nBytes, ByteBuffer attachment) {
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + Nio2SocketWrapper.this + "],
Interest: [" + readInterest + "]");
}
boolean notify = false;
synchronized (readCompletionHandler) {
@@ -824,8 +824,8 @@ public class Nio2Endpoint extends
AbstractNetworkChannelEndpoint= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
}
} else {
// Fill the read buffer as best we can.
nRead = fillReadBuffer(block);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read into buffer:
[" + nRead + "]");
}
// Fill as much of the remaining byte array as possible
with the
// data that was just read
@@ -962,8 +962,8 @@ public class Nio2Endpoint extends
AbstractNetworkChannelEndpoint= limit) {
to.limit(to.position() + limit);
nRead = fillReadBuffer(block, to);
-if (log.isDebugEnabled()) {
-log.debug("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
+if (log.isTraceEnabled()) {
+log.trace("Socket: [" + this + "], Read direct from
socket: [" + nRead + "]");
}
(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 e313ee8dc9 Differentiate trace and debug log levels
e313ee8dc9 is described below
commit e313ee8dc9132edc816f88f9d63409e29add5a09
Author: remm
AuthorDate: Tue Feb 6 10:11:26 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/naming/SelectorContext.java| 32
.../org/apache/tomcat/util/IntrospectionUtils.java | 21 +++--
.../util/descriptor/web/LocalStrings.properties| 1 +
.../tomcat/util/descriptor/web/WebRuleSet.java | 40 +-
.../tomcat/util/digester/CallMethodRule.java | 4 +-
.../apache/tomcat/util/digester/CallParamRule.java | 4 +-
java/org/apache/tomcat/util/digester/Digester.java | 92 +++---
.../tomcat/util/digester/FactoryCreateRule.java| 12 +--
.../tomcat/util/digester/ObjectCreateRule.java | 4 +-
.../apache/tomcat/util/digester/SetNextRule.java | 6 +-
.../tomcat/util/digester/SetPropertiesRule.java| 8 +-
java/org/apache/tomcat/util/http/Parameters.java | 16 ++--
.../tomcat/util/http/Rfc6265CookieProcessor.java | 4 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 28 +++
java/org/apache/tomcat/util/modeler/Registry.java | 16 ++--
.../MbeansDescriptorsIntrospectionSource.java | 24 +++---
.../org/apache/tomcat/util/threads/LimitLatch.java | 8 +-
17 files changed, 161 insertions(+), 159 deletions(-)
diff --git a/java/org/apache/naming/SelectorContext.java
b/java/org/apache/naming/SelectorContext.java
index 66dee29777..3675b4e1e4 100644
--- a/java/org/apache/naming/SelectorContext.java
+++ b/java/org/apache/naming/SelectorContext.java
@@ -127,8 +127,8 @@ public class SelectorContext implements Context {
public Object lookup(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "lookup",
name));
}
@@ -150,8 +150,8 @@ public class SelectorContext implements Context {
public Object lookup(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
"lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"lookup",
name));
}
@@ -327,8 +327,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "list",
name));
}
@@ -349,8 +349,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString", "list",
name));
}
@@ -375,8 +375,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"listBindings", name));
}
@@ -397,8 +397,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"listBindings", name));
}
@@ -507,8 +507,8 @@ public class SelectorContext implements Context {
public Object lookupLink(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"lookupLink", name));
}
@@ -529,8 +529,8 @@ public class SelectorContext implements Context {
public Object lookupLink(String name)
throws NamingException {
(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 8bc8800f1f Differentiate trace and debug log levels
8bc8800f1f is described below
commit 8bc8800f1f5e82dc6cce8554ddd4bba379e76960
Author: remm
AuthorDate: Tue Feb 6 10:11:26 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/naming/SelectorContext.java| 32
.../org/apache/tomcat/util/IntrospectionUtils.java | 32
.../org/apache/tomcat/util/LocalStrings.properties | 2 +
.../util/descriptor/web/LocalStrings.properties| 1 +
.../tomcat/util/descriptor/web/WebRuleSet.java | 43 +-
.../tomcat/util/digester/CallMethodRule.java | 4 +-
.../apache/tomcat/util/digester/CallParamRule.java | 4 +-
java/org/apache/tomcat/util/digester/Digester.java | 92 +++---
.../tomcat/util/digester/FactoryCreateRule.java| 12 +--
.../tomcat/util/digester/ObjectCreateRule.java | 4 +-
.../apache/tomcat/util/digester/SetNextRule.java | 6 +-
.../tomcat/util/digester/SetPropertiesRule.java| 8 +-
java/org/apache/tomcat/util/http/Parameters.java | 16 ++--
.../tomcat/util/http/Rfc6265CookieProcessor.java | 4 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 28 +++
java/org/apache/tomcat/util/modeler/Registry.java | 16 ++--
.../MbeansDescriptorsIntrospectionSource.java | 24 +++---
.../org/apache/tomcat/util/threads/LimitLatch.java | 8 +-
18 files changed, 168 insertions(+), 168 deletions(-)
diff --git a/java/org/apache/naming/SelectorContext.java
b/java/org/apache/naming/SelectorContext.java
index 66dee29777..3675b4e1e4 100644
--- a/java/org/apache/naming/SelectorContext.java
+++ b/java/org/apache/naming/SelectorContext.java
@@ -127,8 +127,8 @@ public class SelectorContext implements Context {
public Object lookup(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "lookup",
name));
}
@@ -150,8 +150,8 @@ public class SelectorContext implements Context {
public Object lookup(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
"lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"lookup",
name));
}
@@ -327,8 +327,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "list",
name));
}
@@ -349,8 +349,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString", "list",
name));
}
@@ -375,8 +375,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"listBindings", name));
}
@@ -397,8 +397,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"listBindings", name));
}
@@ -507,8 +507,8 @@ public class SelectorContext implements Context {
public Object lookupLink(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"lookupLink", name));
}
@@ -529,8 +529,8 @@ public class SelectorContext implements Context {
public
(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 635c7991fe Differentiate trace and debug log levels
635c7991fe is described below
commit 635c7991fe6e446d4b5606d49be25c2efa52be86
Author: remm
AuthorDate: Tue Feb 6 10:11:26 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/naming/SelectorContext.java| 32
.../org/apache/tomcat/util/IntrospectionUtils.java | 36 -
.../org/apache/tomcat/util/LocalStrings.properties | 2 +
.../util/descriptor/web/LocalStrings.properties| 1 +
.../tomcat/util/descriptor/web/WebRuleSet.java | 43 +-
.../tomcat/util/digester/CallMethodRule.java | 4 +-
.../apache/tomcat/util/digester/CallParamRule.java | 4 +-
java/org/apache/tomcat/util/digester/Digester.java | 92 +++---
.../tomcat/util/digester/FactoryCreateRule.java| 12 +--
.../tomcat/util/digester/ObjectCreateRule.java | 4 +-
.../apache/tomcat/util/digester/SetNextRule.java | 6 +-
.../tomcat/util/digester/SetPropertiesRule.java| 8 +-
java/org/apache/tomcat/util/http/Parameters.java | 16 ++--
.../tomcat/util/http/Rfc6265CookieProcessor.java | 4 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 28 +++
java/org/apache/tomcat/util/modeler/Registry.java | 16 ++--
.../MbeansDescriptorsIntrospectionSource.java | 24 +++---
.../org/apache/tomcat/util/threads/LimitLatch.java | 8 +-
18 files changed, 170 insertions(+), 170 deletions(-)
diff --git a/java/org/apache/naming/SelectorContext.java
b/java/org/apache/naming/SelectorContext.java
index 66dee29777..3675b4e1e4 100644
--- a/java/org/apache/naming/SelectorContext.java
+++ b/java/org/apache/naming/SelectorContext.java
@@ -127,8 +127,8 @@ public class SelectorContext implements Context {
public Object lookup(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "lookup",
name));
}
@@ -150,8 +150,8 @@ public class SelectorContext implements Context {
public Object lookup(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
"lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"lookup",
name));
}
@@ -327,8 +327,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "list",
name));
}
@@ -349,8 +349,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString", "list",
name));
}
@@ -375,8 +375,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"listBindings", name));
}
@@ -397,8 +397,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"listBindings", name));
}
@@ -507,8 +507,8 @@ public class SelectorContext implements Context {
public Object lookupLink(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"lookupLink", name));
}
@@ -529,8 +529,8 @@ public class SelectorContext implements Context {
public
(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 db6afcd8ff Differentiate trace and debug log levels
db6afcd8ff is described below
commit db6afcd8ff831066495f65db53af84375de675a1
Author: remm
AuthorDate: Tue Feb 6 10:11:26 2024 +0100
Differentiate trace and debug log levels
---
java/org/apache/naming/SelectorContext.java| 32
.../org/apache/tomcat/util/IntrospectionUtils.java | 36 -
.../org/apache/tomcat/util/LocalStrings.properties | 2 +
.../util/descriptor/web/LocalStrings.properties| 1 +
.../tomcat/util/descriptor/web/WebRuleSet.java | 43 +-
.../tomcat/util/digester/CallMethodRule.java | 4 +-
.../apache/tomcat/util/digester/CallParamRule.java | 4 +-
java/org/apache/tomcat/util/digester/Digester.java | 92 +++---
.../tomcat/util/digester/FactoryCreateRule.java| 12 +--
.../tomcat/util/digester/ObjectCreateRule.java | 4 +-
.../apache/tomcat/util/digester/SetNextRule.java | 6 +-
.../tomcat/util/digester/SetPropertiesRule.java| 8 +-
java/org/apache/tomcat/util/http/Parameters.java | 16 ++--
.../tomcat/util/http/Rfc6265CookieProcessor.java | 4 +-
.../apache/tomcat/util/modeler/BaseModelMBean.java | 28 +++
java/org/apache/tomcat/util/modeler/Registry.java | 16 ++--
.../MbeansDescriptorsIntrospectionSource.java | 24 +++---
.../org/apache/tomcat/util/threads/LimitLatch.java | 8 +-
18 files changed, 170 insertions(+), 170 deletions(-)
diff --git a/java/org/apache/naming/SelectorContext.java
b/java/org/apache/naming/SelectorContext.java
index 66dee29777..3675b4e1e4 100644
--- a/java/org/apache/naming/SelectorContext.java
+++ b/java/org/apache/naming/SelectorContext.java
@@ -127,8 +127,8 @@ public class SelectorContext implements Context {
public Object lookup(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "lookup",
name));
}
@@ -150,8 +150,8 @@ public class SelectorContext implements Context {
public Object lookup(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
"lookup",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"lookup",
name));
}
@@ -327,8 +327,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName", "list",
name));
}
@@ -349,8 +349,8 @@ public class SelectorContext implements Context {
public NamingEnumeration list(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString", "list",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString", "list",
name));
}
@@ -375,8 +375,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"listBindings", name));
}
@@ -397,8 +397,8 @@ public class SelectorContext implements Context {
public NamingEnumeration listBindings(String name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingString",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingString",
"listBindings", name));
}
@@ -507,8 +507,8 @@ public class SelectorContext implements Context {
public Object lookupLink(Name name)
throws NamingException {
-if (log.isDebugEnabled()) {
-log.debug(sm.getString("selectorContext.methodUsingName",
+if (log.isTraceEnabled()) {
+log.trace(sm.getString("selectorContext.methodUsingName",
"lookupLink", name));
}
@@ -529,8 +529,8 @@ public class SelectorContext implements Context {
public
