[Bug 69377] JSP optimization via custom code generation
https://bz.apache.org/bugzilla/show_bug.cgi?id=69377 --- Comment #14 from John Engebretson --- Will do, thank you! Appreciate the cleanup. -- 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 69653] New: Briskon – Elevating brands with data-driven digital marketing solutions
https://bz.apache.org/bugzilla/show_bug.cgi?id=69653 Bug ID: 69653 Summary: Briskon – Elevating brands with data-driven digital marketing solutions Product: Tomcat Native Version: unspecified Hardware: PC Status: NEW Severity: normal Priority: P2 Component: Documentation Assignee: dev@tomcat.apache.org Reporter: camilla.har...@briskon.com Target Milestone: --- Briskon is a results-focused digital marketing agency specializing in enterprise SEO, B2B SEO, and performance-driven strategies. With a blend of data analytics, creative storytelling, and cutting-edge technology, we help businesses boost online visibility, drive qualified leads, and convert clicks into customers. Partner with Briskon to unlock your brand’s digital growth potential. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Remove trailing space
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 04a8974b4b Remove trailing space 04a8974b4b is described below commit 04a8974b4b2f8e2e73b1958077dba5256f75cfe4 Author: Mark Thomas AuthorDate: Thu Apr 17 21:58:34 2025 +0100 Remove trailing space --- webapps/docs/changelog.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index aeb5e65d45..5864a12afb 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -233,7 +233,7 @@ Update Tomcat's WebSocket support to version 2.3 of the Jakarta -WebSocket API. (markt) +WebSocket API. (markt) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[PR] Fix release [tomcat-maven-plugin]
kevin-wise opened a new pull request, #45: URL: https://github.com/apache/tomcat-maven-plugin/pull/45 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 02/03: Fix indent
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit fdb1b6c44a20df8be0666afccd3a409f4229d9e3
Author: Mark Thomas
AuthorDate: Thu Apr 17 08:37:22 2025 +0100
Fix indent
---
test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
b/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
index ebf4d34a66..d7451de189 100644
--- a/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
+++ b/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
@@ -165,14 +165,14 @@ public class TestJspRuntimeLibrary extends TomcatBaseTest
{
@Test
public void testNonstandardSetWithDefinedScope() {
-final int[] scopes = {PageContext.PAGE_SCOPE,
PageContext.REQUEST_SCOPE, PageContext.SESSION_SCOPE,
PageContext.APPLICATION_SCOPE};
+final int[] scopes = { PageContext.PAGE_SCOPE,
PageContext.REQUEST_SCOPE, PageContext.SESSION_SCOPE,
+PageContext.APPLICATION_SCOPE };
for (int scope : scopes) {
-JspRuntimeLibrary.nonstandardSetTag(pageContext, "var", "value",
scope);
-Assert.assertEquals("value", pageContext.getAttribute("var", scope));
+JspRuntimeLibrary.nonstandardSetTag(pageContext, "var", "value",
scope);
+Assert.assertEquals("value", pageContext.getAttribute("var",
scope));
-JspRuntimeLibrary.nonstandardSetTag(pageContext, "var", null, scope);
-Assert.assertEquals(null, pageContext.getAttribute("var", scope));
+JspRuntimeLibrary.nonstandardSetTag(pageContext, "var", null,
scope);
+Assert.assertEquals(null, pageContext.getAttribute("var", scope));
}
-
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/03: Remove unused code
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit c98934f1afcf414384a92cf4b8b0ec339a83f640
Author: Mark Thomas
AuthorDate: Thu Apr 17 08:37:13 2025 +0100
Remove unused code
---
.../org/apache/jasper/compiler/TestNonstandardTagPerformance.java | 8
1 file changed, 8 deletions(-)
diff --git a/test/org/apache/jasper/compiler/TestNonstandardTagPerformance.java
b/test/org/apache/jasper/compiler/TestNonstandardTagPerformance.java
index e8f157a91b..11d74957f9 100644
--- a/test/org/apache/jasper/compiler/TestNonstandardTagPerformance.java
+++ b/test/org/apache/jasper/compiler/TestNonstandardTagPerformance.java
@@ -27,8 +27,6 @@ import org.junit.Ignore;
import org.junit.Test;
import org.apache.jasper.runtime.JspRuntimeLibrary;
-import org.apache.tomcat.InstanceManager;
-import org.apache.tomcat.SimpleInstanceManager;
public class TestNonstandardTagPerformance {
static final long NUM_ITERATIONS = 1L;
@@ -39,8 +37,6 @@ public class TestNonstandardTagPerformance {
private ExpressionFactory factory;
-private InstanceManager instanceManager = new SimpleInstanceManager();
-
private ELManager manager;
public PageContext pageContext;
@@ -48,10 +44,6 @@ public class TestNonstandardTagPerformance {
return factory;
}
-private InstanceManager _jsp_getInstanceManager() {
-return instanceManager;
-}
-
private void newCode(jakarta.servlet.jsp.PageContext _jspx_page_context)
throws java.lang.Throwable {
JspRuntimeLibrary.nonstandardSetTag(_jspx_page_context, null,
_jspx_page_context,
jakarta.servlet.jsp.PageContext.PAGE_SCOPE);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 03/03: Fix broken tests
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit d375cd808e069c684e35c2d432425c0e22caf78e
Author: Mark Thomas
AuthorDate: Thu Apr 17 08:41:48 2025 +0100
Fix broken tests
---
test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
b/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
index d7451de189..5af4b52514 100644
--- a/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
+++ b/test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java
@@ -16,6 +16,7 @@
*/
package org.apache.jasper.runtime;
+import jakarta.el.ELManager;
import jakarta.servlet.jsp.PageContext;
import jakarta.servlet.jsp.TesterPageContextWithAttributes;
@@ -148,7 +149,7 @@ public class TestJspRuntimeLibrary extends TomcatBaseTest {
@Before
public void setupTestVars() {
-pageContext = new TesterPageContextWithAttributes();
+pageContext = new TesterPageContextWithAttributes((new
ELManager()).getELContext());
}
@Test
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 69654] New: Briskon – Elevating brands with data-driven digital marketing solutions
https://bz.apache.org/bugzilla/show_bug.cgi?id=69654 Bug ID: 69654 Summary: Briskon – Elevating brands with data-driven digital marketing solutions Product: Tomcat Modules Version: unspecified Hardware: PC Status: NEW Severity: normal Priority: P2 Component: jdbc-pool Assignee: dev@tomcat.apache.org Reporter: camilla.har...@briskon.com Target Milestone: --- Briskon is a results-focused digital marketing agency specializing in enterprise SEO, B2B SEO, and performance-driven strategies. With a blend of data analytics, creative storytelling, and cutting-edge technology, we help businesses boost online visibility, drive qualified leads, and convert clicks into customers. Partner with Briskon to unlock your brand’s digital growth potential. for more information please visit: https://www.briskon.com/ -- 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: [PR] Fix release [tomcat-maven-plugin]
kevin-wise closed pull request #45: Fix release URL: https://github.com/apache/tomcat-maven-plugin/pull/45 -- 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
Re: [Bug 69377] JSP optimization via custom code generation
Ok On Thu, 17 Apr, 2025, 9:03 pm , wrote: > https://bz.apache.org/bugzilla/show_bug.cgi?id=69377 > > --- Comment #14 from John Engebretson --- > Will do, thank you! Appreciate the cleanup. > > -- > 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 69377] JSP optimization via custom code generation
https://bz.apache.org/bugzilla/show_bug.cgi?id=69377 --- Comment #13 from Mark Thomas --- Don't forget the additional fixes I applied this morning. You can merge them all into a single commit in your name. -- 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 69631] java.nio.channels.WritePendingException when using https-openssl-nio2 and virtual threads
https://bz.apache.org/bugzilla/show_bug.cgi?id=69631 sephir...@sephiroth-j.de changed: What|Removed |Added Attachment #40021|0 |1 is obsolete|| --- Comment #14 from sephir...@sephiroth-j.de --- Created attachment 40027 --> https://bz.apache.org/bugzilla/attachment.cgi?id=40027&action=edit sample soap-service app with docker image updated sample app with docker image. build: mvn -P docker package run: docker run -it --rm -p 8080:8080 -p 8443:8443 -v /path/to/certs-dir:/var/run/certs -e JAVA_OPTS=-Dorg.apache.tomcat.util.digester.PROPERTY_SOURCE=org.apache.tomcat.util.digester.EnvironmentPropertySource -e TLS_CERTIFICATE_KEY_FILE=/var/run/certs/key.pem -e TLS_CERTIFICATE_FILE=/var/run/certs/cert.pem apache-tomcat-issue-69631:0.0.1-SNAPSHOT -- 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 69631] java.nio.channels.WritePendingException when using https-openssl-nio2 and virtual threads
https://bz.apache.org/bugzilla/show_bug.cgi?id=69631 --- Comment #16 from sephir...@sephiroth-j.de --- The problem still exists if openssl and tcnative for RHEL 9 are built with the same image that is used as the base image for the application container. -- 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 69631] java.nio.channels.WritePendingException when using https-openssl-nio2 and virtual threads
https://bz.apache.org/bugzilla/show_bug.cgi?id=69631 --- Comment #15 from sephir...@sephiroth-j.de --- Created attachment 40028 --> https://bz.apache.org/bugzilla/attachment.cgi?id=40028&action=edit Dockerfile to build tcnative for rhel9 I have added a Dockerfile to create openssl and tcnative for RHEL 9. The resulting image contains the file /tmp/libtcnative-2.0.8-3.5.0-el9.zip, which can be extracted and used to create the Docker image of the sample application. -- 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
Buildbot success in on tomcat-12.0.x
Build status: Build succeeded! Worker used: bb_worker2_ubuntu URL: https://ci2.apache.org/#builders/120/builds/523 Blamelist: John Engebretson , Mark Thomas , jengebr <73608737+jeng...@users.noreply.github.com> Build Text: build successful Status Detected: restored build Build Source Stamp: [branch main] d375cd808e069c684e35c2d432425c0e22caf78e Steps: worker_preparation: 0 git: 0 shell: 0 shell_1: 0 shell_2: 0 shell_3: 0 shell_4: 0 shell_5: 0 shell_6: 0 shell_7: 0 compile: 1 shell_8: 0 shell_9: 0 shell_10: 0 shell_11: 0 Rsync docs to nightlies.apache.org: 0 shell_12: 0 Rsync RAT to nightlies.apache.org: 0 compile_1: 1 shell_13: 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: Code clean-up - formatting. No functional change.
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 41dd39a24e253e78b13f184cdb1872d66d78afe7
Author: Mark Thomas
AuthorDate: Thu Apr 17 12:51:40 2025 +0100
Code clean-up - formatting. No functional change.
---
.../org/apache/naming/ContextAccessController.java | 20 +--
java/org/apache/naming/ContextBindings.java| 74
java/org/apache/naming/EjbRef.java | 25 ++-
java/org/apache/naming/HandlerRef.java | 22 ++-
java/org/apache/naming/NameParserImpl.java | 6 +-
java/org/apache/naming/NamingContext.java | 189 -
.../naming/NamingContextBindingsEnumeration.java | 18 +-
.../apache/naming/NamingContextEnumeration.java| 12 +-
java/org/apache/naming/NamingEntry.java| 3 +-
java/org/apache/naming/ResourceEnvRef.java | 3 +-
java/org/apache/naming/ResourceLinkRef.java| 15 +-
java/org/apache/naming/ResourceRef.java| 38 ++---
java/org/apache/naming/SelectorContext.java| 156 +++--
java/org/apache/naming/ServiceRef.java | 24 ++-
java/org/apache/naming/StringManager.java | 83 -
java/org/apache/naming/TransactionRef.java | 5 +-
.../apache/naming/java/javaURLContextFactory.java | 57 +++
17 files changed, 300 insertions(+), 450 deletions(-)
diff --git a/java/org/apache/naming/ContextAccessController.java
b/java/org/apache/naming/ContextAccessController.java
index 0fad089be5..275ae39312 100644
--- a/java/org/apache/naming/ContextAccessController.java
+++ b/java/org/apache/naming/ContextAccessController.java
@@ -45,15 +45,13 @@ public class ContextAccessController {
/**
* Set a security token for a Catalina context. Can be set only once.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setSecurityToken(Object name, Object token) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
-sm.checkPermission(new RuntimePermission(
-ContextAccessController.class.getName()
-+ ".setSecurityToken"));
+sm.checkPermission(new
RuntimePermission(ContextAccessController.class.getName() +
".setSecurityToken"));
}
if ((!securityTokens.containsKey(name)) && (token != null)) {
securityTokens.put(name, token);
@@ -64,7 +62,7 @@ public class ContextAccessController {
/**
* Remove a security token for a context.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void unsetSecurityToken(Object name, Object token) {
@@ -77,15 +75,13 @@ public class ContextAccessController {
/**
* Check a submitted security token.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Submitted security token
*
- * @return true if the submitted token is equal to the token
- * in the repository or if no token is present in the repository.
- * Otherwise, false
+ * @return true if the submitted token is equal to the token
in the repository or if no token is
+ * present in the repository. Otherwise, false
*/
-public static boolean checkSecurityToken
-(Object name, Object token) {
+public static boolean checkSecurityToken(Object name, Object token) {
Object refToken = securityTokens.get(name);
return (refToken == null || refToken.equals(token));
}
@@ -94,7 +90,7 @@ public class ContextAccessController {
/**
* Allow writing to a context.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setWritable(Object name, Object token) {
diff --git a/java/org/apache/naming/ContextBindings.java
b/java/org/apache/naming/ContextBindings.java
index 17f93d3d81..22e0e99214 100644
--- a/java/org/apache/naming/ContextBindings.java
+++ b/java/org/apache/naming/ContextBindings.java
@@ -29,8 +29,7 @@ import javax.naming.NamingException;
* Calling thread with a NamingContext
* Calling thread with object bound to the same naming context
* Thread context class loader with a NamingContext
- * Thread context class loader with object bound to the same
- * NamingContext
+ * Thread context class loader with object bound to the same
NamingContext
*
* The objects are typically Catalina Server or Context objects.
*
@@ -81,8 +80,8 @@ public class ContextBindings {
/**
* Binds an object and a naming context.
*
-
(tomcat) branch 10.1.x updated: Code clean-up - formatting. No functional change
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
The following commit(s) were added to refs/heads/10.1.x by this push:
new e5a38b277d Code clean-up - formatting. No functional change
e5a38b277d is described below
commit e5a38b277d108a06cc971141f7a4f3c7fef7d4b5
Author: Mark Thomas
AuthorDate: Thu Apr 17 12:50:56 2025 +0100
Code clean-up - formatting. No functional change
---
.../org/apache/naming/ContextAccessController.java | 20 +--
java/org/apache/naming/ContextBindings.java| 74
java/org/apache/naming/EjbRef.java | 25 ++-
java/org/apache/naming/HandlerRef.java | 22 ++-
java/org/apache/naming/NameParserImpl.java | 6 +-
java/org/apache/naming/NamingContext.java | 189 -
.../naming/NamingContextBindingsEnumeration.java | 18 +-
.../apache/naming/NamingContextEnumeration.java| 12 +-
java/org/apache/naming/NamingEntry.java| 3 +-
java/org/apache/naming/ResourceEnvRef.java | 3 +-
java/org/apache/naming/ResourceLinkRef.java| 15 +-
java/org/apache/naming/ResourceRef.java| 38 ++---
java/org/apache/naming/SelectorContext.java| 156 +++--
java/org/apache/naming/ServiceRef.java | 24 ++-
java/org/apache/naming/StringManager.java | 83 -
java/org/apache/naming/TransactionRef.java | 5 +-
.../apache/naming/java/javaURLContextFactory.java | 57 +++
17 files changed, 300 insertions(+), 450 deletions(-)
diff --git a/java/org/apache/naming/ContextAccessController.java
b/java/org/apache/naming/ContextAccessController.java
index 0fad089be5..275ae39312 100644
--- a/java/org/apache/naming/ContextAccessController.java
+++ b/java/org/apache/naming/ContextAccessController.java
@@ -45,15 +45,13 @@ public class ContextAccessController {
/**
* Set a security token for a Catalina context. Can be set only once.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setSecurityToken(Object name, Object token) {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
-sm.checkPermission(new RuntimePermission(
-ContextAccessController.class.getName()
-+ ".setSecurityToken"));
+sm.checkPermission(new
RuntimePermission(ContextAccessController.class.getName() +
".setSecurityToken"));
}
if ((!securityTokens.containsKey(name)) && (token != null)) {
securityTokens.put(name, token);
@@ -64,7 +62,7 @@ public class ContextAccessController {
/**
* Remove a security token for a context.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void unsetSecurityToken(Object name, Object token) {
@@ -77,15 +75,13 @@ public class ContextAccessController {
/**
* Check a submitted security token.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Submitted security token
*
- * @return true if the submitted token is equal to the token
- * in the repository or if no token is present in the repository.
- * Otherwise, false
+ * @return true if the submitted token is equal to the token
in the repository or if no token is
+ * present in the repository. Otherwise, false
*/
-public static boolean checkSecurityToken
-(Object name, Object token) {
+public static boolean checkSecurityToken(Object name, Object token) {
Object refToken = securityTokens.get(name);
return (refToken == null || refToken.equals(token));
}
@@ -94,7 +90,7 @@ public class ContextAccessController {
/**
* Allow writing to a context.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setWritable(Object name, Object token) {
diff --git a/java/org/apache/naming/ContextBindings.java
b/java/org/apache/naming/ContextBindings.java
index 17f93d3d81..22e0e99214 100644
--- a/java/org/apache/naming/ContextBindings.java
+++ b/java/org/apache/naming/ContextBindings.java
@@ -29,8 +29,7 @@ import javax.naming.NamingException;
* Calling thread with a NamingContext
* Calling thread with object bound to the same naming context
* Thread context class loader with a NamingContext
- * Thread context class loader with object bound to the same
- * NamingContext
+ * Thread context class loader with object bound to the same
NamingContext
*
* The objec
(tomcat) branch 9.0.x updated (17d3582900 -> 41dd39a24e)
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 17d3582900 Fix backport. length property on arrays only available from EL 6. new c7c8c1e4fa misc: fix spelling new 41dd39a24e Code clean-up - formatting. No functional change. 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: .../group/interceptors/LocalStrings.properties | 2 +- .../group/interceptors/LocalStrings_fr.properties | 2 +- .../group/interceptors/LocalStrings_ja.properties | 2 +- .../group/interceptors/TcpFailureDetector.java | 2 +- .../org/apache/naming/ContextAccessController.java | 20 +-- java/org/apache/naming/ContextBindings.java| 74 java/org/apache/naming/EjbRef.java | 25 ++- java/org/apache/naming/HandlerRef.java | 22 ++- java/org/apache/naming/NameParserImpl.java | 6 +- java/org/apache/naming/NamingContext.java | 189 - .../naming/NamingContextBindingsEnumeration.java | 18 +- .../apache/naming/NamingContextEnumeration.java| 12 +- java/org/apache/naming/NamingEntry.java| 3 +- java/org/apache/naming/ResourceEnvRef.java | 3 +- java/org/apache/naming/ResourceLinkRef.java| 15 +- java/org/apache/naming/ResourceRef.java| 38 ++--- java/org/apache/naming/SelectorContext.java| 156 +++-- java/org/apache/naming/ServiceRef.java | 24 ++- java/org/apache/naming/StringManager.java | 83 - java/org/apache/naming/TransactionRef.java | 5 +- .../apache/naming/java/javaURLContextFactory.java | 57 +++ .../util/http/fileupload/MultipartStream.java | 4 +- .../tomcat/websocket/LocalStrings.properties | 2 +- .../tomcat/websocket/LocalStrings_fr.properties| 2 +- .../tomcat/websocket/LocalStrings_ja.properties| 2 +- .../tomcat/websocket/LocalStrings_ko.properties| 2 +- .../tomcat/websocket/LocalStrings_zh_CN.properties | 2 +- .../tomcat/websocket/WsRemoteEndpointImplBase.java | 2 +- .../catalina/nonblocking/TestNonBlockingAPI.java | 6 +- .../tomcat/websocket/TestPerMessageDeflate.java| 2 +- test/webapp/jsp/encoding/README.txt| 2 +- 31 files changed, 317 insertions(+), 467 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) 01/02: misc: fix spelling
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 c7c8c1e4fa1ea011e73d1eea021c9cdabbb17ce8
Author: John Bampton
AuthorDate: Wed Apr 2 03:09:42 2025 +1000
misc: fix spelling
---
.../catalina/tribes/group/interceptors/LocalStrings.properties | 2 +-
.../catalina/tribes/group/interceptors/LocalStrings_fr.properties | 2 +-
.../catalina/tribes/group/interceptors/LocalStrings_ja.properties | 2 +-
.../catalina/tribes/group/interceptors/TcpFailureDetector.java | 2 +-
java/org/apache/tomcat/util/http/fileupload/MultipartStream.java| 4 ++--
java/org/apache/tomcat/websocket/LocalStrings.properties| 2 +-
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_ja.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_ko.properties | 2 +-
java/org/apache/tomcat/websocket/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/tomcat/websocket/WsRemoteEndpointImplBase.java | 2 +-
test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java| 6 +++---
test/org/apache/tomcat/websocket/TestPerMessageDeflate.java | 2 +-
test/webapp/jsp/encoding/README.txt | 2 +-
14 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
index 32d81cd823..23568e4fcf 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
+++ b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings.properties
@@ -83,7 +83,7 @@ tcpFailureDetector.heartbeat.failed=Unable to perform
heartbeat on the TcpFailur
tcpFailureDetector.member.disappeared=Verification complete. Member
disappeared[{0}]
tcpFailureDetector.memberDisappeared.verify=Received memberDisappeared[{0}]
message. Will verify.
tcpFailureDetector.performBasicCheck.memberAdded=Member added, even though we
weren''t notified:[{0}]
-tcpFailureDetector.recievedPacket=Received a failure detector packet [{0}]
+tcpFailureDetector.receivedPacket=Received a failure detector packet [{0}]
tcpFailureDetector.still.alive=Verification complete. Member still alive[{0}]
tcpFailureDetector.suspectMember.alive=Suspect member, confirmed alive.[{0}]
tcpFailureDetector.suspectMember.dead=Suspect member, confirmed dead.[{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
index ff1f72eb30..4765a53b30 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_fr.properties
@@ -83,7 +83,7 @@ tcpFailureDetector.heartbeat.failed=Incapable de faire une
pulsation ("heatbeat"
tcpFailureDetector.member.disappeared=La vérfication est complète, le membre a
disparu [{0}]
tcpFailureDetector.memberDisappeared.verify=Reçu un message
memberDisappeared[{0}], qui sera vérifié
tcpFailureDetector.performBasicCheck.memberAdded=Le membre a été ajouté bien
qu''aucune notification n''ait été reçue : [{0}]
-tcpFailureDetector.recievedPacket=Réception d''un paquet de détection d''échec
[{0}]
+tcpFailureDetector.receivedPacket=Réception d''un paquet de détection d''échec
[{0}]
tcpFailureDetector.still.alive=Vérification terminée. Le membre [{0}] vit
toujours
tcpFailureDetector.suspectMember.alive=Membre suspect, confirmé vivant.[{0}]
tcpFailureDetector.suspectMember.dead=Un membre suspect a été confirmé mort
[{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
index f9e6eb3a7e..90c4248351 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_ja.properties
@@ -83,7 +83,7 @@ tcpFailureDetector.heartbeat.failed=TcpFailureDetector
のハートビートチ
tcpFailureDetector.member.disappeared=メンバ検証が完了しました。メンバーが消えました [{0}]
tcpFailureDetector.memberDisappeared.verify=memberDisappeared[{0}]メッセージを受信しました。メンバ検証します。
tcpFailureDetector.performBasicCheck.memberAdded=私たちに通知されなかったにもかかわらず、メンバーが追加されました：[{0}]
-tcpFailureDetector.recievedPacket=障害検出パケット [{0}] を受信しました
+tcpFailureDetector.receivedPacket=障害検出パケット [{0}] を受信しました
tcpFailureDetector.still.alive=故障検出チェックが完了しました。メンバー [{0}] は正常です。
tcpFailureDetector.suspectMember.alive=疑わしいクラスタメンバーの生存を確認しました。[{0}]
tcpFailureDetector.suspectMember.dead=疑義メンバが死亡したことが確認されました。[{0}]
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
ind
(tomcat) branch 10.1.x updated: Fix backport. length property on arrays only available from EL 6.
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
The following commit(s) were added to refs/heads/10.1.x by this push:
new 055a0ff688 Fix backport. length property on arrays only available from
EL 6.
055a0ff688 is described below
commit 055a0ff688720a864a85bb0ec715ae43bb551f7b
Author: Mark Thomas
AuthorDate: Thu Apr 17 10:47:34 2025 +0100
Fix backport. length property on arrays only available from EL 6.
---
test/webapp/bug6/bug69635.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/webapp/bug6/bug69635.jsp
b/test/webapp/bug6/bug69635.jsp
index 2d2a2411a5..88c09574e9 100644
--- a/test/webapp/bug6/bug69635.jsp
+++ b/test/webapp/bug6/bug69635.jsp
@@ -15,4 +15,4 @@
limitations under the License.
--%>
<%@page
import="org.apache.catalina.authenticator.DigestAuthenticator.AuthDigest"%>
-01-${ AuthDigest.values().length }
+01-${ AuthDigest.values().stream().count() }
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated (5ca117b919 -> d375cd808e)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git from 5ca117b919 Merge pull request #842 from jengebr/nonstandard_tags new c98934f1af Remove unused code new fdb1b6c44a Fix indent new d375cd808e Fix broken tests 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: .../jasper/compiler/TestNonstandardTagPerformance.java| 8 test/org/apache/jasper/runtime/TestJspRuntimeLibrary.java | 15 --- 2 files changed, 8 insertions(+), 15 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch 9.0.x updated: Fix backport. length property on arrays only available from EL 6.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 17d3582900 Fix backport. length property on arrays only available from
EL 6.
17d3582900 is described below
commit 17d358290019615c18977a853e089dfb1b318ca7
Author: Mark Thomas
AuthorDate: Thu Apr 17 10:47:34 2025 +0100
Fix backport. length property on arrays only available from EL 6.
---
test/webapp/bug6/bug69635.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/webapp/bug6/bug69635.jsp
b/test/webapp/bug6/bug69635.jsp
index 2d2a2411a5..88c09574e9 100644
--- a/test/webapp/bug6/bug69635.jsp
+++ b/test/webapp/bug6/bug69635.jsp
@@ -15,4 +15,4 @@
limitations under the License.
--%>
<%@page
import="org.apache.catalina.authenticator.DigestAuthenticator.AuthDigest"%>
-01-${ AuthDigest.values().length }
+01-${ AuthDigest.values().stream().count() }
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
(tomcat) branch main updated: Code clean-up - formatting. No functional change
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 cddde8c5c2 Code clean-up - formatting. No functional change
cddde8c5c2 is described below
commit cddde8c5c217fa0569af624cf4b607ea7187180c
Author: Mark Thomas
AuthorDate: Thu Apr 17 12:27:02 2025 +0100
Code clean-up - formatting. No functional change
---
.../org/apache/naming/ContextAccessController.java | 16 +-
java/org/apache/naming/ContextBindings.java| 74
java/org/apache/naming/EjbRef.java | 25 ++-
java/org/apache/naming/HandlerRef.java | 22 ++-
java/org/apache/naming/NameParserImpl.java | 6 +-
java/org/apache/naming/NamingContext.java | 192 -
.../naming/NamingContextBindingsEnumeration.java | 18 +-
.../apache/naming/NamingContextEnumeration.java| 12 +-
java/org/apache/naming/NamingEntry.java| 3 +-
java/org/apache/naming/ResourceEnvRef.java | 3 +-
java/org/apache/naming/ResourceLinkRef.java| 15 +-
java/org/apache/naming/ResourceRef.java| 38 ++--
java/org/apache/naming/SelectorContext.java| 156 +++--
java/org/apache/naming/ServiceRef.java | 24 ++-
java/org/apache/naming/StringManager.java | 83 -
java/org/apache/naming/TransactionRef.java | 5 +-
.../apache/naming/java/javaURLContextFactory.java | 57 +++---
17 files changed, 302 insertions(+), 447 deletions(-)
diff --git a/java/org/apache/naming/ContextAccessController.java
b/java/org/apache/naming/ContextAccessController.java
index 35112df149..76a537e7f2 100644
--- a/java/org/apache/naming/ContextAccessController.java
+++ b/java/org/apache/naming/ContextAccessController.java
@@ -45,7 +45,7 @@ public class ContextAccessController {
/**
* Set a security token for a Catalina context. Can be set only once.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setSecurityToken(Object name, Object token) {
@@ -58,7 +58,7 @@ public class ContextAccessController {
/**
* Remove a security token for a context.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void unsetSecurityToken(Object name, Object token) {
@@ -71,15 +71,13 @@ public class ContextAccessController {
/**
* Check a submitted security token.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Submitted security token
*
- * @return true if the submitted token is equal to the token
- * in the repository or if no token is present in the repository.
- * Otherwise, false
+ * @return true if the submitted token is equal to the token
in the repository or if no token is
+ * present in the repository. Otherwise, false
*/
-public static boolean checkSecurityToken
-(Object name, Object token) {
+public static boolean checkSecurityToken(Object name, Object token) {
Object refToken = securityTokens.get(name);
return (refToken == null || refToken.equals(token));
}
@@ -88,7 +86,7 @@ public class ContextAccessController {
/**
* Allow writing to a context.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setWritable(Object name, Object token) {
diff --git a/java/org/apache/naming/ContextBindings.java
b/java/org/apache/naming/ContextBindings.java
index 17f93d3d81..22e0e99214 100644
--- a/java/org/apache/naming/ContextBindings.java
+++ b/java/org/apache/naming/ContextBindings.java
@@ -29,8 +29,7 @@ import javax.naming.NamingException;
* Calling thread with a NamingContext
* Calling thread with object bound to the same naming context
* Thread context class loader with a NamingContext
- * Thread context class loader with object bound to the same
- * NamingContext
+ * Thread context class loader with object bound to the same
NamingContext
*
* The objects are typically Catalina Server or Context objects.
*
@@ -81,8 +80,8 @@ public class ContextBindings {
/**
* Binds an object and a naming context.
*
- * @param obj Object to bind with naming context
- * @param context Associated naming context instance
+ * @param obj Object to bind with naming context
+ * @param context Associated naming context instance
*/
public static void bindContext(Object obj, Context context) {
bindContext(obj, context
(tomcat) branch 11.0.x updated: Code clean-up - formatting. No functional change
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new b22df573f1 Code clean-up - formatting. No functional change
b22df573f1 is described below
commit b22df573f14787956120ba0d8e6229ad67f2d591
Author: Mark Thomas
AuthorDate: Thu Apr 17 12:48:50 2025 +0100
Code clean-up - formatting. No functional change
---
.../org/apache/naming/ContextAccessController.java | 16 +-
java/org/apache/naming/ContextBindings.java| 74
java/org/apache/naming/EjbRef.java | 25 ++-
java/org/apache/naming/HandlerRef.java | 22 ++-
java/org/apache/naming/NameParserImpl.java | 6 +-
java/org/apache/naming/NamingContext.java | 189 -
.../naming/NamingContextBindingsEnumeration.java | 18 +-
.../apache/naming/NamingContextEnumeration.java| 12 +-
java/org/apache/naming/NamingEntry.java| 3 +-
java/org/apache/naming/ResourceEnvRef.java | 3 +-
java/org/apache/naming/ResourceLinkRef.java| 15 +-
java/org/apache/naming/ResourceRef.java| 38 ++---
java/org/apache/naming/SelectorContext.java| 156 +++--
java/org/apache/naming/ServiceRef.java | 24 ++-
java/org/apache/naming/StringManager.java | 83 -
java/org/apache/naming/TransactionRef.java | 5 +-
.../apache/naming/java/javaURLContextFactory.java | 57 +++
17 files changed, 299 insertions(+), 447 deletions(-)
diff --git a/java/org/apache/naming/ContextAccessController.java
b/java/org/apache/naming/ContextAccessController.java
index 35112df149..76a537e7f2 100644
--- a/java/org/apache/naming/ContextAccessController.java
+++ b/java/org/apache/naming/ContextAccessController.java
@@ -45,7 +45,7 @@ public class ContextAccessController {
/**
* Set a security token for a Catalina context. Can be set only once.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setSecurityToken(Object name, Object token) {
@@ -58,7 +58,7 @@ public class ContextAccessController {
/**
* Remove a security token for a context.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void unsetSecurityToken(Object name, Object token) {
@@ -71,15 +71,13 @@ public class ContextAccessController {
/**
* Check a submitted security token.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Submitted security token
*
- * @return true if the submitted token is equal to the token
- * in the repository or if no token is present in the repository.
- * Otherwise, false
+ * @return true if the submitted token is equal to the token
in the repository or if no token is
+ * present in the repository. Otherwise, false
*/
-public static boolean checkSecurityToken
-(Object name, Object token) {
+public static boolean checkSecurityToken(Object name, Object token) {
Object refToken = securityTokens.get(name);
return (refToken == null || refToken.equals(token));
}
@@ -88,7 +86,7 @@ public class ContextAccessController {
/**
* Allow writing to a context.
*
- * @param name Name of the Catalina context
+ * @param name Name of the Catalina context
* @param token Security token
*/
public static void setWritable(Object name, Object token) {
diff --git a/java/org/apache/naming/ContextBindings.java
b/java/org/apache/naming/ContextBindings.java
index 17f93d3d81..22e0e99214 100644
--- a/java/org/apache/naming/ContextBindings.java
+++ b/java/org/apache/naming/ContextBindings.java
@@ -29,8 +29,7 @@ import javax.naming.NamingException;
* Calling thread with a NamingContext
* Calling thread with object bound to the same naming context
* Thread context class loader with a NamingContext
- * Thread context class loader with object bound to the same
- * NamingContext
+ * Thread context class loader with object bound to the same
NamingContext
*
* The objects are typically Catalina Server or Context objects.
*
@@ -81,8 +80,8 @@ public class ContextBindings {
/**
* Binds an object and a naming context.
*
- * @param obj Object to bind with naming context
- * @param context Associated naming context instance
+ * @param obj Object to bind with naming context
+ * @param context Associated naming context instance
*/
public static void bindContext(Object obj, Context context) {
bindContext(obj, c
[Bug 69377] JSP optimization via custom code generation
https://bz.apache.org/bugzilla/show_bug.cgi?id=69377 --- Comment #12 from John Engebretson --- Merged to 12, backports in progress. -- 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
