[tomcat] branch main updated (ae412fce88 -> 0637f51436)

[markt]

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 ae412fce88 Fix order (alphabetical)
 new d07b2911a3 Tweak formatting settings
 new 64beeead88 Code clean-up - no functional change
 new ced4141d78 Code clean-up - no functional change
 new c1b97f6aa3 Code clean-up - no functional change
 new 847ed3ace3 Code clean-up - no functional change
 new 5315d00e37 Code clean-up - no functional change
 new 559200c1d3 Code clean-up - no functional change
 new 222e145146 Code clean-up - no functional change
 new 85c27f6929 Remove unnecessary space
 new 0637f51436 Update reserved names

The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/jakarta/annotation/Generated.java |   11 +-
 java/jakarta/annotation/ManagedBean.java   |3 +-
 java/jakarta/annotation/PostConstruct.java |3 +-
 java/jakarta/annotation/PreDestroy.java|3 +-
 java/jakarta/annotation/Priority.java  |4 +-
 java/jakarta/annotation/Resource.java  |7 +-
 java/jakarta/annotation/security/DenyAll.java  |2 +-
 java/jakarta/annotation/security/PermitAll.java|2 +-
 java/jakarta/annotation/security/RolesAllowed.java |2 +-
 java/jakarta/ejb/EJB.java  |7 +-
 java/jakarta/el/BeanELResolver.java|   12 +-
 java/jakarta/el/BeanSupportStandalone.java |2 +-
 java/jakarta/el/ELContext.java |   10 +-
 java/jakarta/el/ELManager.java |2 +-
 java/jakarta/el/ExpressionFactory.java |8 +-
 java/jakarta/el/ImportHandler.java |   12 +-
 java/jakarta/el/LambdaExpression.java  |4 +-
 java/jakarta/el/MapELResolver.java |   16 +-
 java/jakarta/el/StandardELContext.java |   14 +-
 java/jakarta/el/StaticFieldELResolver.java |8 +-
 java/jakarta/el/Util.java  |6 +-
 java/jakarta/mail/Session.java |1 +
 java/jakarta/mail/internet/MimeMessage.java|2 +
 java/jakarta/persistence/PersistenceContext.java   |6 +-
 java/jakarta/persistence/PersistenceProperty.java  |1 +
 java/jakarta/persistence/PersistenceUnit.java  |3 +-
 java/jakarta/security/auth/message/ClientAuth.java |   39 +-
 java/jakarta/security/auth/message/ServerAuth.java |   41 +-
 .../message/callback/CallerPrincipalCallback.java  |4 +-
 .../auth/message/callback/CertStoreCallback.java   |3 +-
 .../message/callback/GroupPrincipalCallback.java   |3 +-
 .../callback/PasswordValidationCallback.java   |4 +-
 .../auth/message/callback/PrivateKeyCallback.java  |5 +-
 .../auth/message/callback/SecretKeyCallback.java   |4 +-
 .../auth/message/callback/TrustStoreCallback.java  |3 +-
 .../auth/message/config/AuthConfigFactory.java |   26 +-
 .../auth/message/config/AuthConfigProvider.java|6 +-
 .../auth/message/module/ClientAuthModule.java  |4 +-
 .../auth/message/module/ServerAuthModule.java  |4 +-
 java/jakarta/servlet/AsyncContext.java |   78 +-
 java/jakarta/servlet/AsyncEvent.java   |   26 +-
 java/jakarta/servlet/AsyncListener.java|   26 +-
 java/jakarta/servlet/DispatcherType.java   |   10 +-
 java/jakarta/servlet/Filter.java   |   95 +-
 java/jakarta/servlet/FilterChain.java  |   26 +-
 java/jakarta/servlet/FilterConfig.java |   34 +-
 java/jakarta/servlet/FilterRegistration.java   |   55 +-
 java/jakarta/servlet/GenericFilter.java|   16 +-
 java/jakarta/servlet/GenericServlet.java   |  165 ++-
 java/jakarta/servlet/HttpConstraintElement.java|   45 +-
 .../servlet/HttpMethodConstraintElement.java   |   33 +-
 java/jakarta/servlet/MultipartConfigElement.java   |   29 +-
 java/jakarta/servlet/ReadListener.java |   10 +-
 java/jakarta/servlet/Registration.java |   49 +-
 java/jakarta/servlet/RequestDispatcher.java|  269 ++---
 java/jakarta/servlet/Servlet.java  |  144 +--
 java/jakarta/servlet/ServletConfig.java|   40 +-
 java/jakarta/servlet/ServletConnection.java|   54 +-
 .../servlet/ServletContainerInitializer.java   |   30 +-
 java/jakarta/servlet/ServletContext.java   | 1049 +---
 .../servlet/ServletContextAttributeEvent.java  |   20 +-
 .../servlet/ServletContextAttributeListener.java   |   23 +-
 java/jakarta/servlet/ServletContextEvent.java  |6 +-
 java/jakarta/servlet/ServletContextListener.java   |   22 +-
 java/jakar

[tomcat] 02/10: Code clean-up - no functional change

[markt]

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 64beeead88d3d8172d1e04b5bd2efca09deaaa93
Author: Mark Thomas 
AuthorDate: Thu Apr 13 17:11:10 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/el/BeanELResolver.java| 12 ++--
 java/jakarta/el/BeanSupportStandalone.java |  2 +-
 java/jakarta/el/ELContext.java | 10 +-
 java/jakarta/el/ELManager.java |  2 +-
 java/jakarta/el/ExpressionFactory.java |  8 
 java/jakarta/el/ImportHandler.java | 12 ++--
 java/jakarta/el/LambdaExpression.java  |  4 ++--
 java/jakarta/el/MapELResolver.java | 16 
 java/jakarta/el/StandardELContext.java | 14 +++---
 java/jakarta/el/StaticFieldELResolver.java |  8 
 java/jakarta/el/Util.java  |  6 +++---
 11 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/java/jakarta/el/BeanELResolver.java 
b/java/jakarta/el/BeanELResolver.java
index 9551b43489..7577163539 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -38,7 +38,7 @@ public class BeanELResolver extends ELResolver {
 
 private final boolean readOnly;
 
-private final ConcurrentCache cache = new 
ConcurrentCache<>(CACHE_SIZE);
+private final ConcurrentCache cache = new 
ConcurrentCache<>(CACHE_SIZE);
 
 /**
  * Creates a writable instance of the standard JavaBean resolver.
@@ -135,8 +135,8 @@ public class BeanELResolver extends ELResolver {
 // Find the matching method
 Method matchingMethod = Util.findMethod(context, base.getClass(), 
base, methodName, paramTypes, params);
 
-Object[] parameters = Util.buildParameters(context, 
matchingMethod.getParameterTypes(),
-matchingMethod.isVarArgs(), params);
+Object[] parameters =
+Util.buildParameters(context, 
matchingMethod.getParameterTypes(), matchingMethod.isVarArgs(), params);
 
 Object result = null;
 try {
@@ -174,7 +174,7 @@ public class BeanELResolver extends ELResolver {
 }
 
 abstract static class BeanProperties {
-protected final Map properties;
+protected final Map properties;
 protected final Class type;
 
 BeanProperties(Class type) throws ELException {
@@ -262,8 +262,8 @@ public class BeanELResolver extends ELResolver {
 private static final class ConcurrentCache {
 
 private final int size;
-private final Map eden;
-private final Map longterm;
+private final Map eden;
+private final Map longterm;
 
 ConcurrentCache(int size) {
 this.size = size;
diff --git a/java/jakarta/el/BeanSupportStandalone.java 
b/java/jakarta/el/BeanSupportStandalone.java
index 0414261359..e4db4b5589 100644
--- a/java/jakarta/el/BeanSupportStandalone.java
+++ b/java/jakarta/el/BeanSupportStandalone.java
@@ -49,7 +49,7 @@ class BeanSupportStandalone extends BeanSupport {
 
 
 private static PropertyDescriptor[] getPropertyDescriptors(Class type) {
-Map pds = new HashMap<>();
+Map pds = new HashMap<>();
 Method[] methods = type.getMethods();
 for (Method method : methods) {
 if (!Modifier.isStatic(method.getModifiers())) {
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index 0e80de277f..12840d1597 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -32,7 +32,7 @@ public abstract class ELContext {
 
 private Locale locale;
 
-private Map, Object> map;
+private Map,Object> map;
 
 private boolean resolved;
 
@@ -40,7 +40,7 @@ public abstract class ELContext {
 
 private List listeners;
 
-private Deque> lambdaArguments = new ArrayDeque<>();
+private Deque> lambdaArguments = new ArrayDeque<>();
 
 public ELContext() {
 this.resolved = false;
@@ -235,7 +235,7 @@ public abstract class ELContext {
  * @since EL 3.0
  */
 public boolean isLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : lambdaArguments) {
 if (arguments.containsKey(name)) {
 return true;
 }
@@ -253,7 +253,7 @@ public abstract class ELContext {
  * @since EL 3.0
  */
 public Object getLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : lambdaArguments) {
 Object result = arguments.get(name);
 if (result != null) {
 return result;
@@ -270,7 +270,7 @@ public abstract class ELContext {
  *
  * @since EL 3.0
  */
-public void enterLambdaScope(Map arguments) {
+public void enterLambdaScope(Map arguments) {
 lambdaArguments.push(arguments);
 }
 
diff --git a/java/

[tomcat] 07/10: Code clean-up - no functional change

[markt]

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 559200c1d35596f34a3eca8aeeea04b491dcf4ef
Author: Mark Thomas 
AuthorDate: Thu Apr 13 17:12:11 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/annotation/Generated.java | 11 ++-
 java/jakarta/annotation/ManagedBean.java   |  3 +--
 java/jakarta/annotation/PostConstruct.java |  3 +--
 java/jakarta/annotation/PreDestroy.java|  3 +--
 java/jakarta/annotation/Priority.java  |  4 ++--
 java/jakarta/annotation/Resource.java  |  7 +++
 java/jakarta/annotation/security/DenyAll.java  |  2 +-
 java/jakarta/annotation/security/PermitAll.java|  2 +-
 java/jakarta/annotation/security/RolesAllowed.java |  2 +-
 9 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/java/jakarta/annotation/Generated.java 
b/java/jakarta/annotation/Generated.java
index e13713dd50..4997cdf44b 100644
--- a/java/jakarta/annotation/Generated.java
+++ b/java/jakarta/annotation/Generated.java
@@ -28,20 +28,21 @@ import java.lang.annotation.Target;
  * @since Common Annotations 1.0
  */
 @Documented
-@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
-ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
-ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})
+@Target({ ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, 
ElementType.FIELD, ElementType.LOCAL_VARIABLE,
+ElementType.METHOD, ElementType.PACKAGE, ElementType.PARAMETER, 
ElementType.TYPE })
 @Retention(RetentionPolicy.SOURCE)
 public @interface Generated {
 /**
- * @return The name of the code generator. It is recommended that the fully
- * qualified name of the code generator is used.
+ * @return The name of the code generator. It is recommended that the 
fully qualified name of the code generator is
+ * used.
  */
 String[] value();
+
 /**
  * @return The date the code was generated
  */
 String date() default "";
+
 /**
  * @return Additional comments (if any) related to the code generation
  */
diff --git a/java/jakarta/annotation/ManagedBean.java 
b/java/jakarta/annotation/ManagedBean.java
index 0eac89251a..7a839d802d 100644
--- a/java/jakarta/annotation/ManagedBean.java
+++ b/java/jakarta/annotation/ManagedBean.java
@@ -26,8 +26,7 @@ import java.lang.annotation.Target;
  *
  * @since Common Annotations 1.1
  *
- * @deprecated This will be removed no earlier than Jakarta EE 11. Use CDI 
beans
- * instead.
+ * @deprecated This will be removed no earlier than Jakarta EE 11. Use CDI 
beans instead.
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/java/jakarta/annotation/PostConstruct.java 
b/java/jakarta/annotation/PostConstruct.java
index 9326bc1aee..8f32f4fd52 100644
--- a/java/jakarta/annotation/PostConstruct.java
+++ b/java/jakarta/annotation/PostConstruct.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Added to a method required to be called after the object has been 
constructed
- * and before it used.
+ * Added to a method required to be called after the object has been 
constructed and before it used.
  *
  * @since Common Annotations 1.0
  */
diff --git a/java/jakarta/annotation/PreDestroy.java 
b/java/jakarta/annotation/PreDestroy.java
index b25d2fe90a..3635f769b4 100644
--- a/java/jakarta/annotation/PreDestroy.java
+++ b/java/jakarta/annotation/PreDestroy.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Added to a method required to be called once the object is no longer 
required
- * and before it is discarded.
+ * Added to a method required to be called once the object is no longer 
required and before it is discarded.
  *
  * @since Common Annotations 1.0
  */
diff --git a/java/jakarta/annotation/Priority.java 
b/java/jakarta/annotation/Priority.java
index 918ac11365..8fd399c094 100644
--- a/java/jakarta/annotation/Priority.java
+++ b/java/jakarta/annotation/Priority.java
@@ -21,8 +21,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * Used to define the order in which classes or parameters should be used. The
- * annotated class or parameter defines how the prority value is used.
+ * Used to define the order in which classes or parameters should be used. The 
annotated class or parameter defines how
+ * the prority value is used.
  *
  * @since Common Annotations 1.2
  */
diff --git a/java/jakarta/annotation/Resource.java 
b/java/jakarta/annotation/Resource.java
index b779288923..a86d4cf7df 100644
--- a/java/jakarta/annotation/Resource.java
+++ b/java/jakarta/annotation/Resource.java
@@ -23,13 +23,12 @@ import java.lang.annotation.R

[tomcat] 01/10: Tweak formatting settings

[markt]

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 d07b2911a331fa94989916496e4059b29c6adcf3
Author: Mark Thomas 
AuthorDate: Thu Apr 13 17:09:53 2023 +0100

Tweak formatting settings

- Use Map rather than Map
- Ensure line wrap occurs after the operator
- Better line wrapping for assignments
---
 res/ide-support/eclipse/formatting-asf-tomcat.xml | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/res/ide-support/eclipse/formatting-asf-tomcat.xml 
b/res/ide-support/eclipse/formatting-asf-tomcat.xml
index 7a4effe304..c58449c8a1 100644
--- a/res/ide-support/eclipse/formatting-asf-tomcat.xml
+++ b/res/ide-support/eclipse/formatting-asf-tomcat.xml
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-
+
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 
@@ -76,7 +76,7 @@
 
 
 
-
+
 
 
 
@@ -108,7 +108,7 @@
 
 
 
-
+
 
 
 
@@ -128,7 +128,7 @@
 
 
 
-
+
 
 
 
@@ -174,6 +174,7 @@
 
 
 
+
 
 
 
@@ -321,7 +322,7 @@
 
 
 
-
+
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 10/10: Update reserved names

[markt]

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 0637f51436f131310930285e60eaeaebde8c18f9
Author: Mark Thomas 
AuthorDate: Fri Apr 14 10:56:02 2023 +0100

Update reserved names
---
 java/jakarta/servlet/ServletContext.java |  7 +++
 java/jakarta/servlet/ServletRequest.java | 19 +++
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/java/jakarta/servlet/ServletContext.java 
b/java/jakarta/servlet/ServletContext.java
index 8d40ab6db9..5054b3b796 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -356,8 +356,7 @@ public interface ServletContext {
  * supported attributes can be retrieved using 
getAttributeNames.
  * 
  * The attribute is returned as a java.lang.Object or some 
subclass. Attribute names should follow the
- * same convention as package names. The Java Servlet API specification 
reserves names matching java.*,
- * javax.*, and sun.*.
+ * same convention as package names. The Jakarta EE platform reserves 
names matching jakarta.*.
  *
  * @param name a String specifying the name of the attribute
  *
@@ -388,8 +387,8 @@ public interface ServletContext {
  * 
  * If a null value is passed, the effect is the same as calling 
removeAttribute().
  * 
- * Attribute names should follow the same convention as package names. The 
Java Servlet API specification reserves
- * names matching java.*, javax.*, and 
sun.*.
+ * Attribute names should follow the same convention as package names. The 
Jakarta EE platform reserves names
+ * matching jakarta.*.
  *
  * @param name   a String specifying the name of the attribute
  * @param object an Object representing the attribute to be 
bound
diff --git a/java/jakarta/servlet/ServletRequest.java 
b/java/jakarta/servlet/ServletRequest.java
index eacc3af319..795502f3b4 100644
--- a/java/jakarta/servlet/ServletRequest.java
+++ b/java/jakarta/servlet/ServletRequest.java
@@ -46,10 +46,8 @@ public interface ServletRequest {
  * the client. Attributes can also be set programmatically using {@link 
ServletRequest#setAttribute}. This allows
  * information to be embedded into a request before a {@link 
RequestDispatcher} call.
  * 
- * Attribute names should follow the same conventions as package names. 
Names beginning with java.* and
- * javax.* are reserved for use by the Servlet specification. 
Names beginning with sun.*,
- * com.sun.*, oracle.* and 
com.oracle.*) are reserved for use by Oracle
- * Corporation.
+ * Attribute names should follow the same conventions as package names. 
Names beginning with jakarta.*
+ * are reserved for use by the Jakarta EE platform.
  *
  * @param name a String specifying the name of the attribute
  *
@@ -277,10 +275,9 @@ public interface ServletRequest {
  * Stores an attribute in this request. Attributes are reset between 
requests. This method is most often used in
  * conjunction with {@link RequestDispatcher}.
  * 
- * Attribute names should follow the same conventions as package names. 
Names beginning with java.* and
- * javax.* are reserved for use by the Servlet specification. 
Names beginning with sun.*,
- * com.sun.*, oracle.* and 
com.oracle.*) are reserved for use by Oracle
- * Corporation. 
+ * Attribute names should follow the same conventions as package names. 
Names beginning with jakarta.*
+ * are reserved for use by the Jakarta EE platform.
+ * 
  * If the object passed in is null, the effect is the same as calling 
{@link #removeAttribute}. 
  * It is warned that when the request is dispatched from the servlet 
resides in a different web application by
  * RequestDispatcher, the object set by this method may not 
be correctly retrieved in the caller
@@ -295,10 +292,8 @@ public interface ServletRequest {
  * Removes an attribute from this request. This method is not generally 
needed as attributes only persist as long as
  * the request is being handled.
  * 
- * Attribute names should follow the same conventions as package names. 
Names beginning with java.* and
- * javax.* are reserved for use by the Servlet specification. 
Names beginning with sun.*,
- * com.sun.*, oracle.* and 
com.oracle.*) are reserved for use by Oracle
- * Corporation.
+ * Attribute names should follow the same conventions as package names. 
Names beginning with jakarta.*
+ * are reserved for use by the Jakarta EE platform.
  *
  * @param name a String specifying the name of the attribute 
to remove
  */


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 09/10: Remove unnecessary space

[markt]

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 85c27f6929a64871c9edab0be9ec164afcce62de
Author: Mark Thomas 
AuthorDate: Fri Apr 14 10:30:25 2023 +0100

Remove unnecessary space
---
 java/jakarta/servlet/Servlet.java   | 2 +-
 java/org/apache/tomcat/util/bcel/classfile/ClassParser.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/jakarta/servlet/Servlet.java 
b/java/jakarta/servlet/Servlet.java
index c234a1f4df..838b4f0d25 100644
--- a/java/jakarta/servlet/Servlet.java
+++ b/java/jakarta/servlet/Servlet.java
@@ -90,7 +90,7 @@ public interface Servlet {
  * Servlets typically run inside multithreaded servlet containers that can 
handle multiple requests concurrently.
  * Developers must be aware to synchronize access to any shared resources 
such as files, network connections, and as
  * well as the servlet's class and instance variables. More information on 
multithreaded programming in Java is
- * available in http://java.sun.com/Series/Tutorial/java/threads/multithreaded.html";> the 
Java tutorial on
+ * available in http://java.sun.com/Series/Tutorial/java/threads/multithreaded.html";> the 
Java tutorial on
  * multi-threaded programming.
  *
  * @param req the ServletRequest object that contains the 
client's request
diff --git a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java 
b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
index aec7c7b444..6fd322a907 100644
--- a/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
+++ b/java/org/apache/tomcat/util/bcel/classfile/ClassParser.java
@@ -27,8 +27,8 @@ import java.util.List;
 import org.apache.tomcat.util.bcel.Const;
 
 /**
- * Wrapper class that parses a given Java .class file. The method parse returns a
- *  JavaClass object on success. When an I/O 
error or an inconsistency occurs an
+ * Wrapper class that parses a given Java .class file. The method parse returns a
+ *  JavaClass object on success. When an I/O 
error or an inconsistency occurs an
  * appropriate exception is propagated back to the caller.
  *
  * The structure and the names comply, except for a few conveniences, exactly 
with the


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 06/10: Code clean-up - no functional change

[markt]

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 5315d00e3757315dfc82e639220ba492c3fd585e
Author: Mark Thomas 
AuthorDate: Thu Apr 13 17:11:57 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/security/auth/message/ClientAuth.java | 39 +---
 java/jakarta/security/auth/message/ServerAuth.java | 41 +-
 .../message/callback/CallerPrincipalCallback.java  |  4 +--
 .../auth/message/callback/CertStoreCallback.java   |  3 +-
 .../message/callback/GroupPrincipalCallback.java   |  3 +-
 .../callback/PasswordValidationCallback.java   |  4 +--
 .../auth/message/callback/PrivateKeyCallback.java  |  5 ++-
 .../auth/message/callback/SecretKeyCallback.java   |  4 +--
 .../auth/message/callback/TrustStoreCallback.java  |  3 +-
 .../auth/message/config/AuthConfigFactory.java | 26 ++
 .../auth/message/config/AuthConfigProvider.java|  6 ++--
 .../auth/message/module/ClientAuthModule.java  |  4 +--
 .../auth/message/module/ServerAuthModule.java  |  4 +--
 13 files changed, 61 insertions(+), 85 deletions(-)

diff --git a/java/jakarta/security/auth/message/ClientAuth.java 
b/java/jakarta/security/auth/message/ClientAuth.java
index 063075f35a..c4bf93ed14 100644
--- a/java/jakarta/security/auth/message/ClientAuth.java
+++ b/java/jakarta/security/auth/message/ClientAuth.java
@@ -24,45 +24,38 @@ public interface ClientAuth {
  * Secure (authenticate) the request.
  *
  * @param messageInfo   The associated request and response
- * @param clientSubject The subject that represents the source of the
- *  request
+ * @param clientSubject The subject that represents the source of the 
request
  *
- * @return An AuthStatus instance that represents the result of the
- * authentication
+ * @return An AuthStatus instance that represents the result of the 
authentication
  *
- * @throws AuthException If the a failure occurred in a manner that
- *   prevented the failure from being communicated via
- *   messageInfo
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
  */
 AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject) 
throws AuthException;
 
 /**
  * Validate a response.
  *
- * @param messageInfo   The associated request and response
- * @param clientSubject The subject that represents the recipient of 
the
- *  response
- * @param serviceSubjectThe subject that represents the source of the
- *  response
+ * @param messageInfoThe associated request and response
+ * @param clientSubject  The subject that represents the recipient of the 
response
+ * @param serviceSubject The subject that represents the source of the 
response
  *
- * @return An AuthStatus instance that represents the result of the
- * validation
+ * @return An AuthStatus instance that represents the result of the 
validation
  *
- * @throws AuthException If the a failure occurred in a manner that
- *   prevented the failure from being communicated via
- *   messageInfo
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
  */
-default AuthStatus validateResponse(MessageInfo messageInfo, Subject 
clientSubject,
-Subject serviceSubject) throws AuthException {
+default AuthStatus validateResponse(MessageInfo messageInfo, Subject 
clientSubject, Subject serviceSubject)
+throws AuthException {
 return AuthStatus.SUCCESS;
 }
 
 /**
- * Remove principals and/or credentials from the subject that were
- * previously added by this authentication mechanism.
+ * Remove principals and/or credentials from the subject that were 
previously added by this authentication
+ * mechanism.
  *
- * @param messageInfo   The associated request and response
- * @param subject   The subject to clean
+ * @param messageInfo The associated request and response
+ * @param subject The subject to clean
  *
  * @throws AuthException If the a failure occurred
  */
diff --git a/java/jakarta/security/auth/message/ServerAuth.java 
b/java/jakarta/security/auth/message/ServerAuth.java
index d0777618f5..84141ade22 100644
--- a/java/jakarta/security/auth/message/ServerAuth.java
+++ b/java/jakarta/security/auth/message/ServerAuth.java
@@ -23,46 +23,39 @@ public interface ServerAuth {
 /**
  * Validate the request.
  *

[tomcat] 08/10: Code clean-up - no functional change

[markt]

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 222e1451460c14fe5a899b9176a7e44959c932b2
Author: Mark Thomas 
AuthorDate: Thu Apr 13 17:12:16 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/ejb/EJB.java |  7 ++-
 java/jakarta/mail/Session.java|  1 +
 java/jakarta/mail/internet/MimeMessage.java   |  2 ++
 java/jakarta/persistence/PersistenceContext.java  |  6 +-
 java/jakarta/persistence/PersistenceProperty.java |  1 +
 java/jakarta/persistence/PersistenceUnit.java |  3 ++-
 java/jakarta/transaction/Synchronization.java |  1 +
 java/jakarta/transaction/Transaction.java | 12 
 java/jakarta/transaction/TransactionManager.java  |  9 +++--
 java/jakarta/transaction/UserTransaction.java |  6 ++
 java/jakarta/xml/ws/WebServiceRef.java|  6 +-
 11 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/java/jakarta/ejb/EJB.java b/java/jakarta/ejb/EJB.java
index 635ba7f4f6..82db99ed39 100644
--- a/java/jakarta/ejb/EJB.java
+++ b/java/jakarta/ejb/EJB.java
@@ -21,15 +21,20 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD})
+@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface EJB {
 String name() default "";
+
 String description() default "";
+
 @SuppressWarnings("rawtypes") // Can't use Class because API needs to 
match specification
 Class beanInterface() default java.lang.Object.class;
+
 String beanName() default "";
+
 String mappedName() default "";
+
 String lookup() default "";
 }
diff --git a/java/jakarta/mail/Session.java b/java/jakarta/mail/Session.java
index d638f81c57..87ff869d3b 100644
--- a/java/jakarta/mail/Session.java
+++ b/java/jakarta/mail/Session.java
@@ -23,6 +23,7 @@ public class Session {
 public static Session getInstance(Properties props, Authenticator auth) {
 return null;
 }
+
 public static Session getInstance(Properties props) {
 return null;
 }
diff --git a/java/jakarta/mail/internet/MimeMessage.java 
b/java/jakarta/mail/internet/MimeMessage.java
index 08cdb80330..39644f0509 100644
--- a/java/jakarta/mail/internet/MimeMessage.java
+++ b/java/jakarta/mail/internet/MimeMessage.java
@@ -23,9 +23,11 @@ public class MimeMessage implements MimePart {
 public MimeMessage(Session session) {
 // Dummy implementation
 }
+
 public void setFrom(InternetAddress from) {
 // Dummy implementation
 }
+
 public void setSubject(String subject) {
 // Dummy implementation
 }
diff --git a/java/jakarta/persistence/PersistenceContext.java 
b/java/jakarta/persistence/PersistenceContext.java
index 9b5f8cada4..78ece9e615 100644
--- a/java/jakarta/persistence/PersistenceContext.java
+++ b/java/jakarta/persistence/PersistenceContext.java
@@ -21,13 +21,17 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface PersistenceContext {
 String name() default "";
+
 String unitName() default "";
+
 PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+
 PersistenceProperty[] properties() default {};
+
 SynchronizationType synchronization() default 
SynchronizationType.SYNCHRONIZED;
 }
diff --git a/java/jakarta/persistence/PersistenceProperty.java 
b/java/jakarta/persistence/PersistenceProperty.java
index 74b9827362..3ed05e1982 100644
--- a/java/jakarta/persistence/PersistenceProperty.java
+++ b/java/jakarta/persistence/PersistenceProperty.java
@@ -25,5 +25,6 @@ import java.lang.annotation.Target;
 
 public @interface PersistenceProperty {
 String name();
+
 String value();
 }
diff --git a/java/jakarta/persistence/PersistenceUnit.java 
b/java/jakarta/persistence/PersistenceUnit.java
index 258ce1ad5e..0580f2 100644
--- a/java/jakarta/persistence/PersistenceUnit.java
+++ b/java/jakarta/persistence/PersistenceUnit.java
@@ -21,10 +21,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface PersistenceUnit {
 String name() default "";
+
 String unitName() default "";
 }
diff --git a/java/jakarta/transaction/Synchronization.java 
b/java/jakarta/transaction/Syn

[tomcat] 05/10: Code clean-up - no functional change

[markt]

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 847ed3ace330695d1c3c99de959d05563326aed2
Author: Mark Thomas 
AuthorDate: Thu Apr 13 17:11:48 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/websocket/ClientEndpoint.java |   6 +-
 java/jakarta/websocket/ClientEndpointConfig.java   |  31 ++--
 java/jakarta/websocket/CloseReason.java|   6 +-
 java/jakarta/websocket/ContainerProvider.java  |  15 +-
 java/jakarta/websocket/DecodeException.java|   3 +-
 .../websocket/DefaultClientEndpointConfig.java |   9 +-
 java/jakarta/websocket/Encoder.java|   6 +-
 java/jakarta/websocket/Endpoint.java   |   9 +-
 java/jakarta/websocket/Extension.java  |   2 +
 java/jakarta/websocket/MessageHandler.java |   7 +-
 java/jakarta/websocket/PongMessage.java|   6 +-
 java/jakarta/websocket/RemoteEndpoint.java | 186 ++---
 java/jakarta/websocket/SendResult.java |   2 +-
 java/jakarta/websocket/Session.java|  93 +--
 java/jakarta/websocket/WebSocketContainer.java |  70 
 .../server/DefaultServerEndpointConfig.java|  11 +-
 .../jakarta/websocket/server/HandshakeRequest.java |  12 +-
 java/jakarta/websocket/server/PathParam.java   |   5 +-
 .../websocket/server/ServerApplicationConfig.java  |  27 ++-
 java/jakarta/websocket/server/ServerContainer.java |  27 +--
 java/jakarta/websocket/server/ServerEndpoint.java  |   7 +-
 .../websocket/server/ServerEndpointConfig.java |  66 +++-
 22 files changed, 271 insertions(+), 335 deletions(-)

diff --git a/java/jakarta/websocket/ClientEndpoint.java 
b/java/jakarta/websocket/ClientEndpoint.java
index fb19ad0cd1..acaa160cc8 100644
--- a/java/jakarta/websocket/ClientEndpoint.java
+++ b/java/jakarta/websocket/ClientEndpoint.java
@@ -27,8 +27,10 @@ import jakarta.websocket.ClientEndpointConfig.Configurator;
 @Target(ElementType.TYPE)
 public @interface ClientEndpoint {
 String[] subprotocols() default {};
+
 Class[] decoders() default {};
+
 Class[] encoders() default {};
-Class configurator()
-default Configurator.class;
+
+Class configurator() default Configurator.class;
 }
diff --git a/java/jakarta/websocket/ClientEndpointConfig.java 
b/java/jakarta/websocket/ClientEndpointConfig.java
index e74d4675f9..ce3caba85e 100644
--- a/java/jakarta/websocket/ClientEndpointConfig.java
+++ b/java/jakarta/websocket/ClientEndpointConfig.java
@@ -34,8 +34,8 @@ public interface ClientEndpointConfig extends EndpointConfig {
 
 final class Builder {
 
-private static final Configurator DEFAULT_CONFIGURATOR =
-new Configurator() {};
+private static final Configurator DEFAULT_CONFIGURATOR = new 
Configurator() {
+};
 
 
 public static Builder create() {
@@ -55,8 +55,8 @@ public interface ClientEndpointConfig extends EndpointConfig {
 private SSLContext sslContext = null;
 
 public ClientEndpointConfig build() {
-return new DefaultClientEndpointConfig(preferredSubprotocols,
-extensions, encoders, decoders, sslContext, configurator);
+return new DefaultClientEndpointConfig(preferredSubprotocols, 
extensions, encoders, decoders, sslContext,
+configurator);
 }
 
 
@@ -70,21 +70,17 @@ public interface ClientEndpointConfig extends 
EndpointConfig {
 }
 
 
-public Builder preferredSubprotocols(
-List preferredSubprotocols) {
-if (preferredSubprotocols == null ||
-preferredSubprotocols.size() == 0) {
+public Builder preferredSubprotocols(List 
preferredSubprotocols) {
+if (preferredSubprotocols == null || preferredSubprotocols.size() 
== 0) {
 this.preferredSubprotocols = Collections.emptyList();
 } else {
-this.preferredSubprotocols =
-Collections.unmodifiableList(preferredSubprotocols);
+this.preferredSubprotocols = 
Collections.unmodifiableList(preferredSubprotocols);
 }
 return this;
 }
 
 
-public Builder extensions(
-List extensions) {
+public Builder extensions(List extensions) {
 if (extensions == null || extensions.size() == 0) {
 this.extensions = Collections.emptyList();
 } else {
@@ -124,18 +120,17 @@ public interface ClientEndpointConfig extends 
EndpointConfig {
 class Configurator {
 
 /**
- * Provides the client with a mechanism to inspect and/or modify the 
headers
- * that are sent to the server to start the WebSocket handshake.
+ * Provides the client with a mechanism to inspect and/or modify the 
heade

[tomcat] branch 10.1.x updated: Tweak formatting settings

[markt]

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 8a2551 Tweak formatting settings
8a2551 is described below

commit 8a25518e5470ffa8344be08c7f2381d023c0
Author: Mark Thomas 
AuthorDate: Thu Apr 13 17:09:53 2023 +0100

Tweak formatting settings

- Use Map rather than Map
- Ensure line wrap occurs after the operator
- Better line wrapping for assignments
---
 res/ide-support/eclipse/formatting-asf-tomcat.xml | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/res/ide-support/eclipse/formatting-asf-tomcat.xml 
b/res/ide-support/eclipse/formatting-asf-tomcat.xml
index 7a4effe304..c58449c8a1 100644
--- a/res/ide-support/eclipse/formatting-asf-tomcat.xml
+++ b/res/ide-support/eclipse/formatting-asf-tomcat.xml
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-
+
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 
@@ -76,7 +76,7 @@
 
 
 
-
+
 
 
 
@@ -108,7 +108,7 @@
 
 
 
-
+
 
 
 
@@ -128,7 +128,7 @@
 
 
 
-
+
 
 
 
@@ -174,6 +174,7 @@
 
 
 
+
 
 
 
@@ -321,7 +322,7 @@
 
 
 
-
+
 
 
 


-
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: Tweak formatting settings

[markt]

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 4fb5d7a1df Tweak formatting settings
4fb5d7a1df is described below

commit 4fb5d7a1df7e8ee93a0626305eae8f65eaa65d99
Author: Mark Thomas 
AuthorDate: Thu Apr 13 17:09:53 2023 +0100

Tweak formatting settings

- Use Map rather than Map
- Ensure line wrap occurs after the operator
- Better line wrapping for assignments
---
 res/ide-support/eclipse/formatting-asf-tomcat.xml | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/res/ide-support/eclipse/formatting-asf-tomcat.xml 
b/res/ide-support/eclipse/formatting-asf-tomcat.xml
index 7a4effe304..c58449c8a1 100644
--- a/res/ide-support/eclipse/formatting-asf-tomcat.xml
+++ b/res/ide-support/eclipse/formatting-asf-tomcat.xml
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-
+
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 
@@ -76,7 +76,7 @@
 
 
 
-
+
 
 
 
@@ -108,7 +108,7 @@
 
 
 
-
+
 
 
 
@@ -128,7 +128,7 @@
 
 
 
-
+
 
 
 
@@ -174,6 +174,7 @@
 
 
 
+
 
 
 
@@ -321,7 +322,7 @@
 
 
 
-
+
 
 
 


-
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: Tweak formatting settings

[markt]

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new f95552b61b Tweak formatting settings
f95552b61b is described below

commit f95552b61b199f4e047e4bc751aa43be6d5aaf00
Author: Mark Thomas 
AuthorDate: Thu Apr 13 17:09:53 2023 +0100

Tweak formatting settings

- Use Map rather than Map
- Ensure line wrap occurs after the operator
- Better line wrapping for assignments
---
 res/ide-support/eclipse/formatting-asf-tomcat.xml | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/res/ide-support/eclipse/formatting-asf-tomcat.xml 
b/res/ide-support/eclipse/formatting-asf-tomcat.xml
index 7a4effe304..c58449c8a1 100644
--- a/res/ide-support/eclipse/formatting-asf-tomcat.xml
+++ b/res/ide-support/eclipse/formatting-asf-tomcat.xml
@@ -15,8 +15,8 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-
-
+
+
 
 
 
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 
@@ -76,7 +76,7 @@
 
 
 
-
+
 
 
 
@@ -108,7 +108,7 @@
 
 
 
-
+
 
 
 
@@ -128,7 +128,7 @@
 
 
 
-
+
 
 
 
@@ -174,6 +174,7 @@
 
 
 
+
 
 
 
@@ -321,7 +322,7 @@
 
 
 
-
+
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: Fix typo

[markt]

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 5afdd20934 Fix typo
5afdd20934 is described below

commit 5afdd20934596e5d19e45364e8e883b61f9d1daa
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:59:53 2023 +0100

Fix typo
---
 java/jakarta/servlet/http/HttpServlet.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/jakarta/servlet/http/HttpServlet.java 
b/java/jakarta/servlet/http/HttpServlet.java
index 483bcc0423..25d7f5693f 100644
--- a/java/jakarta/servlet/http/HttpServlet.java
+++ b/java/jakarta/servlet/http/HttpServlet.java
@@ -565,7 +565,7 @@ public abstract class HttpServlet extends GenericServlet {
  * Is the provided HTTP request header considered sensitive and therefore 
should be excluded from the response to a
  * {@code TRACE} request?
  * 
- * By default, the headers thats start with any of the following are 
considered sensitive:
+ * By default, the headers that start with any of the following are 
considered sensitive:
  * 
  * authorization
  * cookie


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/08: Code clean-up - no functional change

[markt]

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 723dfc051b5407f67319459dee2eb51d7ed0e2f6
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:31:42 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/el/BeanELResolver.java| 12 ++--
 java/jakarta/el/ELContext.java | 10 +-
 java/jakarta/el/ELManager.java |  2 +-
 java/jakarta/el/ExpressionFactory.java | 14 +++---
 java/jakarta/el/ImportHandler.java | 12 ++--
 java/jakarta/el/LambdaExpression.java  |  4 ++--
 java/jakarta/el/MapELResolver.java | 20 ++--
 java/jakarta/el/StandardELContext.java | 14 +++---
 java/jakarta/el/StaticFieldELResolver.java |  8 
 java/jakarta/el/Util.java  |  6 +++---
 10 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/java/jakarta/el/BeanELResolver.java 
b/java/jakarta/el/BeanELResolver.java
index a909b231ea..0d8ad14558 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -53,7 +53,7 @@ public class BeanELResolver extends ELResolver {
 
 private final boolean readOnly;
 
-private final ConcurrentCache cache = new 
ConcurrentCache<>(CACHE_SIZE);
+private final ConcurrentCache cache = new 
ConcurrentCache<>(CACHE_SIZE);
 
 /**
  * Creates a writable instance of the standard JavaBean resolver.
@@ -150,8 +150,8 @@ public class BeanELResolver extends ELResolver {
 // Find the matching method
 Method matchingMethod = Util.findMethod(context, base.getClass(), 
base, methodName, paramTypes, params);
 
-Object[] parameters = Util.buildParameters(context, 
matchingMethod.getParameterTypes(),
-matchingMethod.isVarArgs(), params);
+Object[] parameters =
+Util.buildParameters(context, 
matchingMethod.getParameterTypes(), matchingMethod.isVarArgs(), params);
 
 Object result = null;
 try {
@@ -211,7 +211,7 @@ public class BeanELResolver extends ELResolver {
 }
 
 static final class BeanProperties {
-private final Map properties;
+private final Map properties;
 
 private final Class type;
 
@@ -333,8 +333,8 @@ public class BeanELResolver extends ELResolver {
 private static final class ConcurrentCache {
 
 private final int size;
-private final Map eden;
-private final Map longterm;
+private final Map eden;
+private final Map longterm;
 
 ConcurrentCache(int size) {
 this.size = size;
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index 0e80de277f..12840d1597 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -32,7 +32,7 @@ public abstract class ELContext {
 
 private Locale locale;
 
-private Map, Object> map;
+private Map,Object> map;
 
 private boolean resolved;
 
@@ -40,7 +40,7 @@ public abstract class ELContext {
 
 private List listeners;
 
-private Deque> lambdaArguments = new ArrayDeque<>();
+private Deque> lambdaArguments = new ArrayDeque<>();
 
 public ELContext() {
 this.resolved = false;
@@ -235,7 +235,7 @@ public abstract class ELContext {
  * @since EL 3.0
  */
 public boolean isLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : lambdaArguments) {
 if (arguments.containsKey(name)) {
 return true;
 }
@@ -253,7 +253,7 @@ public abstract class ELContext {
  * @since EL 3.0
  */
 public Object getLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : lambdaArguments) {
 Object result = arguments.get(name);
 if (result != null) {
 return result;
@@ -270,7 +270,7 @@ public abstract class ELContext {
  *
  * @since EL 3.0
  */
-public void enterLambdaScope(Map arguments) {
+public void enterLambdaScope(Map arguments) {
 lambdaArguments.push(arguments);
 }
 
diff --git a/java/jakarta/el/ELManager.java b/java/jakarta/el/ELManager.java
index b3787bbd3e..40749368d3 100644
--- a/java/jakarta/el/ELManager.java
+++ b/java/jakarta/el/ELManager.java
@@ -73,7 +73,7 @@ public class ELManager {
 }
 
 public Object defineBean(String name, Object bean) {
-Map localBeans = getELContext().getLocalBeans();
+Map localBeans = getELContext().getLocalBeans();
 
 if (bean == null) {
 return localBeans.remove(name);
diff --git a/java/jakarta/el/ExpressionFactory.java 
b/java/jakarta/el/ExpressionFactory.java
index 0302829c9e..f1b372027a 100644
--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
@@ -48,13 +48,13 @@ p

[tomcat] 04/08: Code clean-up - no functional change

[markt]

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 32c83c6efc5e213970e6b49cd8f9275b492f537b
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:32:11 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/websocket/ClientEndpoint.java |   6 +-
 java/jakarta/websocket/ClientEndpointConfig.java   |  31 ++--
 java/jakarta/websocket/CloseReason.java|   6 +-
 java/jakarta/websocket/ContainerProvider.java  |  15 +-
 java/jakarta/websocket/DecodeException.java|   3 +-
 .../websocket/DefaultClientEndpointConfig.java |   9 +-
 java/jakarta/websocket/Encoder.java|   6 +-
 java/jakarta/websocket/Endpoint.java   |   9 +-
 java/jakarta/websocket/Extension.java  |   2 +
 java/jakarta/websocket/MessageHandler.java |   7 +-
 java/jakarta/websocket/PongMessage.java|   6 +-
 java/jakarta/websocket/RemoteEndpoint.java | 186 ++---
 java/jakarta/websocket/SendResult.java |   2 +-
 java/jakarta/websocket/Session.java|  93 +--
 java/jakarta/websocket/WebSocketContainer.java |  70 
 .../server/DefaultServerEndpointConfig.java|  11 +-
 .../jakarta/websocket/server/HandshakeRequest.java |  12 +-
 java/jakarta/websocket/server/PathParam.java   |   5 +-
 .../websocket/server/ServerApplicationConfig.java  |  27 ++-
 java/jakarta/websocket/server/ServerContainer.java |  27 +--
 java/jakarta/websocket/server/ServerEndpoint.java  |   7 +-
 .../websocket/server/ServerEndpointConfig.java |  69 +++-
 22 files changed, 272 insertions(+), 337 deletions(-)

diff --git a/java/jakarta/websocket/ClientEndpoint.java 
b/java/jakarta/websocket/ClientEndpoint.java
index fb19ad0cd1..acaa160cc8 100644
--- a/java/jakarta/websocket/ClientEndpoint.java
+++ b/java/jakarta/websocket/ClientEndpoint.java
@@ -27,8 +27,10 @@ import jakarta.websocket.ClientEndpointConfig.Configurator;
 @Target(ElementType.TYPE)
 public @interface ClientEndpoint {
 String[] subprotocols() default {};
+
 Class[] decoders() default {};
+
 Class[] encoders() default {};
-Class configurator()
-default Configurator.class;
+
+Class configurator() default Configurator.class;
 }
diff --git a/java/jakarta/websocket/ClientEndpointConfig.java 
b/java/jakarta/websocket/ClientEndpointConfig.java
index e74d4675f9..ce3caba85e 100644
--- a/java/jakarta/websocket/ClientEndpointConfig.java
+++ b/java/jakarta/websocket/ClientEndpointConfig.java
@@ -34,8 +34,8 @@ public interface ClientEndpointConfig extends EndpointConfig {
 
 final class Builder {
 
-private static final Configurator DEFAULT_CONFIGURATOR =
-new Configurator() {};
+private static final Configurator DEFAULT_CONFIGURATOR = new 
Configurator() {
+};
 
 
 public static Builder create() {
@@ -55,8 +55,8 @@ public interface ClientEndpointConfig extends EndpointConfig {
 private SSLContext sslContext = null;
 
 public ClientEndpointConfig build() {
-return new DefaultClientEndpointConfig(preferredSubprotocols,
-extensions, encoders, decoders, sslContext, configurator);
+return new DefaultClientEndpointConfig(preferredSubprotocols, 
extensions, encoders, decoders, sslContext,
+configurator);
 }
 
 
@@ -70,21 +70,17 @@ public interface ClientEndpointConfig extends 
EndpointConfig {
 }
 
 
-public Builder preferredSubprotocols(
-List preferredSubprotocols) {
-if (preferredSubprotocols == null ||
-preferredSubprotocols.size() == 0) {
+public Builder preferredSubprotocols(List 
preferredSubprotocols) {
+if (preferredSubprotocols == null || preferredSubprotocols.size() 
== 0) {
 this.preferredSubprotocols = Collections.emptyList();
 } else {
-this.preferredSubprotocols =
-Collections.unmodifiableList(preferredSubprotocols);
+this.preferredSubprotocols = 
Collections.unmodifiableList(preferredSubprotocols);
 }
 return this;
 }
 
 
-public Builder extensions(
-List extensions) {
+public Builder extensions(List extensions) {
 if (extensions == null || extensions.size() == 0) {
 this.extensions = Collections.emptyList();
 } else {
@@ -124,18 +120,17 @@ public interface ClientEndpointConfig extends 
EndpointConfig {
 class Configurator {
 
 /**
- * Provides the client with a mechanism to inspect and/or modify the 
headers
- * that are sent to the server to start the WebSocket handshake.
+ * Provides the client with a mechanism to inspect and/or modify the 
hea

[tomcat] 06/08: Code clean-up - no functional change

[markt]

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 b37f755905b10f0b6d8e0693f9c982854c809033
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:32:25 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/annotation/Generated.java | 11 ++-
 java/jakarta/annotation/ManagedBean.java   |  3 +--
 java/jakarta/annotation/PostConstruct.java |  3 +--
 java/jakarta/annotation/PreDestroy.java|  3 +--
 java/jakarta/annotation/Priority.java  |  4 ++--
 java/jakarta/annotation/Resource.java  |  7 +++
 java/jakarta/annotation/security/DenyAll.java  |  2 +-
 java/jakarta/annotation/security/PermitAll.java|  2 +-
 java/jakarta/annotation/security/RolesAllowed.java |  2 +-
 9 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/java/jakarta/annotation/Generated.java 
b/java/jakarta/annotation/Generated.java
index e13713dd50..4997cdf44b 100644
--- a/java/jakarta/annotation/Generated.java
+++ b/java/jakarta/annotation/Generated.java
@@ -28,20 +28,21 @@ import java.lang.annotation.Target;
  * @since Common Annotations 1.0
  */
 @Documented
-@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
-ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
-ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})
+@Target({ ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, 
ElementType.FIELD, ElementType.LOCAL_VARIABLE,
+ElementType.METHOD, ElementType.PACKAGE, ElementType.PARAMETER, 
ElementType.TYPE })
 @Retention(RetentionPolicy.SOURCE)
 public @interface Generated {
 /**
- * @return The name of the code generator. It is recommended that the fully
- * qualified name of the code generator is used.
+ * @return The name of the code generator. It is recommended that the 
fully qualified name of the code generator is
+ * used.
  */
 String[] value();
+
 /**
  * @return The date the code was generated
  */
 String date() default "";
+
 /**
  * @return Additional comments (if any) related to the code generation
  */
diff --git a/java/jakarta/annotation/ManagedBean.java 
b/java/jakarta/annotation/ManagedBean.java
index 0eac89251a..7a839d802d 100644
--- a/java/jakarta/annotation/ManagedBean.java
+++ b/java/jakarta/annotation/ManagedBean.java
@@ -26,8 +26,7 @@ import java.lang.annotation.Target;
  *
  * @since Common Annotations 1.1
  *
- * @deprecated This will be removed no earlier than Jakarta EE 11. Use CDI 
beans
- * instead.
+ * @deprecated This will be removed no earlier than Jakarta EE 11. Use CDI 
beans instead.
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/java/jakarta/annotation/PostConstruct.java 
b/java/jakarta/annotation/PostConstruct.java
index 9326bc1aee..8f32f4fd52 100644
--- a/java/jakarta/annotation/PostConstruct.java
+++ b/java/jakarta/annotation/PostConstruct.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Added to a method required to be called after the object has been 
constructed
- * and before it used.
+ * Added to a method required to be called after the object has been 
constructed and before it used.
  *
  * @since Common Annotations 1.0
  */
diff --git a/java/jakarta/annotation/PreDestroy.java 
b/java/jakarta/annotation/PreDestroy.java
index b25d2fe90a..3635f769b4 100644
--- a/java/jakarta/annotation/PreDestroy.java
+++ b/java/jakarta/annotation/PreDestroy.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Added to a method required to be called once the object is no longer 
required
- * and before it is discarded.
+ * Added to a method required to be called once the object is no longer 
required and before it is discarded.
  *
  * @since Common Annotations 1.0
  */
diff --git a/java/jakarta/annotation/Priority.java 
b/java/jakarta/annotation/Priority.java
index 918ac11365..8fd399c094 100644
--- a/java/jakarta/annotation/Priority.java
+++ b/java/jakarta/annotation/Priority.java
@@ -21,8 +21,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
 /**
- * Used to define the order in which classes or parameters should be used. The
- * annotated class or parameter defines how the prority value is used.
+ * Used to define the order in which classes or parameters should be used. The 
annotated class or parameter defines how
+ * the prority value is used.
  *
  * @since Common Annotations 1.2
  */
diff --git a/java/jakarta/annotation/Resource.java 
b/java/jakarta/annotation/Resource.java
index b779288923..a86d4cf7df 100644
--- a/java/jakarta/annotation/Resource.java
+++ b/java/jakarta/annotation/Resource.java
@@ -23,13 +23,12 @@ import java.lang.annotation

[tomcat] branch 10.1.x updated (89999a2551 -> c2dc6683fd)

[markt]

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 8a2551 Tweak formatting settings
 new 723dfc051b Code clean-up - no functional change
 new 7b329c113c Code clean-up - no functional change
 new 7ea4449121 Code clean-up - no functional change
 new 32c83c6efc Code clean-up - no functional change
 new 0694ca7d03 Code clean-up - no functional change
 new b37f755905 Code clean-up - no functional change
 new 6bc37e9cf6 Code clean-up - no functional change
 new c2dc6683fd Align with 11.0.x

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/jakarta/annotation/Generated.java |   11 +-
 java/jakarta/annotation/ManagedBean.java   |3 +-
 java/jakarta/annotation/PostConstruct.java |3 +-
 java/jakarta/annotation/PreDestroy.java|3 +-
 java/jakarta/annotation/Priority.java  |4 +-
 java/jakarta/annotation/Resource.java  |7 +-
 java/jakarta/annotation/security/DenyAll.java  |2 +-
 java/jakarta/annotation/security/PermitAll.java|2 +-
 java/jakarta/annotation/security/RolesAllowed.java |2 +-
 java/jakarta/ejb/EJB.java  |7 +-
 java/jakarta/el/BeanELResolver.java|   12 +-
 java/jakarta/el/ELContext.java |   10 +-
 java/jakarta/el/ELManager.java |2 +-
 java/jakarta/el/ExpressionFactory.java |   14 +-
 java/jakarta/el/ImportHandler.java |   12 +-
 java/jakarta/el/LambdaExpression.java  |4 +-
 java/jakarta/el/MapELResolver.java |   20 +-
 java/jakarta/el/StandardELContext.java |   14 +-
 java/jakarta/el/StaticFieldELResolver.java |8 +-
 java/jakarta/el/Util.java  |6 +-
 java/jakarta/mail/Session.java |1 +
 java/jakarta/mail/internet/MimeMessage.java|2 +
 java/jakarta/persistence/PersistenceContext.java   |6 +-
 java/jakarta/persistence/PersistenceProperty.java  |1 +
 java/jakarta/persistence/PersistenceUnit.java  |3 +-
 java/jakarta/security/auth/message/ClientAuth.java |   39 +-
 java/jakarta/security/auth/message/ServerAuth.java |   41 +-
 .../message/callback/CallerPrincipalCallback.java  |4 +-
 .../auth/message/callback/CertStoreCallback.java   |3 +-
 .../message/callback/GroupPrincipalCallback.java   |3 +-
 .../callback/PasswordValidationCallback.java   |4 +-
 .../auth/message/callback/PrivateKeyCallback.java  |5 +-
 .../auth/message/callback/SecretKeyCallback.java   |4 +-
 .../auth/message/callback/TrustStoreCallback.java  |3 +-
 .../auth/message/config/AuthConfigFactory.java |   57 +-
 .../auth/message/config/AuthConfigProvider.java|6 +-
 .../auth/message/module/ClientAuthModule.java  |4 +-
 .../auth/message/module/ServerAuthModule.java  |4 +-
 java/jakarta/servlet/AsyncContext.java |   78 +-
 java/jakarta/servlet/AsyncEvent.java   |   26 +-
 java/jakarta/servlet/AsyncListener.java|   26 +-
 java/jakarta/servlet/DispatcherType.java   |   10 +-
 java/jakarta/servlet/Filter.java   |   95 +-
 java/jakarta/servlet/FilterChain.java  |   26 +-
 java/jakarta/servlet/FilterConfig.java |   34 +-
 java/jakarta/servlet/FilterRegistration.java   |   55 +-
 java/jakarta/servlet/GenericFilter.java|   16 +-
 java/jakarta/servlet/GenericServlet.java   |  165 ++--
 java/jakarta/servlet/HttpConstraintElement.java|   45 +-
 .../servlet/HttpMethodConstraintElement.java   |   33 +-
 java/jakarta/servlet/MultipartConfigElement.java   |   29 +-
 java/jakarta/servlet/ReadListener.java |   10 +-
 java/jakarta/servlet/Registration.java |   49 +-
 java/jakarta/servlet/RequestDispatcher.java|  269 +++---
 java/jakarta/servlet/Servlet.java  |  144 +--
 java/jakarta/servlet/ServletConfig.java|   40 +-
 java/jakarta/servlet/ServletConnection.java|   54 +-
 .../servlet/ServletContainerInitializer.java   |   30 +-
 java/jakarta/servlet/ServletContext.java   | 1006 +---
 .../servlet/ServletContextAttributeEvent.java  |   20 +-
 .../servlet/ServletContextAttributeListener.java   |   23 +-
 java/jakarta/servlet/ServletContextEvent.java  |6 +-
 java/jakarta/servlet/ServletContextListener.java   |   22 +-
 java/jakarta/servlet/ServletException.java |   46 +-
 java/jakarta/servlet/ServletInputStream.java   |   67 +-
 java/jakarta/servlet/ServletOutputStrea

[tomcat] 07/08: Code clean-up - no functional change

[markt]

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 6bc37e9cf6d5e81b40a79d6a4a1e3240965941ab
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:32:29 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/ejb/EJB.java |  7 ++-
 java/jakarta/mail/Session.java|  1 +
 java/jakarta/mail/internet/MimeMessage.java   |  2 ++
 java/jakarta/persistence/PersistenceContext.java  |  6 +-
 java/jakarta/persistence/PersistenceProperty.java |  1 +
 java/jakarta/persistence/PersistenceUnit.java |  3 ++-
 java/jakarta/transaction/Synchronization.java |  1 +
 java/jakarta/transaction/Transaction.java | 12 
 java/jakarta/transaction/TransactionManager.java  |  9 +++--
 java/jakarta/transaction/UserTransaction.java |  6 ++
 java/jakarta/xml/ws/WebServiceRef.java|  6 +-
 11 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/java/jakarta/ejb/EJB.java b/java/jakarta/ejb/EJB.java
index 635ba7f4f6..82db99ed39 100644
--- a/java/jakarta/ejb/EJB.java
+++ b/java/jakarta/ejb/EJB.java
@@ -21,15 +21,20 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD})
+@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface EJB {
 String name() default "";
+
 String description() default "";
+
 @SuppressWarnings("rawtypes") // Can't use Class because API needs to 
match specification
 Class beanInterface() default java.lang.Object.class;
+
 String beanName() default "";
+
 String mappedName() default "";
+
 String lookup() default "";
 }
diff --git a/java/jakarta/mail/Session.java b/java/jakarta/mail/Session.java
index d638f81c57..87ff869d3b 100644
--- a/java/jakarta/mail/Session.java
+++ b/java/jakarta/mail/Session.java
@@ -23,6 +23,7 @@ public class Session {
 public static Session getInstance(Properties props, Authenticator auth) {
 return null;
 }
+
 public static Session getInstance(Properties props) {
 return null;
 }
diff --git a/java/jakarta/mail/internet/MimeMessage.java 
b/java/jakarta/mail/internet/MimeMessage.java
index 08cdb80330..39644f0509 100644
--- a/java/jakarta/mail/internet/MimeMessage.java
+++ b/java/jakarta/mail/internet/MimeMessage.java
@@ -23,9 +23,11 @@ public class MimeMessage implements MimePart {
 public MimeMessage(Session session) {
 // Dummy implementation
 }
+
 public void setFrom(InternetAddress from) {
 // Dummy implementation
 }
+
 public void setSubject(String subject) {
 // Dummy implementation
 }
diff --git a/java/jakarta/persistence/PersistenceContext.java 
b/java/jakarta/persistence/PersistenceContext.java
index 9b5f8cada4..78ece9e615 100644
--- a/java/jakarta/persistence/PersistenceContext.java
+++ b/java/jakarta/persistence/PersistenceContext.java
@@ -21,13 +21,17 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface PersistenceContext {
 String name() default "";
+
 String unitName() default "";
+
 PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+
 PersistenceProperty[] properties() default {};
+
 SynchronizationType synchronization() default 
SynchronizationType.SYNCHRONIZED;
 }
diff --git a/java/jakarta/persistence/PersistenceProperty.java 
b/java/jakarta/persistence/PersistenceProperty.java
index 74b9827362..3ed05e1982 100644
--- a/java/jakarta/persistence/PersistenceProperty.java
+++ b/java/jakarta/persistence/PersistenceProperty.java
@@ -25,5 +25,6 @@ import java.lang.annotation.Target;
 
 public @interface PersistenceProperty {
 String name();
+
 String value();
 }
diff --git a/java/jakarta/persistence/PersistenceUnit.java 
b/java/jakarta/persistence/PersistenceUnit.java
index 258ce1ad5e..0580f2 100644
--- a/java/jakarta/persistence/PersistenceUnit.java
+++ b/java/jakarta/persistence/PersistenceUnit.java
@@ -21,10 +21,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface PersistenceUnit {
 String name() default "";
+
 String unitName() default "";
 }
diff --git a/java/jakarta/transaction/Synchronization.java 
b/java/jakarta/transaction/S

[tomcat] 05/08: Code clean-up - no functional change

[markt]

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 0694ca7d03f9dfbcb0afaae20b0cf5a1a2959baf
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:32:21 2023 +0100

Code clean-up - no functional change
---
 java/jakarta/security/auth/message/ClientAuth.java | 39 ++-
 java/jakarta/security/auth/message/ServerAuth.java | 41 +++-
 .../message/callback/CallerPrincipalCallback.java  |  4 +-
 .../auth/message/callback/CertStoreCallback.java   |  3 +-
 .../message/callback/GroupPrincipalCallback.java   |  3 +-
 .../callback/PasswordValidationCallback.java   |  4 +-
 .../auth/message/callback/PrivateKeyCallback.java  |  5 +-
 .../auth/message/callback/SecretKeyCallback.java   |  4 +-
 .../auth/message/callback/TrustStoreCallback.java  |  3 +-
 .../auth/message/config/AuthConfigFactory.java | 57 ++
 .../auth/message/config/AuthConfigProvider.java|  6 +--
 .../auth/message/module/ClientAuthModule.java  |  4 +-
 .../auth/message/module/ServerAuthModule.java  |  4 +-
 13 files changed, 76 insertions(+), 101 deletions(-)

diff --git a/java/jakarta/security/auth/message/ClientAuth.java 
b/java/jakarta/security/auth/message/ClientAuth.java
index 063075f35a..c4bf93ed14 100644
--- a/java/jakarta/security/auth/message/ClientAuth.java
+++ b/java/jakarta/security/auth/message/ClientAuth.java
@@ -24,45 +24,38 @@ public interface ClientAuth {
  * Secure (authenticate) the request.
  *
  * @param messageInfo   The associated request and response
- * @param clientSubject The subject that represents the source of the
- *  request
+ * @param clientSubject The subject that represents the source of the 
request
  *
- * @return An AuthStatus instance that represents the result of the
- * authentication
+ * @return An AuthStatus instance that represents the result of the 
authentication
  *
- * @throws AuthException If the a failure occurred in a manner that
- *   prevented the failure from being communicated via
- *   messageInfo
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
  */
 AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject) 
throws AuthException;
 
 /**
  * Validate a response.
  *
- * @param messageInfo   The associated request and response
- * @param clientSubject The subject that represents the recipient of 
the
- *  response
- * @param serviceSubjectThe subject that represents the source of the
- *  response
+ * @param messageInfoThe associated request and response
+ * @param clientSubject  The subject that represents the recipient of the 
response
+ * @param serviceSubject The subject that represents the source of the 
response
  *
- * @return An AuthStatus instance that represents the result of the
- * validation
+ * @return An AuthStatus instance that represents the result of the 
validation
  *
- * @throws AuthException If the a failure occurred in a manner that
- *   prevented the failure from being communicated via
- *   messageInfo
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
  */
-default AuthStatus validateResponse(MessageInfo messageInfo, Subject 
clientSubject,
-Subject serviceSubject) throws AuthException {
+default AuthStatus validateResponse(MessageInfo messageInfo, Subject 
clientSubject, Subject serviceSubject)
+throws AuthException {
 return AuthStatus.SUCCESS;
 }
 
 /**
- * Remove principals and/or credentials from the subject that were
- * previously added by this authentication mechanism.
+ * Remove principals and/or credentials from the subject that were 
previously added by this authentication
+ * mechanism.
  *
- * @param messageInfo   The associated request and response
- * @param subject   The subject to clean
+ * @param messageInfo The associated request and response
+ * @param subject The subject to clean
  *
  * @throws AuthException If the a failure occurred
  */
diff --git a/java/jakarta/security/auth/message/ServerAuth.java 
b/java/jakarta/security/auth/message/ServerAuth.java
index d0777618f5..84141ade22 100644
--- a/java/jakarta/security/auth/message/ServerAuth.java
+++ b/java/jakarta/security/auth/message/ServerAuth.java
@@ -23,46 +23,39 @@ public interface ServerAuth {
 /**
  * Validate the request.
  *
- 

[tomcat] 08/08: Align with 11.0.x

[markt]

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 c2dc6683fd1b04af52b57a933756e79d64f15de6
Author: Mark Thomas 
AuthorDate: Fri Apr 14 12:01:25 2023 +0100

Align with 11.0.x

Improve Javadoc wording
Fix/improve formatting
---
 java/jakarta/servlet/Servlet.java  |  2 +-
 java/jakarta/servlet/ServletContext.java   |  7 +++--
 java/jakarta/servlet/ServletRequest.java   | 26 ---
 java/jakarta/servlet/http/HttpServlet.java | 12 -
 java/jakarta/servlet/http/HttpServletResponse.java | 30 +++---
 .../servlet/http/HttpServletResponseWrapper.java   |  2 +-
 java/jakarta/servlet/jsp/JspPage.java  | 15 +++
 java/jakarta/servlet/jsp/tagext/IterationTag.java  |  1 -
 8 files changed, 53 insertions(+), 42 deletions(-)

diff --git a/java/jakarta/servlet/Servlet.java 
b/java/jakarta/servlet/Servlet.java
index c234a1f4df..838b4f0d25 100644
--- a/java/jakarta/servlet/Servlet.java
+++ b/java/jakarta/servlet/Servlet.java
@@ -90,7 +90,7 @@ public interface Servlet {
  * Servlets typically run inside multithreaded servlet containers that can 
handle multiple requests concurrently.
  * Developers must be aware to synchronize access to any shared resources 
such as files, network connections, and as
  * well as the servlet's class and instance variables. More information on 
multithreaded programming in Java is
- * available in http://java.sun.com/Series/Tutorial/java/threads/multithreaded.html";> the 
Java tutorial on
+ * available in http://java.sun.com/Series/Tutorial/java/threads/multithreaded.html";> the 
Java tutorial on
  * multi-threaded programming.
  *
  * @param req the ServletRequest object that contains the 
client's request
diff --git a/java/jakarta/servlet/ServletContext.java 
b/java/jakarta/servlet/ServletContext.java
index 99e731df80..fe7945c741 100644
--- a/java/jakarta/servlet/ServletContext.java
+++ b/java/jakarta/servlet/ServletContext.java
@@ -355,8 +355,7 @@ public interface ServletContext {
  * supported attributes can be retrieved using 
getAttributeNames.
  * 
  * The attribute is returned as a java.lang.Object or some 
subclass. Attribute names should follow the
- * same convention as package names. The Java Servlet API specification 
reserves names matching java.*,
- * javax.*, and sun.*.
+ * same convention as package names. The Jakarta EE platform reserves 
names matching jakarta.*.
  *
  * @param name a String specifying the name of the attribute
  *
@@ -387,8 +386,8 @@ public interface ServletContext {
  * 
  * If a null value is passed, the effect is the same as calling 
removeAttribute().
  * 
- * Attribute names should follow the same convention as package names. The 
Java Servlet API specification reserves
- * names matching java.*, javax.*, and 
sun.*.
+ * Attribute names should follow the same convention as package names. The 
Jakarta EE platform reserves names
+ * matching jakarta.*.
  *
  * @param name   a String specifying the name of the attribute
  * @param object an Object representing the attribute to be 
bound
diff --git a/java/jakarta/servlet/ServletRequest.java 
b/java/jakarta/servlet/ServletRequest.java
index b0865c21d3..7d12677ef0 100644
--- a/java/jakarta/servlet/ServletRequest.java
+++ b/java/jakarta/servlet/ServletRequest.java
@@ -18,6 +18,7 @@ package jakarta.servlet;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
@@ -44,10 +45,8 @@ public interface ServletRequest {
  * the client. Attributes can also be set programmatically using {@link 
ServletRequest#setAttribute}. This allows
  * information to be embedded into a request before a {@link 
RequestDispatcher} call.
  * 
- * Attribute names should follow the same conventions as package names. 
Names beginning with java.* and
- * javax.* are reserved for use by the Servlet specification. 
Names beginning with sun.*,
- * com.sun.*, oracle.* and 
com.oracle.*) are reserved for use by Oracle
- * Corporation.
+ * Attribute names should follow the same conventions as package names. 
Names beginning with jakarta.*
+ * are reserved for use by the Jakarta EE platform.
  *
  * @param name a String specifying the name of the attribute
  *
@@ -84,11 +83,11 @@ public interface ServletRequest {
  * Overrides the name of the character encoding used in the body of this 
request. This method must be called prior
  * to reading request parameters or reading input using getReader().
  *
- * @param env a String containing the name of the character 
encoding.
+ * @param encoding a {@code String} co

[tomcat] branch 9.0.x updated (4fb5d7a1df -> 8e92da0ace)

[markt]

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 4fb5d7a1df Tweak formatting settings
 new 3b1b9412dc Code clean-up - no functional change
 new 9087b3a84f Code clean-up - no functional change
 new 3a378cae7c Code clean-up - no functional change
 new ecc2d82c46 Code clean-up - no functional change
 new 6e0aeb5b41 Code clean-up - no functional change
 new cf8605a1aa Code clean-up - no functional change
 new 215a3f0ba8 Align with Java EE 8
 new 8e92da0ace Code clean-up - no functional change

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/javax/annotation/Generated.java   |   11 +-
 java/javax/annotation/PostConstruct.java   |3 +-
 java/javax/annotation/PreDestroy.java  |3 +-
 java/javax/annotation/Priority.java|6 +-
 java/javax/annotation/Resource.java|9 +-
 java/javax/annotation/security/DenyAll.java|2 +-
 java/javax/annotation/security/PermitAll.java  |2 +-
 java/javax/annotation/security/RolesAllowed.java   |2 +-
 .../javax/annotation/sql/DataSourceDefinition.java |2 +
 java/javax/ejb/EJB.java|7 +-
 java/javax/el/BeanELResolver.java  |   12 +-
 java/javax/el/ELContext.java   |   10 +-
 java/javax/el/ELManager.java   |2 +-
 java/javax/el/ExpressionFactory.java   |   14 +-
 java/javax/el/ImportHandler.java   |   12 +-
 java/javax/el/LambdaExpression.java|4 +-
 java/javax/el/MapELResolver.java   |   18 +-
 java/javax/el/StandardELContext.java   |   14 +-
 java/javax/el/StaticFieldELResolver.java   |8 +-
 java/javax/el/Util.java|6 +-
 java/javax/mail/Session.java   |1 +
 java/javax/mail/internet/MimeMessage.java  |2 +
 java/javax/persistence/PersistenceContext.java |6 +-
 java/javax/persistence/PersistenceProperty.java|1 +
 java/javax/persistence/PersistenceUnit.java|3 +-
 java/javax/security/auth/message/ClientAuth.java   |4 +-
 java/javax/security/auth/message/ServerAuth.java   |4 +-
 .../message/callback/CallerPrincipalCallback.java  |4 +-
 .../auth/message/callback/CertStoreCallback.java   |3 +-
 .../message/callback/GroupPrincipalCallback.java   |3 +-
 .../callback/PasswordValidationCallback.java   |4 +-
 .../auth/message/callback/PrivateKeyCallback.java  |5 +-
 .../auth/message/callback/SecretKeyCallback.java   |4 +-
 .../auth/message/callback/TrustStoreCallback.java  |3 +-
 .../auth/message/config/AuthConfigFactory.java |   56 +-
 .../auth/message/config/AuthConfigProvider.java|6 +-
 .../auth/message/config/ClientAuthConfig.java  |3 +-
 .../auth/message/config/ServerAuthConfig.java  |3 +-
 .../auth/message/module/ClientAuthModule.java  |4 +-
 .../auth/message/module/ServerAuthModule.java  |4 +-
 java/javax/servlet/AsyncContext.java   |   78 +-
 java/javax/servlet/AsyncEvent.java |   26 +-
 java/javax/servlet/AsyncListener.java  |   26 +-
 java/javax/servlet/DispatcherType.java |   10 +-
 java/javax/servlet/Filter.java |   95 +-
 java/javax/servlet/FilterChain.java|   26 +-
 java/javax/servlet/FilterConfig.java   |   34 +-
 java/javax/servlet/FilterRegistration.java |   55 +-
 java/javax/servlet/GenericFilter.java  |   16 +-
 java/javax/servlet/GenericServlet.java |  165 ++-
 java/javax/servlet/HttpConstraintElement.java  |   44 +-
 .../javax/servlet/HttpMethodConstraintElement.java |   33 +-
 java/javax/servlet/MultipartConfigElement.java |   29 +-
 java/javax/servlet/ReadListener.java   |   10 +-
 java/javax/servlet/Registration.java   |   49 +-
 java/javax/servlet/RequestDispatcher.java  |  269 ++---
 java/javax/servlet/Servlet.java|  144 +--
 java/javax/servlet/ServletConfig.java  |   40 +-
 .../javax/servlet/ServletContainerInitializer.java |   30 +-
 java/javax/servlet/ServletContext.java | 1207 ++--
 .../servlet/ServletContextAttributeEvent.java  |   20 +-
 .../servlet/ServletContextAttributeListener.java   |   23 +-
 java/javax/servlet/ServletContextEvent.java|6 +-
 java/javax/servlet/ServletContextListener.java |   22 +-
 java/javax/servlet/ServletException.java   |   46 +-
 java/javax/servlet/ServletInputStream.ja

[tomcat] 06/08: Code clean-up - no functional change

[markt]

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 cf8605a1aaeb1f377ca4dbd89343a6d3f133cec4
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:37:11 2023 +0100

Code clean-up - no functional change
---
 java/javax/ejb/EJB.java |  7 ++-
 java/javax/mail/Session.java|  1 +
 java/javax/mail/internet/MimeMessage.java   |  2 ++
 java/javax/persistence/PersistenceContext.java  |  6 +-
 java/javax/persistence/PersistenceProperty.java |  1 +
 java/javax/persistence/PersistenceUnit.java |  3 ++-
 java/javax/transaction/Synchronization.java |  1 +
 java/javax/transaction/Transaction.java | 12 
 java/javax/transaction/TransactionManager.java  |  9 +++--
 java/javax/transaction/UserTransaction.java |  6 ++
 java/javax/xml/ws/WebServiceRef.java|  6 +-
 11 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/java/javax/ejb/EJB.java b/java/javax/ejb/EJB.java
index bf37ba8b14..46b0aa23f6 100644
--- a/java/javax/ejb/EJB.java
+++ b/java/javax/ejb/EJB.java
@@ -21,15 +21,20 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD})
+@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface EJB {
 String name() default "";
+
 String description() default "";
+
 @SuppressWarnings("rawtypes") // Can't use Class because API needs to 
match specification
 Class beanInterface() default java.lang.Object.class;
+
 String beanName() default "";
+
 String mappedName() default "";
+
 String lookup() default "";
 }
diff --git a/java/javax/mail/Session.java b/java/javax/mail/Session.java
index a95a11b574..b409fa4110 100644
--- a/java/javax/mail/Session.java
+++ b/java/javax/mail/Session.java
@@ -23,6 +23,7 @@ public class Session {
 public static Session getInstance(Properties props, Authenticator auth) {
 return null;
 }
+
 public static Session getInstance(Properties props) {
 return null;
 }
diff --git a/java/javax/mail/internet/MimeMessage.java 
b/java/javax/mail/internet/MimeMessage.java
index 25877302af..4945ffd8af 100644
--- a/java/javax/mail/internet/MimeMessage.java
+++ b/java/javax/mail/internet/MimeMessage.java
@@ -23,9 +23,11 @@ public class MimeMessage implements MimePart {
 public MimeMessage(Session session) {
 // Dummy implementation
 }
+
 public void setFrom(InternetAddress from) {
 // Dummy implementation
 }
+
 public void setSubject(String subject) {
 // Dummy implementation
 }
diff --git a/java/javax/persistence/PersistenceContext.java 
b/java/javax/persistence/PersistenceContext.java
index 428fa09cff..eb65739aef 100644
--- a/java/javax/persistence/PersistenceContext.java
+++ b/java/javax/persistence/PersistenceContext.java
@@ -21,13 +21,17 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface PersistenceContext {
 String name() default "";
+
 String unitName() default "";
+
 PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+
 PersistenceProperty[] properties() default {};
+
 SynchronizationType synchronization() default 
SynchronizationType.SYNCHRONIZED;
 }
diff --git a/java/javax/persistence/PersistenceProperty.java 
b/java/javax/persistence/PersistenceProperty.java
index 6379071b11..5a8643482d 100644
--- a/java/javax/persistence/PersistenceProperty.java
+++ b/java/javax/persistence/PersistenceProperty.java
@@ -25,5 +25,6 @@ import java.lang.annotation.Target;
 
 public @interface PersistenceProperty {
 String name();
+
 String value();
 }
diff --git a/java/javax/persistence/PersistenceUnit.java 
b/java/javax/persistence/PersistenceUnit.java
index 54f5150c4b..5024f4159e 100644
--- a/java/javax/persistence/PersistenceUnit.java
+++ b/java/javax/persistence/PersistenceUnit.java
@@ -21,10 +21,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface PersistenceUnit {
 String name() default "";
+
 String unitName() default "";
 }
diff --git a/java/javax/transaction/Synchronization.java 
b/java/javax/transaction/Synchronization.java
index e187126363..9efecfca18 100644
--- a/java/javax/tr

[tomcat] 08/08: Code clean-up - no functional change

[markt]

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 8e92da0ace64e2261e5582d68189e3d57d8e00b1
Author: Mark Thomas 
AuthorDate: Fri Apr 14 12:25:59 2023 +0100

Code clean-up - no functional change
---
 java/javax/el/BeanELResolver.java| 12 ++--
 java/javax/el/ELContext.java | 10 +-
 java/javax/el/ELManager.java |  2 +-
 java/javax/el/ExpressionFactory.java | 14 +++---
 java/javax/el/ImportHandler.java | 12 ++--
 java/javax/el/LambdaExpression.java  |  4 ++--
 java/javax/el/MapELResolver.java | 18 +-
 java/javax/el/StandardELContext.java | 14 +++---
 java/javax/el/StaticFieldELResolver.java |  8 
 java/javax/el/Util.java  |  6 +++---
 10 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index 10d428aa51..38f74081f6 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -53,7 +53,7 @@ public class BeanELResolver extends ELResolver {
 
 private final boolean readOnly;
 
-private final ConcurrentCache cache = new 
ConcurrentCache<>(CACHE_SIZE);
+private final ConcurrentCache cache = new 
ConcurrentCache<>(CACHE_SIZE);
 
 /**
  * Creates a writable instance of the standard JavaBean resolver.
@@ -144,8 +144,8 @@ public class BeanELResolver extends ELResolver {
 // Find the matching method
 Method matchingMethod = Util.findMethod(context, base.getClass(), 
base, methodName, paramTypes, params);
 
-Object[] parameters = Util.buildParameters(context, 
matchingMethod.getParameterTypes(),
-matchingMethod.isVarArgs(), params);
+Object[] parameters =
+Util.buildParameters(context, 
matchingMethod.getParameterTypes(), matchingMethod.isVarArgs(), params);
 
 Object result = null;
 try {
@@ -204,7 +204,7 @@ public class BeanELResolver extends ELResolver {
 }
 
 static final class BeanProperties {
-private final Map properties;
+private final Map properties;
 
 private final Class type;
 
@@ -325,8 +325,8 @@ public class BeanELResolver extends ELResolver {
 private static final class ConcurrentCache {
 
 private final int size;
-private final Map eden;
-private final Map longterm;
+private final Map eden;
+private final Map longterm;
 
 ConcurrentCache(int size) {
 this.size = size;
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index 5a1cbdbf9e..ac9d5fa2ea 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -30,7 +30,7 @@ public abstract class ELContext {
 
 private Locale locale;
 
-private Map, Object> map;
+private Map,Object> map;
 
 private boolean resolved;
 
@@ -38,7 +38,7 @@ public abstract class ELContext {
 
 private List listeners;
 
-private Deque> lambdaArguments = new ArrayDeque<>();
+private Deque> lambdaArguments = new ArrayDeque<>();
 
 public ELContext() {
 this.resolved = false;
@@ -235,7 +235,7 @@ public abstract class ELContext {
  * @since EL 3.0
  */
 public boolean isLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : lambdaArguments) {
 if (arguments.containsKey(name)) {
 return true;
 }
@@ -253,7 +253,7 @@ public abstract class ELContext {
  * @since EL 3.0
  */
 public Object getLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : lambdaArguments) {
 Object result = arguments.get(name);
 if (result != null) {
 return result;
@@ -270,7 +270,7 @@ public abstract class ELContext {
  *
  * @since EL 3.0
  */
-public void enterLambdaScope(Map arguments) {
+public void enterLambdaScope(Map arguments) {
 lambdaArguments.push(arguments);
 }
 
diff --git a/java/javax/el/ELManager.java b/java/javax/el/ELManager.java
index 6b3cf7bc74..15677c72bf 100644
--- a/java/javax/el/ELManager.java
+++ b/java/javax/el/ELManager.java
@@ -73,7 +73,7 @@ public class ELManager {
 }
 
 public Object defineBean(String name, Object bean) {
-Map localBeans = getELContext().getLocalBeans();
+Map localBeans = getELContext().getLocalBeans();
 
 if (bean == null) {
 return localBeans.remove(name);
diff --git a/java/javax/el/ExpressionFactory.java 
b/java/javax/el/ExpressionFactory.java
index 77007f875d..c8fb87b1e6 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -48,13 +48,13 @@ public abstract class ExpressionFactory {
 private s

[tomcat] 03/08: Code clean-up - no functional change

[markt]

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 3a378cae7c574f42cf1f27cabb9edc440a6d8770
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:36:57 2023 +0100

Code clean-up - no functional change
---
 java/javax/websocket/ClientEndpoint.java   |   6 +-
 java/javax/websocket/ClientEndpointConfig.java |  34 ++--
 java/javax/websocket/CloseReason.java  |   6 +-
 java/javax/websocket/ContainerProvider.java|  17 +-
 java/javax/websocket/DecodeException.java  |   3 +-
 .../websocket/DefaultClientEndpointConfig.java |   8 +-
 java/javax/websocket/Encoder.java  |   6 +-
 java/javax/websocket/Endpoint.java |   9 +-
 java/javax/websocket/EndpointConfig.java   |   2 +-
 java/javax/websocket/Extension.java|   2 +
 java/javax/websocket/HandshakeResponse.java|   2 +-
 java/javax/websocket/MessageHandler.java   |   7 +-
 java/javax/websocket/PongMessage.java  |   6 +-
 java/javax/websocket/RemoteEndpoint.java   | 186 ++---
 java/javax/websocket/SendResult.java   |   2 +-
 java/javax/websocket/Session.java  |  95 +--
 java/javax/websocket/WebSocketContainer.java   |  70 
 .../server/DefaultServerEndpointConfig.java|  11 +-
 java/javax/websocket/server/HandshakeRequest.java  |  12 +-
 java/javax/websocket/server/PathParam.java |   5 +-
 .../websocket/server/ServerApplicationConfig.java  |  27 ++-
 java/javax/websocket/server/ServerEndpoint.java|   7 +-
 .../websocket/server/ServerEndpointConfig.java |  72 +++-
 23 files changed, 262 insertions(+), 333 deletions(-)

diff --git a/java/javax/websocket/ClientEndpoint.java 
b/java/javax/websocket/ClientEndpoint.java
index 7de59fc0cb..f5cf516fa4 100644
--- a/java/javax/websocket/ClientEndpoint.java
+++ b/java/javax/websocket/ClientEndpoint.java
@@ -27,8 +27,10 @@ import javax.websocket.ClientEndpointConfig.Configurator;
 @Target(ElementType.TYPE)
 public @interface ClientEndpoint {
 String[] subprotocols() default {};
+
 Class[] decoders() default {};
+
 Class[] encoders() default {};
-Class configurator()
-default Configurator.class;
+
+Class configurator() default Configurator.class;
 }
diff --git a/java/javax/websocket/ClientEndpointConfig.java 
b/java/javax/websocket/ClientEndpointConfig.java
index 61a4b108a6..86dbeb45ed 100644
--- a/java/javax/websocket/ClientEndpointConfig.java
+++ b/java/javax/websocket/ClientEndpointConfig.java
@@ -30,8 +30,8 @@ public interface ClientEndpointConfig extends EndpointConfig {
 
 final class Builder {
 
-private static final Configurator DEFAULT_CONFIGURATOR =
-new Configurator() {};
+private static final Configurator DEFAULT_CONFIGURATOR = new 
Configurator() {
+};
 
 
 public static Builder create() {
@@ -46,15 +46,12 @@ public interface ClientEndpointConfig extends 
EndpointConfig {
 private Configurator configurator = DEFAULT_CONFIGURATOR;
 private List preferredSubprotocols = Collections.emptyList();
 private List extensions = Collections.emptyList();
-private List> encoders =
-Collections.emptyList();
-private List> decoders =
-Collections.emptyList();
+private List> encoders = 
Collections.emptyList();
+private List> decoders = 
Collections.emptyList();
 
 
 public ClientEndpointConfig build() {
-return new DefaultClientEndpointConfig(preferredSubprotocols,
-extensions, encoders, decoders, configurator);
+return new DefaultClientEndpointConfig(preferredSubprotocols, 
extensions, encoders, decoders, configurator);
 }
 
 
@@ -68,21 +65,17 @@ public interface ClientEndpointConfig extends 
EndpointConfig {
 }
 
 
-public Builder preferredSubprotocols(
-List preferredSubprotocols) {
-if (preferredSubprotocols == null ||
-preferredSubprotocols.size() == 0) {
+public Builder preferredSubprotocols(List 
preferredSubprotocols) {
+if (preferredSubprotocols == null || preferredSubprotocols.size() 
== 0) {
 this.preferredSubprotocols = Collections.emptyList();
 } else {
-this.preferredSubprotocols =
-Collections.unmodifiableList(preferredSubprotocols);
+this.preferredSubprotocols = 
Collections.unmodifiableList(preferredSubprotocols);
 }
 return this;
 }
 
 
-public Builder extensions(
-List extensions) {
+public Builder extensions(List extensions) {
 if (extensions == null || extensions.size() == 0) {
 this.extens

[tomcat] 04/08: Code clean-up - no functional change

[markt]

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 ecc2d82c46f5d9411e842f6aa03245f782bf1f18
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:37:02 2023 +0100

Code clean-up - no functional change
---
 java/javax/security/auth/message/ClientAuth.java   |  4 +-
 java/javax/security/auth/message/ServerAuth.java   |  4 +-
 .../message/callback/CallerPrincipalCallback.java  |  4 +-
 .../auth/message/callback/CertStoreCallback.java   |  3 +-
 .../message/callback/GroupPrincipalCallback.java   |  3 +-
 .../callback/PasswordValidationCallback.java   |  4 +-
 .../auth/message/callback/PrivateKeyCallback.java  |  5 +-
 .../auth/message/callback/SecretKeyCallback.java   |  4 +-
 .../auth/message/callback/TrustStoreCallback.java  |  3 +-
 .../auth/message/config/AuthConfigFactory.java | 56 ++
 .../auth/message/config/AuthConfigProvider.java|  6 +--
 .../auth/message/config/ClientAuthConfig.java  |  3 +-
 .../auth/message/config/ServerAuthConfig.java  |  3 +-
 .../auth/message/module/ClientAuthModule.java  |  4 +-
 .../auth/message/module/ServerAuthModule.java  |  4 +-
 15 files changed, 48 insertions(+), 62 deletions(-)

diff --git a/java/javax/security/auth/message/ClientAuth.java 
b/java/javax/security/auth/message/ClientAuth.java
index a537ef2a17..a8f9a77ae7 100644
--- a/java/javax/security/auth/message/ClientAuth.java
+++ b/java/javax/security/auth/message/ClientAuth.java
@@ -22,8 +22,8 @@ public interface ClientAuth {
 
 AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject) 
throws AuthException;
 
-AuthStatus validateResponse(MessageInfo messageInfo, Subject clientSubject,
-Subject serviceSubject) throws AuthException;
+AuthStatus validateResponse(MessageInfo messageInfo, Subject 
clientSubject, Subject serviceSubject)
+throws AuthException;
 
 void cleanSubject(MessageInfo messageInfo, Subject subject) throws 
AuthException;
 }
diff --git a/java/javax/security/auth/message/ServerAuth.java 
b/java/javax/security/auth/message/ServerAuth.java
index bb404f558b..23f5c66ecb 100644
--- a/java/javax/security/auth/message/ServerAuth.java
+++ b/java/javax/security/auth/message/ServerAuth.java
@@ -20,8 +20,8 @@ import javax.security.auth.Subject;
 
 public interface ServerAuth {
 
-AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject,
-Subject serviceSubject) throws AuthException;
+AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, 
Subject serviceSubject)
+throws AuthException;
 
 AuthStatus secureResponse(MessageInfo messageInfo, Subject serviceSubject) 
throws AuthException;
 
diff --git 
a/java/javax/security/auth/message/callback/CallerPrincipalCallback.java 
b/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
index 2c7010f680..803856d67b 100644
--- a/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
+++ b/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
@@ -22,8 +22,8 @@ import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 
 /**
- * Callback that enables an authentication module to inform the runtime of the
- * call principal or name of the caller principal.
+ * Callback that enables an authentication module to inform the runtime of the 
call principal or name of the caller
+ * principal.
  */
 public class CallerPrincipalCallback implements Callback {
 
diff --git a/java/javax/security/auth/message/callback/CertStoreCallback.java 
b/java/javax/security/auth/message/callback/CertStoreCallback.java
index 13734e8ce0..963d7b29dc 100644
--- a/java/javax/security/auth/message/callback/CertStoreCallback.java
+++ b/java/javax/security/auth/message/callback/CertStoreCallback.java
@@ -21,8 +21,7 @@ import java.security.cert.CertStore;
 import javax.security.auth.callback.Callback;
 
 /**
- * Callback that enables a runtime to inform authentication modules of the
- * CertStore to use.
+ * Callback that enables a runtime to inform authentication modules of the 
CertStore to use.
  */
 public class CertStoreCallback implements Callback {
 
diff --git 
a/java/javax/security/auth/message/callback/GroupPrincipalCallback.java 
b/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
index f44c04629a..4261f9d791 100644
--- a/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
+++ b/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
@@ -20,8 +20,7 @@ import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 
 /**
- * Callback that enables an authentication module to inform the runtime of the
- * groups a user is in.
+ * Callback that enables an authentication module to inform the runtime of the 
groups a user is in.
  */
 public class GroupPrincipalCallba

[tomcat] 05/08: Code clean-up - no functional change

[markt]

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 6e0aeb5b4168ae1a8c1ac37d8e724cc33fa37aae
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:37:06 2023 +0100

Code clean-up - no functional change
---
 java/javax/annotation/Generated.java | 11 ++-
 java/javax/annotation/PostConstruct.java |  3 +--
 java/javax/annotation/PreDestroy.java|  3 +--
 java/javax/annotation/Priority.java  |  4 ++--
 java/javax/annotation/Resource.java  |  7 +++
 java/javax/annotation/security/DenyAll.java  |  2 +-
 java/javax/annotation/security/PermitAll.java|  2 +-
 java/javax/annotation/security/RolesAllowed.java |  2 +-
 8 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/java/javax/annotation/Generated.java 
b/java/javax/annotation/Generated.java
index 922352a5b3..ba60ed77d2 100644
--- a/java/javax/annotation/Generated.java
+++ b/java/javax/annotation/Generated.java
@@ -28,20 +28,21 @@ import java.lang.annotation.Target;
  * @since Common Annotations 1.0
  */
 @Documented
-@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
-ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
-ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})
+@Target({ ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, 
ElementType.FIELD, ElementType.LOCAL_VARIABLE,
+ElementType.METHOD, ElementType.PACKAGE, ElementType.PARAMETER, 
ElementType.TYPE })
 @Retention(RetentionPolicy.SOURCE)
 public @interface Generated {
 /**
- * @return The name of the code generator. It is recommended that the fully
- * qualified name of the code generator is used.
+ * @return The name of the code generator. It is recommended that the 
fully qualified name of the code generator is
+ * used.
  */
 String[] value();
+
 /**
  * @return The date the code was generated
  */
 String date() default "";
+
 /**
  * @return Additional comments (if any) related to the code generation
  */
diff --git a/java/javax/annotation/PostConstruct.java 
b/java/javax/annotation/PostConstruct.java
index 166aedbc6f..aef7d254d8 100644
--- a/java/javax/annotation/PostConstruct.java
+++ b/java/javax/annotation/PostConstruct.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Added to a method required to be called after the object has been 
constructed
- * and before it used.
+ * Added to a method required to be called after the object has been 
constructed and before it used.
  *
  * @since Common Annotations 1.0
  */
diff --git a/java/javax/annotation/PreDestroy.java 
b/java/javax/annotation/PreDestroy.java
index 38bc4c6299..4a0749cefb 100644
--- a/java/javax/annotation/PreDestroy.java
+++ b/java/javax/annotation/PreDestroy.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Added to a method required to be called once the object is no longer 
required
- * and before it is discarded.
+ * Added to a method required to be called once the object is no longer 
required and before it is discarded.
  *
  * @since Common Annotations 1.0
  */
diff --git a/java/javax/annotation/Priority.java 
b/java/javax/annotation/Priority.java
index 9178b0921e..6d9c84a50f 100644
--- a/java/javax/annotation/Priority.java
+++ b/java/javax/annotation/Priority.java
@@ -23,8 +23,8 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Used to define the order in which classes or parameters should be used. The
- * annotated class or parameter defines how the prority value is used.
+ * Used to define the order in which classes or parameters should be used. The 
annotated class or parameter defines how
+ * the prority value is used.
  *
  * @since Common Annotations 1.2
  */
diff --git a/java/javax/annotation/Resource.java 
b/java/javax/annotation/Resource.java
index 71427ded3c..cb00bc848f 100644
--- a/java/javax/annotation/Resource.java
+++ b/java/javax/annotation/Resource.java
@@ -22,13 +22,12 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Indicates a resource required by the application. Annotated classes will be
- * used as resources. Annotated fields and/or methods will have resources
- * injected.
+ * Indicates a resource required by the application. Annotated classes will be 
used as resources. Annotated fields
+ * and/or methods will have resources injected.
  *
  * @since Common Annotations 1.0
  */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Resource {
 
diff --git a/java/javax/annotation/security/DenyAll.java 
b/java/ja

[tomcat] 07/08: Align with Java EE 8

[markt]

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 215a3f0ba8d2d5017df17c645e229e8278cd7e7f
Author: Mark Thomas 
AuthorDate: Fri Apr 14 12:10:55 2023 +0100

Align with Java EE 8

Spotted checking diffs between 9.0.x and 10.1.x
---
 java/javax/annotation/Priority.java | 2 +-
 java/javax/annotation/Resource.java | 2 ++
 java/javax/annotation/sql/DataSourceDefinition.java | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/javax/annotation/Priority.java 
b/java/javax/annotation/Priority.java
index 6d9c84a50f..ed7527de05 100644
--- a/java/javax/annotation/Priority.java
+++ b/java/javax/annotation/Priority.java
@@ -29,7 +29,7 @@ import java.lang.annotation.Target;
  * @since Common Annotations 1.2
  */
 @Documented
-@Target(ElementType.TYPE)
+@Target({ ElementType.TYPE, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Priority {
 
diff --git a/java/javax/annotation/Resource.java 
b/java/javax/annotation/Resource.java
index cb00bc848f..856fd1ecd8 100644
--- a/java/javax/annotation/Resource.java
+++ b/java/javax/annotation/Resource.java
@@ -17,6 +17,7 @@
 package javax.annotation;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -29,6 +30,7 @@ import java.lang.annotation.Target;
  */
 @Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(Resources.class)
 public @interface Resource {
 
 /**
diff --git a/java/javax/annotation/sql/DataSourceDefinition.java 
b/java/javax/annotation/sql/DataSourceDefinition.java
index a779b219d4..a4137e0eb6 100644
--- a/java/javax/annotation/sql/DataSourceDefinition.java
+++ b/java/javax/annotation/sql/DataSourceDefinition.java
@@ -17,6 +17,7 @@
 package javax.annotation.sql;
 
 import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
@@ -26,6 +27,7 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
+@Repeatable(DataSourceDefinitions.class)
 public @interface DataSourceDefinition {
 
 /**


-
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 (8e92da0ace -> 0218af763b)

[markt]

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 8e92da0ace Code clean-up - no functional change
 new 4c8b1a9893 Code clean-up - no functional change
 new 0218af763b Align with 10.1.x

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/javax/security/auth/message/ClientAuth.java   | 32 +
 java/javax/security/auth/message/ServerAuth.java   | 33 +-
 java/javax/servlet/Servlet.java|  2 +-
 java/javax/servlet/ServletRequest.java |  7 +++--
 java/javax/servlet/http/Cookie.java| 17 +++
 java/javax/servlet/http/HttpServlet.java   | 13 +
 java/javax/servlet/http/HttpServletResponse.java   | 30 ++--
 .../servlet/http/HttpServletResponseWrapper.java   |  2 +-
 java/javax/servlet/jsp/JspPage.java| 15 ++
 java/javax/servlet/jsp/tagext/IterationTag.java|  1 -
 java/javax/servlet/jsp/tagext/VariableInfo.java|  4 +--
 java/javax/websocket/ClientEndpointConfig.java |  2 +-
 java/javax/websocket/ContainerProvider.java|  4 +--
 .../websocket/DefaultClientEndpointConfig.java |  2 +-
 java/javax/websocket/Session.java  |  2 +-
 .../server/DefaultServerEndpointConfig.java|  2 +-
 java/javax/websocket/server/HandshakeRequest.java  |  2 +-
 17 files changed, 134 insertions(+), 36 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Align with 10.1.x

[markt]

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 0218af763b6990bab49d6d0132326bf5b4d75914
Author: Mark Thomas 
AuthorDate: Fri Apr 14 13:02:13 2023 +0100

Align with 10.1.x

Javadoc improvements
---
 java/javax/security/auth/message/ClientAuth.java   | 32 +
 java/javax/security/auth/message/ServerAuth.java   | 33 +-
 java/javax/servlet/Servlet.java|  2 +-
 java/javax/servlet/ServletRequest.java |  7 +++--
 java/javax/servlet/http/Cookie.java| 17 +++
 java/javax/servlet/http/HttpServlet.java   | 13 +
 java/javax/servlet/http/HttpServletResponse.java   | 30 ++--
 .../servlet/http/HttpServletResponseWrapper.java   |  2 +-
 java/javax/servlet/jsp/JspPage.java| 15 ++
 java/javax/servlet/jsp/tagext/IterationTag.java|  1 -
 java/javax/servlet/jsp/tagext/VariableInfo.java|  4 +--
 11 files changed, 127 insertions(+), 29 deletions(-)

diff --git a/java/javax/security/auth/message/ClientAuth.java 
b/java/javax/security/auth/message/ClientAuth.java
index a8f9a77ae7..5fc5fe6733 100644
--- a/java/javax/security/auth/message/ClientAuth.java
+++ b/java/javax/security/auth/message/ClientAuth.java
@@ -20,11 +20,43 @@ import javax.security.auth.Subject;
 
 public interface ClientAuth {
 
+/**
+ * Secure (authenticate) the request.
+ *
+ * @param messageInfo   The associated request and response
+ * @param clientSubject The subject that represents the source of the 
request
+ *
+ * @return An AuthStatus instance that represents the result of the 
authentication
+ *
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
+ */
 AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject) 
throws AuthException;
 
+/**
+ * Validate a response.
+ *
+ * @param messageInfoThe associated request and response
+ * @param clientSubject  The subject that represents the recipient of the 
response
+ * @param serviceSubject The subject that represents the source of the 
response
+ *
+ * @return An AuthStatus instance that represents the result of the 
validation
+ *
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
+ */
 AuthStatus validateResponse(MessageInfo messageInfo, Subject 
clientSubject, Subject serviceSubject)
 throws AuthException;
 
+/**
+ * Remove principals and/or credentials from the subject that were 
previously added by this authentication
+ * mechanism.
+ *
+ * @param messageInfo The associated request and response
+ * @param subject The subject to clean
+ *
+ * @throws AuthException If the a failure occurred
+ */
 void cleanSubject(MessageInfo messageInfo, Subject subject) throws 
AuthException;
 }
 
diff --git a/java/javax/security/auth/message/ServerAuth.java 
b/java/javax/security/auth/message/ServerAuth.java
index 23f5c66ecb..392bc5094b 100644
--- a/java/javax/security/auth/message/ServerAuth.java
+++ b/java/javax/security/auth/message/ServerAuth.java
@@ -20,10 +20,41 @@ import javax.security.auth.Subject;
 
 public interface ServerAuth {
 
-AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, 
Subject serviceSubject)
+/**
+ * Validate the request.
+ *
+ * @param messageInfoThe associated request and response
+ * @param clientSubject  The subject that represents the source of the 
request
+ * @param serviceSubject The subject that represents the recipient of the 
request
+ *
+ * @return An AuthStatus instance that represents the result of the 
validation
+ *
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
+ */AuthStatus validateRequest(MessageInfo messageInfo, Subject 
clientSubject, Subject serviceSubject)
 throws AuthException;
 
+/**
+ * Secure (authenticate) the response.
+ *
+ * @param messageInfoThe associated request and response
+ * @param serviceSubject The subject that represents the source of the 
response
+ *
+ * @return An AuthStatus instance that represents the result of the 
authentication
+ *
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
+ */
 AuthStatus secureResponse(MessageInfo messageInfo, Subject serviceSubject) 
throws AuthException;
 
+/**
+ 

[tomcat] 01/02: Code clean-up - no functional change

[markt]

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 4c8b1a989379958fa03de4eae0d06a67fb76d391
Author: Mark Thomas 
AuthorDate: Fri Apr 14 11:36:57 2023 +0100

Code clean-up - no functional change
---
 java/javax/websocket/ClientEndpointConfig.java   | 2 +-
 java/javax/websocket/ContainerProvider.java  | 4 ++--
 java/javax/websocket/DefaultClientEndpointConfig.java| 2 +-
 java/javax/websocket/Session.java| 2 +-
 java/javax/websocket/server/DefaultServerEndpointConfig.java | 2 +-
 java/javax/websocket/server/HandshakeRequest.java| 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/java/javax/websocket/ClientEndpointConfig.java 
b/java/javax/websocket/ClientEndpointConfig.java
index 86dbeb45ed..43547e6276 100644
--- a/java/javax/websocket/ClientEndpointConfig.java
+++ b/java/javax/websocket/ClientEndpointConfig.java
@@ -114,7 +114,7 @@ public interface ClientEndpointConfig extends 
EndpointConfig {
  *
  * @param headers The HTTP headers
  */
-public void beforeRequest(Map> headers) {
+public void beforeRequest(Map> headers) {
 // NO-OP
 }
 
diff --git a/java/javax/websocket/ContainerProvider.java 
b/java/javax/websocket/ContainerProvider.java
index 77623567ed..7ad02d089a 100644
--- a/java/javax/websocket/ContainerProvider.java
+++ b/java/javax/websocket/ContainerProvider.java
@@ -44,8 +44,8 @@ public abstract class ContainerProvider {
 if (result == null) {
 try {
 @SuppressWarnings("unchecked")
-Class clazz = (Class) 
Class
-.forName(DEFAULT_PROVIDER_CLASS_NAME);
+Class clazz =
+(Class) 
Class.forName(DEFAULT_PROVIDER_CLASS_NAME);
 result = clazz.getConstructor().newInstance();
 } catch (ReflectiveOperationException | IllegalArgumentException | 
SecurityException e) {
 // No options left. Just return null.
diff --git a/java/javax/websocket/DefaultClientEndpointConfig.java 
b/java/javax/websocket/DefaultClientEndpointConfig.java
index 306b075472..4926dce279 100644
--- a/java/javax/websocket/DefaultClientEndpointConfig.java
+++ b/java/javax/websocket/DefaultClientEndpointConfig.java
@@ -66,7 +66,7 @@ final class DefaultClientEndpointConfig implements 
ClientEndpointConfig {
 
 
 @Override
-public Map getUserProperties() {
+public Map getUserProperties() {
 return userProperties;
 }
 
diff --git a/java/javax/websocket/Session.java 
b/java/javax/websocket/Session.java
index 539fe7babc..588c12391d 100644
--- a/java/javax/websocket/Session.java
+++ b/java/javax/websocket/Session.java
@@ -137,7 +137,7 @@ public interface Session extends Closeable {
 
 URI getRequestURI();
 
-Map> getRequestParameterMap();
+Map> getRequestParameterMap();
 
 String getQueryString();
 
diff --git a/java/javax/websocket/server/DefaultServerEndpointConfig.java 
b/java/javax/websocket/server/DefaultServerEndpointConfig.java
index a47d5f91aa..064c2e14a0 100644
--- a/java/javax/websocket/server/DefaultServerEndpointConfig.java
+++ b/java/javax/websocket/server/DefaultServerEndpointConfig.java
@@ -76,7 +76,7 @@ final class DefaultServerEndpointConfig implements 
ServerEndpointConfig {
 }
 
 @Override
-public Map getUserProperties() {
+public Map getUserProperties() {
 return userProperties;
 }
 
diff --git a/java/javax/websocket/server/HandshakeRequest.java 
b/java/javax/websocket/server/HandshakeRequest.java
index 6477a21b06..373f0cde2d 100644
--- a/java/javax/websocket/server/HandshakeRequest.java
+++ b/java/javax/websocket/server/HandshakeRequest.java
@@ -47,7 +47,7 @@ public interface HandshakeRequest {
  */
 Object getHttpSession();
 
-Map> getParameterMap();
+Map> getParameterMap();
 
 String getQueryString();
 }


-
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 formatting glitches

[markt]

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 b621524de9 Fix formatting glitches
b621524de9 is described below

commit b621524de9c9d393345f16856418bb2db121b3e3
Author: Mark Thomas 
AuthorDate: Fri Apr 14 14:43:14 2023 +0100

Fix formatting glitches
---
 java/javax/websocket/DefaultClientEndpointConfig.java| 2 +-
 java/javax/websocket/EndpointConfig.java | 2 +-
 java/javax/websocket/HandshakeResponse.java  | 2 +-
 java/javax/websocket/Session.java| 4 ++--
 java/javax/websocket/server/DefaultServerEndpointConfig.java | 2 +-
 java/javax/websocket/server/HandshakeRequest.java| 2 +-
 java/javax/websocket/server/ServerEndpointConfig.java| 3 ++-
 7 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/java/javax/websocket/DefaultClientEndpointConfig.java 
b/java/javax/websocket/DefaultClientEndpointConfig.java
index 4926dce279..6a91c6bbc3 100644
--- a/java/javax/websocket/DefaultClientEndpointConfig.java
+++ b/java/javax/websocket/DefaultClientEndpointConfig.java
@@ -26,7 +26,7 @@ final class DefaultClientEndpointConfig implements 
ClientEndpointConfig {
 private final List extensions;
 private final List> encoders;
 private final List> decoders;
-private final Map userProperties = new 
ConcurrentHashMap<>();
+private final Map userProperties = new 
ConcurrentHashMap<>();
 private final Configurator configurator;
 
 
diff --git a/java/javax/websocket/EndpointConfig.java 
b/java/javax/websocket/EndpointConfig.java
index 7cac76e752..0b6c96818d 100644
--- a/java/javax/websocket/EndpointConfig.java
+++ b/java/javax/websocket/EndpointConfig.java
@@ -25,5 +25,5 @@ public interface EndpointConfig {
 
 List> getDecoders();
 
-Map getUserProperties();
+Map getUserProperties();
 }
diff --git a/java/javax/websocket/HandshakeResponse.java 
b/java/javax/websocket/HandshakeResponse.java
index a25c1a2de4..a932192218 100644
--- a/java/javax/websocket/HandshakeResponse.java
+++ b/java/javax/websocket/HandshakeResponse.java
@@ -26,5 +26,5 @@ public interface HandshakeResponse {
  */
 String SEC_WEBSOCKET_ACCEPT = "Sec-WebSocket-Accept";
 
-Map> getHeaders();
+Map> getHeaders();
 }
diff --git a/java/javax/websocket/Session.java 
b/java/javax/websocket/Session.java
index 588c12391d..3b062e0d38 100644
--- a/java/javax/websocket/Session.java
+++ b/java/javax/websocket/Session.java
@@ -141,9 +141,9 @@ public interface Session extends Closeable {
 
 String getQueryString();
 
-Map getPathParameters();
+Map getPathParameters();
 
-Map getUserProperties();
+Map getUserProperties();
 
 Principal getUserPrincipal();
 
diff --git a/java/javax/websocket/server/DefaultServerEndpointConfig.java 
b/java/javax/websocket/server/DefaultServerEndpointConfig.java
index 064c2e14a0..8f588f87f3 100644
--- a/java/javax/websocket/server/DefaultServerEndpointConfig.java
+++ b/java/javax/websocket/server/DefaultServerEndpointConfig.java
@@ -36,7 +36,7 @@ final class DefaultServerEndpointConfig implements 
ServerEndpointConfig {
 private final List> encoders;
 private final List> decoders;
 private final Configurator serverEndpointConfigurator;
-private final Map userProperties = new 
ConcurrentHashMap<>();
+private final Map userProperties = new 
ConcurrentHashMap<>();
 
 DefaultServerEndpointConfig(Class endpointClass, String path, 
List subprotocols,
 List extensions, List> 
encoders,
diff --git a/java/javax/websocket/server/HandshakeRequest.java 
b/java/javax/websocket/server/HandshakeRequest.java
index 373f0cde2d..dba91d4c12 100644
--- a/java/javax/websocket/server/HandshakeRequest.java
+++ b/java/javax/websocket/server/HandshakeRequest.java
@@ -31,7 +31,7 @@ public interface HandshakeRequest {
 String SEC_WEBSOCKET_VERSION = "Sec-WebSocket-Version";
 String SEC_WEBSOCKET_EXTENSIONS = "Sec-WebSocket-Extensions";
 
-Map> getHeaders();
+Map> getHeaders();
 
 Principal getUserPrincipal();
 
diff --git a/java/javax/websocket/server/ServerEndpointConfig.java 
b/java/javax/websocket/server/ServerEndpointConfig.java
index 879c104b65..2ca618707a 100644
--- a/java/javax/websocket/server/ServerEndpointConfig.java
+++ b/java/javax/websocket/server/ServerEndpointConfig.java
@@ -147,7 +147,8 @@ public interface ServerEndpointConfig extends 
EndpointConfig {
 private static volatile Configurator defaultImpl = null;
 private static final Object defaultImplLock = new Object();
 
-private static final String DEFAULT_IMPL_CLASSNAME = 
"org.apache.tomcat.websocket.server.DefaultServerEndpointConfigurator";
+private static final String DEFAULT_IMPL_CLASSNAME =
+
"org.apache.tomcat.websocket.server

[tomcat] branch 8.5.x updated (f95552b61b -> d1ff7e54cf)

[markt]

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 f95552b61b Tweak formatting settings
 new ff4b9bbf3f Code clean-up - no functional change
 new 4c8540bba5 Code clean-up - no functional change
 new eff71b6354 Code clean-up - no functional change
 new be4df0f63a Code clean-up - no functional change
 new 5a57098685 Code clean-up - no functional change
 new b3ce153795 Code clean-up - no functional change
 new 1deeffebc6 Code clean-up - no functional change
 new d1ff7e54cf Align with 9.0.x

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/javax/annotation/Generated.java   |   11 +-
 java/javax/annotation/PostConstruct.java   |3 +-
 java/javax/annotation/PreDestroy.java  |3 +-
 java/javax/annotation/Priority.java|4 +-
 java/javax/annotation/Resource.java|7 +-
 java/javax/annotation/security/DenyAll.java|2 +-
 java/javax/annotation/security/PermitAll.java  |2 +-
 java/javax/annotation/security/RolesAllowed.java   |2 +-
 java/javax/ejb/EJB.java|7 +-
 java/javax/el/BeanELResolver.java  |   12 +-
 java/javax/el/ELContext.java   |   10 +-
 java/javax/el/ELManager.java   |2 +-
 java/javax/el/ExpressionFactory.java   |4 +-
 java/javax/el/ImportHandler.java   |   13 +-
 java/javax/el/LambdaExpression.java|4 +-
 java/javax/el/MapELResolver.java   |   18 +-
 java/javax/el/StandardELContext.java   |   14 +-
 java/javax/el/StaticFieldELResolver.java   |8 +-
 java/javax/el/Util.java|6 +-
 java/javax/mail/Session.java   |1 +
 java/javax/mail/internet/MimeMessage.java  |2 +
 java/javax/persistence/PersistenceContext.java |6 +-
 java/javax/persistence/PersistenceProperty.java|1 +
 java/javax/persistence/PersistenceUnit.java|3 +-
 java/javax/security/auth/message/ClientAuth.java   |   36 +-
 java/javax/security/auth/message/ServerAuth.java   |   35 +-
 .../message/callback/CallerPrincipalCallback.java  |4 +-
 .../auth/message/callback/CertStoreCallback.java   |3 +-
 .../message/callback/GroupPrincipalCallback.java   |3 +-
 .../callback/PasswordValidationCallback.java   |4 +-
 .../auth/message/callback/PrivateKeyCallback.java  |5 +-
 .../auth/message/callback/SecretKeyCallback.java   |4 +-
 .../auth/message/callback/TrustStoreCallback.java  |3 +-
 .../auth/message/config/AuthConfigFactory.java |   34 +-
 .../auth/message/config/AuthConfigProvider.java|6 +-
 .../auth/message/config/ClientAuthConfig.java  |3 +-
 .../auth/message/config/ServerAuthConfig.java  |3 +-
 .../auth/message/module/ClientAuthModule.java  |4 +-
 .../auth/message/module/ServerAuthModule.java  |4 +-
 java/javax/servlet/AsyncContext.java   |   75 +-
 java/javax/servlet/AsyncEvent.java |   26 +-
 java/javax/servlet/AsyncListener.java  |   26 +-
 java/javax/servlet/DispatcherType.java |   10 +-
 java/javax/servlet/Filter.java |   87 +-
 java/javax/servlet/FilterChain.java|   26 +-
 java/javax/servlet/FilterConfig.java   |   34 +-
 java/javax/servlet/FilterRegistration.java |   55 +-
 java/javax/servlet/GenericServlet.java |  165 ++-
 java/javax/servlet/HttpConstraintElement.java  |   44 +-
 .../javax/servlet/HttpMethodConstraintElement.java |   33 +-
 java/javax/servlet/MultipartConfigElement.java |   29 +-
 java/javax/servlet/ReadListener.java   |   10 +-
 java/javax/servlet/Registration.java   |   49 +-
 java/javax/servlet/RequestDispatcher.java  |  249 ++---
 java/javax/servlet/Servlet.java|  144 +--
 java/javax/servlet/ServletConfig.java  |   40 +-
 .../javax/servlet/ServletContainerInitializer.java |   30 +-
 java/javax/servlet/ServletContext.java | 1077 ++--
 .../servlet/ServletContextAttributeEvent.java  |   20 +-
 .../servlet/ServletContextAttributeListener.java   |   20 +-
 java/javax/servlet/ServletContextEvent.java|6 +-
 java/javax/servlet/ServletContextListener.java |   19 +-
 java/javax/servlet/ServletException.java   |   46 +-
 java/javax/servlet/ServletInputStream.java |   67 +-
 java/javax/servlet/ServletOutputStream.java|  176 ++--
 java/javax/servlet/ServletRegistration.ja

[tomcat] 01/08: Code clean-up - no functional change

[markt]

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 ff4b9bbf3f09f90c89a1ee9baecbdf105aedc451
Author: Mark Thomas 
AuthorDate: Fri Apr 14 14:18:25 2023 +0100

Code clean-up - no functional change
---
 java/javax/el/BeanELResolver.java| 12 ++--
 java/javax/el/ELContext.java | 10 +-
 java/javax/el/ELManager.java |  2 +-
 java/javax/el/ExpressionFactory.java |  4 ++--
 java/javax/el/ImportHandler.java | 12 ++--
 java/javax/el/LambdaExpression.java  |  4 ++--
 java/javax/el/MapELResolver.java | 18 +-
 java/javax/el/StandardELContext.java | 14 +++---
 java/javax/el/StaticFieldELResolver.java |  8 
 java/javax/el/Util.java  |  6 +++---
 10 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/java/javax/el/BeanELResolver.java 
b/java/javax/el/BeanELResolver.java
index 7226cd0bc4..6f307b9b4b 100644
--- a/java/javax/el/BeanELResolver.java
+++ b/java/javax/el/BeanELResolver.java
@@ -57,7 +57,7 @@ public class BeanELResolver extends ELResolver {
 
 private final boolean readOnly;
 
-private final ConcurrentCache cache = new 
ConcurrentCache<>(CACHE_SIZE);
+private final ConcurrentCache cache = new 
ConcurrentCache<>(CACHE_SIZE);
 
 /**
  * Creates a writable instance of the standard JavaBean resolver.
@@ -148,8 +148,8 @@ public class BeanELResolver extends ELResolver {
 // Find the matching method
 Method matchingMethod = Util.findMethod(context, base.getClass(), 
base, methodName, paramTypes, params);
 
-Object[] parameters = Util.buildParameters(context, 
matchingMethod.getParameterTypes(),
-matchingMethod.isVarArgs(), params);
+Object[] parameters =
+Util.buildParameters(context, 
matchingMethod.getParameterTypes(), matchingMethod.isVarArgs(), params);
 
 Object result = null;
 try {
@@ -208,7 +208,7 @@ public class BeanELResolver extends ELResolver {
 }
 
 static final class BeanProperties {
-private final Map properties;
+private final Map properties;
 
 private final Class type;
 
@@ -329,8 +329,8 @@ public class BeanELResolver extends ELResolver {
 private static final class ConcurrentCache {
 
 private final int size;
-private final Map eden;
-private final Map longterm;
+private final Map eden;
+private final Map longterm;
 
 ConcurrentCache(int size) {
 this.size = size;
diff --git a/java/javax/el/ELContext.java b/java/javax/el/ELContext.java
index ec11cb9f0d..f46c2fea05 100644
--- a/java/javax/el/ELContext.java
+++ b/java/javax/el/ELContext.java
@@ -30,7 +30,7 @@ public abstract class ELContext {
 
 private Locale locale;
 
-private Map, Object> map;
+private Map,Object> map;
 
 private boolean resolved;
 
@@ -38,7 +38,7 @@ public abstract class ELContext {
 
 private List listeners;
 
-private Deque> lambdaArguments = new ArrayDeque<>();
+private Deque> lambdaArguments = new ArrayDeque<>();
 
 public ELContext() {
 this.resolved = false;
@@ -239,7 +239,7 @@ public abstract class ELContext {
  * @since EL 3.0
  */
 public boolean isLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : lambdaArguments) {
 if (arguments.containsKey(name)) {
 return true;
 }
@@ -257,7 +257,7 @@ public abstract class ELContext {
  * @since EL 3.0
  */
 public Object getLambdaArgument(String name) {
-for (Map arguments : lambdaArguments) {
+for (Map arguments : lambdaArguments) {
 Object result = arguments.get(name);
 if (result != null) {
 return result;
@@ -274,7 +274,7 @@ public abstract class ELContext {
  *
  * @since EL 3.0
  */
-public void enterLambdaScope(Map arguments) {
+public void enterLambdaScope(Map arguments) {
 lambdaArguments.push(arguments);
 }
 
diff --git a/java/javax/el/ELManager.java b/java/javax/el/ELManager.java
index 6b3cf7bc74..15677c72bf 100644
--- a/java/javax/el/ELManager.java
+++ b/java/javax/el/ELManager.java
@@ -73,7 +73,7 @@ public class ELManager {
 }
 
 public Object defineBean(String name, Object bean) {
-Map localBeans = getELContext().getLocalBeans();
+Map localBeans = getELContext().getLocalBeans();
 
 if (bean == null) {
 return localBeans.remove(name);
diff --git a/java/javax/el/ExpressionFactory.java 
b/java/javax/el/ExpressionFactory.java
index 6c70462b95..c53f6bfc1f 100644
--- a/java/javax/el/ExpressionFactory.java
+++ b/java/javax/el/ExpressionFactory.java
@@ -49,7 +49,7 @@ public abstract class ExpressionFactory {
 private static final 

[tomcat] 06/08: Code clean-up - no functional change

[markt]

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 b3ce15379513bbdb0e52a270fcd240a6d5bf5aa3
Author: Mark Thomas 
AuthorDate: Fri Apr 14 14:18:53 2023 +0100

Code clean-up - no functional change
---
 java/javax/annotation/Generated.java | 11 ++-
 java/javax/annotation/PostConstruct.java |  3 +--
 java/javax/annotation/PreDestroy.java|  3 +--
 java/javax/annotation/Priority.java  |  4 ++--
 java/javax/annotation/Resource.java  |  7 +++
 java/javax/annotation/security/DenyAll.java  |  2 +-
 java/javax/annotation/security/PermitAll.java|  2 +-
 java/javax/annotation/security/RolesAllowed.java |  2 +-
 8 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/java/javax/annotation/Generated.java 
b/java/javax/annotation/Generated.java
index 922352a5b3..ba60ed77d2 100644
--- a/java/javax/annotation/Generated.java
+++ b/java/javax/annotation/Generated.java
@@ -28,20 +28,21 @@ import java.lang.annotation.Target;
  * @since Common Annotations 1.0
  */
 @Documented
-@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR,
-ElementType.FIELD, ElementType.LOCAL_VARIABLE, ElementType.METHOD,
-ElementType.PACKAGE, ElementType.PARAMETER, ElementType.TYPE})
+@Target({ ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, 
ElementType.FIELD, ElementType.LOCAL_VARIABLE,
+ElementType.METHOD, ElementType.PACKAGE, ElementType.PARAMETER, 
ElementType.TYPE })
 @Retention(RetentionPolicy.SOURCE)
 public @interface Generated {
 /**
- * @return The name of the code generator. It is recommended that the fully
- * qualified name of the code generator is used.
+ * @return The name of the code generator. It is recommended that the 
fully qualified name of the code generator is
+ * used.
  */
 String[] value();
+
 /**
  * @return The date the code was generated
  */
 String date() default "";
+
 /**
  * @return Additional comments (if any) related to the code generation
  */
diff --git a/java/javax/annotation/PostConstruct.java 
b/java/javax/annotation/PostConstruct.java
index 166aedbc6f..aef7d254d8 100644
--- a/java/javax/annotation/PostConstruct.java
+++ b/java/javax/annotation/PostConstruct.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Added to a method required to be called after the object has been 
constructed
- * and before it used.
+ * Added to a method required to be called after the object has been 
constructed and before it used.
  *
  * @since Common Annotations 1.0
  */
diff --git a/java/javax/annotation/PreDestroy.java 
b/java/javax/annotation/PreDestroy.java
index 38bc4c6299..4a0749cefb 100644
--- a/java/javax/annotation/PreDestroy.java
+++ b/java/javax/annotation/PreDestroy.java
@@ -23,8 +23,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Added to a method required to be called once the object is no longer 
required
- * and before it is discarded.
+ * Added to a method required to be called once the object is no longer 
required and before it is discarded.
  *
  * @since Common Annotations 1.0
  */
diff --git a/java/javax/annotation/Priority.java 
b/java/javax/annotation/Priority.java
index 9178b0921e..6d9c84a50f 100644
--- a/java/javax/annotation/Priority.java
+++ b/java/javax/annotation/Priority.java
@@ -23,8 +23,8 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Used to define the order in which classes or parameters should be used. The
- * annotated class or parameter defines how the prority value is used.
+ * Used to define the order in which classes or parameters should be used. The 
annotated class or parameter defines how
+ * the prority value is used.
  *
  * @since Common Annotations 1.2
  */
diff --git a/java/javax/annotation/Resource.java 
b/java/javax/annotation/Resource.java
index 71427ded3c..cb00bc848f 100644
--- a/java/javax/annotation/Resource.java
+++ b/java/javax/annotation/Resource.java
@@ -22,13 +22,12 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Indicates a resource required by the application. Annotated classes will be
- * used as resources. Annotated fields and/or methods will have resources
- * injected.
+ * Indicates a resource required by the application. Annotated classes will be 
used as resources. Annotated fields
+ * and/or methods will have resources injected.
  *
  * @since Common Annotations 1.0
  */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Resource {
 
diff --git a/java/javax/annotation/security/DenyAll.java 
b/java/ja

[tomcat] 05/08: Code clean-up - no functional change

[markt]

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 5a570986850c2bdfd4cbc050e4e651720a9e0a62
Author: Mark Thomas 
AuthorDate: Fri Apr 14 14:18:48 2023 +0100

Code clean-up - no functional change
---
 java/javax/security/auth/message/ClientAuth.java   |  4 +--
 java/javax/security/auth/message/ServerAuth.java   |  4 +--
 .../message/callback/CallerPrincipalCallback.java  |  4 +--
 .../auth/message/callback/CertStoreCallback.java   |  3 +-
 .../message/callback/GroupPrincipalCallback.java   |  3 +-
 .../callback/PasswordValidationCallback.java   |  4 +--
 .../auth/message/callback/PrivateKeyCallback.java  |  5 ++--
 .../auth/message/callback/SecretKeyCallback.java   |  4 +--
 .../auth/message/callback/TrustStoreCallback.java  |  3 +-
 .../auth/message/config/AuthConfigFactory.java | 34 +-
 .../auth/message/config/AuthConfigProvider.java|  6 ++--
 .../auth/message/config/ClientAuthConfig.java  |  3 +-
 .../auth/message/config/ServerAuthConfig.java  |  3 +-
 .../auth/message/module/ClientAuthModule.java  |  4 +--
 .../auth/message/module/ServerAuthModule.java  |  4 +--
 15 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/java/javax/security/auth/message/ClientAuth.java 
b/java/javax/security/auth/message/ClientAuth.java
index a537ef2a17..a8f9a77ae7 100644
--- a/java/javax/security/auth/message/ClientAuth.java
+++ b/java/javax/security/auth/message/ClientAuth.java
@@ -22,8 +22,8 @@ public interface ClientAuth {
 
 AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject) 
throws AuthException;
 
-AuthStatus validateResponse(MessageInfo messageInfo, Subject clientSubject,
-Subject serviceSubject) throws AuthException;
+AuthStatus validateResponse(MessageInfo messageInfo, Subject 
clientSubject, Subject serviceSubject)
+throws AuthException;
 
 void cleanSubject(MessageInfo messageInfo, Subject subject) throws 
AuthException;
 }
diff --git a/java/javax/security/auth/message/ServerAuth.java 
b/java/javax/security/auth/message/ServerAuth.java
index bb404f558b..23f5c66ecb 100644
--- a/java/javax/security/auth/message/ServerAuth.java
+++ b/java/javax/security/auth/message/ServerAuth.java
@@ -20,8 +20,8 @@ import javax.security.auth.Subject;
 
 public interface ServerAuth {
 
-AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject,
-Subject serviceSubject) throws AuthException;
+AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, 
Subject serviceSubject)
+throws AuthException;
 
 AuthStatus secureResponse(MessageInfo messageInfo, Subject serviceSubject) 
throws AuthException;
 
diff --git 
a/java/javax/security/auth/message/callback/CallerPrincipalCallback.java 
b/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
index 2c7010f680..803856d67b 100644
--- a/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
+++ b/java/javax/security/auth/message/callback/CallerPrincipalCallback.java
@@ -22,8 +22,8 @@ import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 
 /**
- * Callback that enables an authentication module to inform the runtime of the
- * call principal or name of the caller principal.
+ * Callback that enables an authentication module to inform the runtime of the 
call principal or name of the caller
+ * principal.
  */
 public class CallerPrincipalCallback implements Callback {
 
diff --git a/java/javax/security/auth/message/callback/CertStoreCallback.java 
b/java/javax/security/auth/message/callback/CertStoreCallback.java
index 13734e8ce0..963d7b29dc 100644
--- a/java/javax/security/auth/message/callback/CertStoreCallback.java
+++ b/java/javax/security/auth/message/callback/CertStoreCallback.java
@@ -21,8 +21,7 @@ import java.security.cert.CertStore;
 import javax.security.auth.callback.Callback;
 
 /**
- * Callback that enables a runtime to inform authentication modules of the
- * CertStore to use.
+ * Callback that enables a runtime to inform authentication modules of the 
CertStore to use.
  */
 public class CertStoreCallback implements Callback {
 
diff --git 
a/java/javax/security/auth/message/callback/GroupPrincipalCallback.java 
b/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
index f44c04629a..4261f9d791 100644
--- a/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
+++ b/java/javax/security/auth/message/callback/GroupPrincipalCallback.java
@@ -20,8 +20,7 @@ import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 
 /**
- * Callback that enables an authentication module to inform the runtime of the
- * groups a user is in.
+ * Callback that enables an authentication module to inform the runtime of the 
groups a user is in.
  */
 public class GroupPrinc

[tomcat] 04/08: Code clean-up - no functional change

[markt]

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 be4df0f63a6f2ead2268afd765ddf815be9f2747
Author: Mark Thomas 
AuthorDate: Fri Apr 14 14:18:45 2023 +0100

Code clean-up - no functional change
---
 java/javax/websocket/ClientEndpoint.java   |   6 +-
 java/javax/websocket/ClientEndpointConfig.java |  36 ++--
 java/javax/websocket/CloseReason.java  |   6 +-
 java/javax/websocket/ContainerProvider.java|  12 +-
 java/javax/websocket/DecodeException.java  |   3 +-
 .../websocket/DefaultClientEndpointConfig.java |   8 +-
 java/javax/websocket/Encoder.java  |   6 +-
 java/javax/websocket/Endpoint.java |   9 +-
 java/javax/websocket/Extension.java|   2 +
 java/javax/websocket/MessageHandler.java   |   7 +-
 java/javax/websocket/PongMessage.java  |   6 +-
 java/javax/websocket/RemoteEndpoint.java   | 186 ++---
 java/javax/websocket/SendResult.java   |   2 +-
 java/javax/websocket/Session.java  |  93 +--
 java/javax/websocket/WebSocketContainer.java   |  70 
 .../server/DefaultServerEndpointConfig.java|  11 +-
 java/javax/websocket/server/HandshakeRequest.java  |  12 +-
 java/javax/websocket/server/PathParam.java |   5 +-
 .../websocket/server/ServerApplicationConfig.java  |  27 ++-
 java/javax/websocket/server/ServerEndpoint.java|   7 +-
 .../websocket/server/ServerEndpointConfig.java |  70 +++-
 21 files changed, 258 insertions(+), 326 deletions(-)

diff --git a/java/javax/websocket/ClientEndpoint.java 
b/java/javax/websocket/ClientEndpoint.java
index 7de59fc0cb..f5cf516fa4 100644
--- a/java/javax/websocket/ClientEndpoint.java
+++ b/java/javax/websocket/ClientEndpoint.java
@@ -27,8 +27,10 @@ import javax.websocket.ClientEndpointConfig.Configurator;
 @Target(ElementType.TYPE)
 public @interface ClientEndpoint {
 String[] subprotocols() default {};
+
 Class[] decoders() default {};
+
 Class[] encoders() default {};
-Class configurator()
-default Configurator.class;
+
+Class configurator() default Configurator.class;
 }
diff --git a/java/javax/websocket/ClientEndpointConfig.java 
b/java/javax/websocket/ClientEndpointConfig.java
index 61a4b108a6..43547e6276 100644
--- a/java/javax/websocket/ClientEndpointConfig.java
+++ b/java/javax/websocket/ClientEndpointConfig.java
@@ -30,8 +30,8 @@ public interface ClientEndpointConfig extends EndpointConfig {
 
 final class Builder {
 
-private static final Configurator DEFAULT_CONFIGURATOR =
-new Configurator() {};
+private static final Configurator DEFAULT_CONFIGURATOR = new 
Configurator() {
+};
 
 
 public static Builder create() {
@@ -46,15 +46,12 @@ public interface ClientEndpointConfig extends 
EndpointConfig {
 private Configurator configurator = DEFAULT_CONFIGURATOR;
 private List preferredSubprotocols = Collections.emptyList();
 private List extensions = Collections.emptyList();
-private List> encoders =
-Collections.emptyList();
-private List> decoders =
-Collections.emptyList();
+private List> encoders = 
Collections.emptyList();
+private List> decoders = 
Collections.emptyList();
 
 
 public ClientEndpointConfig build() {
-return new DefaultClientEndpointConfig(preferredSubprotocols,
-extensions, encoders, decoders, configurator);
+return new DefaultClientEndpointConfig(preferredSubprotocols, 
extensions, encoders, decoders, configurator);
 }
 
 
@@ -68,21 +65,17 @@ public interface ClientEndpointConfig extends 
EndpointConfig {
 }
 
 
-public Builder preferredSubprotocols(
-List preferredSubprotocols) {
-if (preferredSubprotocols == null ||
-preferredSubprotocols.size() == 0) {
+public Builder preferredSubprotocols(List 
preferredSubprotocols) {
+if (preferredSubprotocols == null || preferredSubprotocols.size() 
== 0) {
 this.preferredSubprotocols = Collections.emptyList();
 } else {
-this.preferredSubprotocols =
-Collections.unmodifiableList(preferredSubprotocols);
+this.preferredSubprotocols = 
Collections.unmodifiableList(preferredSubprotocols);
 }
 return this;
 }
 
 
-public Builder extensions(
-List extensions) {
+public Builder extensions(List extensions) {
 if (extensions == null || extensions.size() == 0) {
 this.extensions = Collections.emptyList();
 } else {
@@ -116,18 +109,17 @@ public interface ClientEndpointConfig extends 

[tomcat] 07/08: Code clean-up - no functional change

[markt]

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 1deeffebc6ac97141bd67874eab67b49e18227db
Author: Mark Thomas 
AuthorDate: Fri Apr 14 14:19:00 2023 +0100

Code clean-up - no functional change
---
 java/javax/ejb/EJB.java | 7 ++-
 java/javax/mail/Session.java| 1 +
 java/javax/mail/internet/MimeMessage.java   | 2 ++
 java/javax/persistence/PersistenceContext.java  | 6 +-
 java/javax/persistence/PersistenceProperty.java | 1 +
 java/javax/persistence/PersistenceUnit.java | 3 ++-
 java/javax/xml/ws/WebServiceRef.java| 6 +-
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/java/javax/ejb/EJB.java b/java/javax/ejb/EJB.java
index bf37ba8b14..46b0aa23f6 100644
--- a/java/javax/ejb/EJB.java
+++ b/java/javax/ejb/EJB.java
@@ -21,15 +21,20 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.METHOD, ElementType.TYPE, ElementType.FIELD})
+@Target({ ElementType.METHOD, ElementType.TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface EJB {
 String name() default "";
+
 String description() default "";
+
 @SuppressWarnings("rawtypes") // Can't use Class because API needs to 
match specification
 Class beanInterface() default java.lang.Object.class;
+
 String beanName() default "";
+
 String mappedName() default "";
+
 String lookup() default "";
 }
diff --git a/java/javax/mail/Session.java b/java/javax/mail/Session.java
index a95a11b574..b409fa4110 100644
--- a/java/javax/mail/Session.java
+++ b/java/javax/mail/Session.java
@@ -23,6 +23,7 @@ public class Session {
 public static Session getInstance(Properties props, Authenticator auth) {
 return null;
 }
+
 public static Session getInstance(Properties props) {
 return null;
 }
diff --git a/java/javax/mail/internet/MimeMessage.java 
b/java/javax/mail/internet/MimeMessage.java
index 25877302af..4945ffd8af 100644
--- a/java/javax/mail/internet/MimeMessage.java
+++ b/java/javax/mail/internet/MimeMessage.java
@@ -23,9 +23,11 @@ public class MimeMessage implements MimePart {
 public MimeMessage(Session session) {
 // Dummy implementation
 }
+
 public void setFrom(InternetAddress from) {
 // Dummy implementation
 }
+
 public void setSubject(String subject) {
 // Dummy implementation
 }
diff --git a/java/javax/persistence/PersistenceContext.java 
b/java/javax/persistence/PersistenceContext.java
index 428fa09cff..eb65739aef 100644
--- a/java/javax/persistence/PersistenceContext.java
+++ b/java/javax/persistence/PersistenceContext.java
@@ -21,13 +21,17 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface PersistenceContext {
 String name() default "";
+
 String unitName() default "";
+
 PersistenceContextType type() default PersistenceContextType.TRANSACTION;
+
 PersistenceProperty[] properties() default {};
+
 SynchronizationType synchronization() default 
SynchronizationType.SYNCHRONIZED;
 }
diff --git a/java/javax/persistence/PersistenceProperty.java 
b/java/javax/persistence/PersistenceProperty.java
index 6379071b11..5a8643482d 100644
--- a/java/javax/persistence/PersistenceProperty.java
+++ b/java/javax/persistence/PersistenceProperty.java
@@ -25,5 +25,6 @@ import java.lang.annotation.Target;
 
 public @interface PersistenceProperty {
 String name();
+
 String value();
 }
diff --git a/java/javax/persistence/PersistenceUnit.java 
b/java/javax/persistence/PersistenceUnit.java
index 54f5150c4b..5024f4159e 100644
--- a/java/javax/persistence/PersistenceUnit.java
+++ b/java/javax/persistence/PersistenceUnit.java
@@ -21,10 +21,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 
 public @interface PersistenceUnit {
 String name() default "";
+
 String unitName() default "";
 }
diff --git a/java/javax/xml/ws/WebServiceRef.java 
b/java/javax/xml/ws/WebServiceRef.java
index 8106123a99..5edcbe4324 100644
--- a/java/javax/xml/ws/WebServiceRef.java
+++ b/java/javax/xml/ws/WebServiceRef.java
@@ -21,15 +21,19 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.

[tomcat] 08/08: Align with 9.0.x

[markt]

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 d1ff7e54cfeb8f124c94fa3cd4c6de81c4b52579
Author: Mark Thomas 
AuthorDate: Fri Apr 14 14:44:05 2023 +0100

Align with 9.0.x

Javadoc improvements
Align formatting
---
 java/javax/el/ImportHandler.java |  1 -
 java/javax/security/auth/message/ClientAuth.java | 32 +++
 java/javax/security/auth/message/ServerAuth.java | 33 +++-
 java/javax/servlet/http/Cookie.java  | 17 
 java/javax/servlet/http/HttpServlet.java | 13 +-
 5 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/java/javax/el/ImportHandler.java b/java/javax/el/ImportHandler.java
index eba3bb8363..dfd8ed5018 100644
--- a/java/javax/el/ImportHandler.java
+++ b/java/javax/el/ImportHandler.java
@@ -114,7 +114,6 @@ public class ImportHandler {
 servletHttpClassNames.add("HttpSessionEvent");
 servletHttpClassNames.add("HttpUtils");
 // Enums
-servletHttpClassNames.add("ApplicationMappingMatch");
 standardPackages.put("javax.servlet.http", servletHttpClassNames);
 
 // JSP 2.3
diff --git a/java/javax/security/auth/message/ClientAuth.java 
b/java/javax/security/auth/message/ClientAuth.java
index a8f9a77ae7..5fc5fe6733 100644
--- a/java/javax/security/auth/message/ClientAuth.java
+++ b/java/javax/security/auth/message/ClientAuth.java
@@ -20,11 +20,43 @@ import javax.security.auth.Subject;
 
 public interface ClientAuth {
 
+/**
+ * Secure (authenticate) the request.
+ *
+ * @param messageInfo   The associated request and response
+ * @param clientSubject The subject that represents the source of the 
request
+ *
+ * @return An AuthStatus instance that represents the result of the 
authentication
+ *
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
+ */
 AuthStatus secureRequest(MessageInfo messageInfo, Subject clientSubject) 
throws AuthException;
 
+/**
+ * Validate a response.
+ *
+ * @param messageInfoThe associated request and response
+ * @param clientSubject  The subject that represents the recipient of the 
response
+ * @param serviceSubject The subject that represents the source of the 
response
+ *
+ * @return An AuthStatus instance that represents the result of the 
validation
+ *
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
+ */
 AuthStatus validateResponse(MessageInfo messageInfo, Subject 
clientSubject, Subject serviceSubject)
 throws AuthException;
 
+/**
+ * Remove principals and/or credentials from the subject that were 
previously added by this authentication
+ * mechanism.
+ *
+ * @param messageInfo The associated request and response
+ * @param subject The subject to clean
+ *
+ * @throws AuthException If the a failure occurred
+ */
 void cleanSubject(MessageInfo messageInfo, Subject subject) throws 
AuthException;
 }
 
diff --git a/java/javax/security/auth/message/ServerAuth.java 
b/java/javax/security/auth/message/ServerAuth.java
index 23f5c66ecb..392bc5094b 100644
--- a/java/javax/security/auth/message/ServerAuth.java
+++ b/java/javax/security/auth/message/ServerAuth.java
@@ -20,10 +20,41 @@ import javax.security.auth.Subject;
 
 public interface ServerAuth {
 
-AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject, 
Subject serviceSubject)
+/**
+ * Validate the request.
+ *
+ * @param messageInfoThe associated request and response
+ * @param clientSubject  The subject that represents the source of the 
request
+ * @param serviceSubject The subject that represents the recipient of the 
request
+ *
+ * @return An AuthStatus instance that represents the result of the 
validation
+ *
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ *   via messageInfo
+ */AuthStatus validateRequest(MessageInfo messageInfo, Subject 
clientSubject, Subject serviceSubject)
 throws AuthException;
 
+/**
+ * Secure (authenticate) the response.
+ *
+ * @param messageInfoThe associated request and response
+ * @param serviceSubject The subject that represents the source of the 
response
+ *
+ * @return An AuthStatus instance that represents the result of the 
authentication
+ *
+ * @throws AuthException If the a failure occurred in a manner that 
prevented the failure from being communicated
+ * 

[tomcat] branch 8.5.x updated: Align with 9.0.x

[markt]

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 29a4bbf4fc Align with 9.0.x
29a4bbf4fc is described below

commit 29a4bbf4fcb72b699f776cfcc926ed5f2902de0d
Author: Mark Thomas 
AuthorDate: Fri Apr 14 14:45:34 2023 +0100

Align with 9.0.x

More Javadoc improvements
Schema comment fixes
---
 java/javax/servlet/AsyncContext.java   |  4 ++-
 java/javax/servlet/Servlet.java|  2 +-
 java/javax/servlet/ServletRequest.java |  7 ++---
 java/javax/servlet/http/HttpServletResponse.java   | 30 +++---
 .../servlet/http/HttpServletResponseWrapper.java   |  2 +-
 java/javax/servlet/jsp/JspPage.java| 15 +++
 java/javax/servlet/jsp/tagext/IterationTag.java|  1 -
 java/javax/servlet/jsp/tagext/VariableInfo.java|  4 +--
 java/javax/servlet/resources/jsp_2_1.xsd   |  2 +-
 .../servlet/resources/web-jsptaglibrary_1_1.dtd|  2 +-
 .../servlet/resources/web-jsptaglibrary_1_2.dtd|  2 +-
 .../servlet/resources/web-jsptaglibrary_2_0.xsd|  2 +-
 .../servlet/resources/web-jsptaglibrary_2_1.xsd|  2 +-
 java/javax/websocket/Decoder.java  |  8 ++
 java/javax/websocket/Encoder.java  |  8 ++
 15 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/java/javax/servlet/AsyncContext.java 
b/java/javax/servlet/AsyncContext.java
index b74ef2c407..57e336a4d5 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -17,7 +17,9 @@
 package javax.servlet;
 
 /**
- * TODO SERVLET3 - Add comments
+ * Provides the context for asynchronous request handling
+ *
+ * @since Servlet 3.0
  */
 public interface AsyncContext {
 
diff --git a/java/javax/servlet/Servlet.java b/java/javax/servlet/Servlet.java
index f326681147..2ae5ede385 100644
--- a/java/javax/servlet/Servlet.java
+++ b/java/javax/servlet/Servlet.java
@@ -90,7 +90,7 @@ public interface Servlet {
  * Servlets typically run inside multithreaded servlet containers that can 
handle multiple requests concurrently.
  * Developers must be aware to synchronize access to any shared resources 
such as files, network connections, and as
  * well as the servlet's class and instance variables. More information on 
multithreaded programming in Java is
- * available in http://java.sun.com/Series/Tutorial/java/threads/multithreaded.html";> the 
Java tutorial on
+ * available in http://java.sun.com/Series/Tutorial/java/threads/multithreaded.html";> the 
Java tutorial on
  * multi-threaded programming.
  *
  * @param req the ServletRequest object that contains the 
client's request
diff --git a/java/javax/servlet/ServletRequest.java 
b/java/javax/servlet/ServletRequest.java
index b3fcff596d..bf59351afc 100644
--- a/java/javax/servlet/ServletRequest.java
+++ b/java/javax/servlet/ServletRequest.java
@@ -18,6 +18,7 @@ package javax.servlet;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.util.Enumeration;
 import java.util.Locale;
 import java.util.Map;
@@ -77,11 +78,11 @@ public interface ServletRequest {
  * Overrides the name of the character encoding used in the body of this 
request. This method must be called prior
  * to reading request parameters or reading input using getReader().
  *
- * @param env a String containing the name of the character 
encoding.
+ * @param encoding a {@code String} containing the name of the character 
encoding
  *
- * @throws java.io.UnsupportedEncodingException if this is not a valid 
encoding
+ * @throws UnsupportedEncodingException if this is not a valid encoding
  */
-void setCharacterEncoding(String env) throws 
java.io.UnsupportedEncodingException;
+void setCharacterEncoding(String encoding) throws 
UnsupportedEncodingException;
 
 /**
  * Returns the length, in bytes, of the request body and made available by 
the input stream, or -1 if the length is
diff --git a/java/javax/servlet/http/HttpServletResponse.java 
b/java/javax/servlet/http/HttpServletResponse.java
index 54e2bf801f..c6cdec158f 100644
--- a/java/javax/servlet/http/HttpServletResponse.java
+++ b/java/javax/servlet/http/HttpServletResponse.java
@@ -133,20 +133,32 @@ public interface HttpServletResponse extends 
ServletResponse {
 void sendError(int sc) throws IOException;
 
 /**
- * Sends a temporary redirect response to the client using the specified 
redirect location URL. This method can
- * accept relative URLs; the servlet container must convert the relative 
URL to an absolute URL before sending the
- * response to the client. If the location is relative without a leading 
'/' the container interprets it as relative
-  

[GitHub] [tomcat] markt-asf commented on pull request #609: Unify Windows/Linux package filesets

[via GitHub]

markt-asf commented on PR #609:
URL: https://github.com/apache/tomcat/pull/609#issuecomment-1508578170

   What end goal are you looking for?  Going back to users@ thread from a month 
ago, it looks like you want to be able to obtain a version of Tomcat from Maven 
Central that can be installed as a Windows service.
   
   Adding service.bat to the platform neutral .zip and .tar.gz archives doesn't 
help - they don't contain the necessary binaries.
   
   Adding the Windows specific binaries to Maven Central (as I suggested in the 
users@ thread) still looks to be the cleanest solution. It also gets you Tomcat 
Native.
   
   What makes you say the zip distribution doesn't work on Linux. I've just 
tested it and it works as expected.


-- 
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

[GitHub] [tomcat] ChristopherSchultz commented on pull request #609: Unify Windows/Linux package filesets

[via GitHub]

ChristopherSchultz commented on PR #609:
URL: https://github.com/apache/tomcat/pull/609#issuecomment-1508680413

   Why not have a separate Maven package for *just* the binaries / scripts 
required for the platform, and a dependency on the core package?
   
   I am -1 on labeling the distribution containing the `.sh` scripts as 
`-linux`. It is much more general than *Linux*. Feel free to call it `-unix` if 
you have to, even though you can run it perfectly fine on Windows as well...


-- 
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: [VOTE] Release Apache Tomcat 9.0.74

[jean-frederic clere]

On 4/13/23 10:42, Rémy Maucherat wrote:

[X] Stable - go ahead and release as 9.0.74


Tested on fedora 37 with native 1.2.26


--
Cheers

Jean-Frederic


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: Tomcat 10.1.8 and 8.5.88

[Christopher Schultz]

All,

On 4/13/23 10:14, Christopher Schultz wrote:

VirtualBox is giving me a headache again. I'll roll the next releases ASAP.


This is due to an incompatibility between VirtualBox and Ventura 13.3 
when using EFI-based VMs. Good times.


I'm moving the VM to another host to get started.

-chris

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [VOTE] Release Apache Tomcat 11.0.0-M5

[Dimitris Soumis]

On Thu, Apr 13, 2023 at 2:26 AM Mark Thomas  wrote:

> The proposed Apache Tomcat 11.0.0-M5 release is now available for
> voting.
>
> Apache Tomcat 11.0.0-M5 is a milestone release of the 11.0.x branch and
> has been made to provide users with early access to the new features in
> Apache Tomcat 11.0.x so that they may provide feedback. The notable
> changes compared to the previous milestone include:
>
> - Reduce the default value of maxParameterCount from 10,000 to 1,000.
>
> - Correct a regression in the fix for bug 66442 that meant that streams
>without a response body did not decrement the active stream count
>when completing leading to ERR_HTTP2_SERVER_REFUSED_STREAM for some
>connections.
>
> - Expand the validation of the value of the Sec-Websocket-Key header in
>the HTTP upgrade request that initiates a WebSocket connection. The
>value is not decoded but it is checked for the correct length and that
>only valid characters from the base64 alphabet are used.
>
>
> For full details, see the change log:
> https://nightlies.apache.org/tomcat/tomcat-11.0.x/docs/changelog.html
>
> Applications that run on Tomcat 9 and earlier will not run on Tomcat 11
> without changes. Java EE applications designed for Tomcat 9 and earlier
> may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat
> will automatically convert them to Jakarta EE and copy them to the
> webapps directory. Applications using deprecated APIs may require
> further changes.
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-11/v11.0.0-M5/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1427
>
> The tag is:
> https://github.com/apache/tomcat/tree/11.0.0-M5
> 06977fbea3c82c3d29e544203983dd3b49a632f1
>
>
> The proposed 11.0.0-M5 release is:
> [ ] Broken - do not release
> [ X] Alpha  - go ahead and release as 11.0.0-M5
>

Tests pass with tc-native2.0.3 and OpenSSL3.0.8 on Fedora 36.

[GitHub] [tomcat] markt-asf commented on pull request #609: Unify Windows/Linux package filesets

[via GitHub]

markt-asf commented on PR #609:
URL: https://github.com/apache/tomcat/pull/609#issuecomment-1509148516

   My initial reasoning for not having Maven packages (one for each 
architecture) with just the binaries in it is that we don't have that anywhere 
else at the moment whereas we do have the full Windows binaries. The later 
would be easier to setup. Thinking about it, I think a Windows packages with 
everything will also be easier for users.


-- 
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] 01/01: Tag 10.1.8

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to tag 10.1.8
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 477b206c9f05d2e70438a440bd40ab523662
Author: schultz 
AuthorDate: Fri Apr 14 12:51:29 2023 -0700

Tag 10.1.8
---
 build.properties.release |  52 +++
 res/install-win/Uninstall.exe.sig| Bin 0 -> 10247 bytes
 res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10247 bytes
 res/maven/mvn.properties.release |  27 
 webapps/docs/changelog.xml   |   2 +-
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..b4222a8bc1
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,52 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2023-04-14T19:40:29Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on October 13 2021
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:11.0.18+10
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment in consistent with this information.
+#
+# OS:  amd64 Windows 10 10.0
+# File encoding:   Cp1252
+#
+# Release Manager: schultz
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..32f138dd30
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..5c69e5c638
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..595db0a804
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=10.1.8
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
+
+# Set the user name to u

[tomcat] tag 10.1.8 created (now 477b206c9f)

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 10.1.8
in repository https://gitbox.apache.org/repos/asf/tomcat.git


  at 477b206c9f (commit)
This tag includes the following new commits:

 new 477b206c9f Tag 10.1.8

The 1 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.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r61284 - in /dev/tomcat/tomcat-10/v10.1.8: ./ bin/ bin/embed/ src/

[schultz]

Author: schultz
Date: Fri Apr 14 19:56:43 2023
New Revision: 61284

Log:
Upload 10.1.8 for voting

Added:
dev/tomcat/tomcat-10/v10.1.8/
dev/tomcat/tomcat-10/v10.1.8/KEYS
dev/tomcat/tomcat-10/v10.1.8/README.html
dev/tomcat/tomcat-10/v10.1.8/RELEASE-NOTES
dev/tomcat/tomcat-10/v10.1.8/bin/
dev/tomcat/tomcat-10/v10.1.8/bin/README.html
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-deployer.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-deployer.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-deployer.zip   (with 
props)
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-deployer.zip.asc
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-deployer.zip.sha512
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-fulldocs.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-windows-x64.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-windows-x64.zip.asc
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-windows-x64.zip.sha512
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-windows-x86.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-windows-x86.zip.asc
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8-windows-x86.zip.sha512
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.exe   (with props)
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.exe.asc
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.exe.sha512
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.tar.gz   (with props)
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.zip   (with props)
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.zip.asc
dev/tomcat/tomcat-10/v10.1.8/bin/apache-tomcat-10.1.8.zip.sha512
dev/tomcat/tomcat-10/v10.1.8/bin/embed/
dev/tomcat/tomcat-10/v10.1.8/bin/embed/apache-tomcat-10.1.8-embed.tar.gz   
(with props)
dev/tomcat/tomcat-10/v10.1.8/bin/embed/apache-tomcat-10.1.8-embed.tar.gz.asc

dev/tomcat/tomcat-10/v10.1.8/bin/embed/apache-tomcat-10.1.8-embed.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.8/bin/embed/apache-tomcat-10.1.8-embed.zip   
(with props)
dev/tomcat/tomcat-10/v10.1.8/bin/embed/apache-tomcat-10.1.8-embed.zip.asc
dev/tomcat/tomcat-10/v10.1.8/bin/embed/apache-tomcat-10.1.8-embed.zip.sha512
dev/tomcat/tomcat-10/v10.1.8/src/
dev/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.tar.gz   (with 
props)
dev/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.tar.gz.asc
dev/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.tar.gz.sha512
dev/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.zip   (with props)
dev/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.zip.asc
dev/tomcat/tomcat-10/v10.1.8/src/apache-tomcat-10.1.8-src.zip.sha512

Added: dev/tomcat/tomcat-10/v10.1.8/KEYS
==
--- dev/tomcat/tomcat-10/v10.1.8/KEYS (added)
+++ dev/tomcat/tomcat-10/v10.1.8/KEYS Fri Apr 14 19:56:43 2023
@@ -0,0 +1,562 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+pub   4096R/2F6059E7 2009-09-18
+  Key fingerprint = A9C5 DF4D 22E9 9998 D987  5A51 10C0 1C5A 2F60 59E7
+uid  Mark E D Thomas 
+sub   4096R/5E763BEC 2009-09-18
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - http://gpgtools.org
+
+mQINBEq0DukBEAD4jovHOPJDxoD+JnO1Go2kiwpgRULasGlrVKuSUdP6wzcaqWmX
+pqtOJKKwW2MQFQLmg7nQ9RjJwy3QCbKNDJQA/bwbQT1F7WzTCz2S6vxC4zxKck4t
+6RZBq2dJsYKF0CEh6ZfY4dmKvhq+3istSoFRdHYoOPGWZpuRDqfZPdGm/m335/6K
+GH59oysn1NE7a2a+kZzjBSEgv23+l4Z1Rg7+fpz1JcdHSdC2Z+ZRxML25eVatRVz
+4yvDOZItqDURP24zWOodxgboldV6Y88C3v/7KRR+1vklzkuA2FqF8Q4r/2f0su7M
+UVviQcy29y/RlLSDTTYoVlCZ1ni14qFU7Hpw43KJtgXmcUwq31T1+SlXdYjNJ1aF
+kUi8BjCHDcSgE/IReKUanjHzm4XSymKDTeqqzidi4k6PDD4jyHb8k8vxi6qT6Udn
+lcfo5NBkkUT1TauhEy8ktHhbl9k60BvvMBP9l6cURiJg1WS77egI4P/82oPbzzFi
+GFqXyJKULVgxtdQ3JikCpodp3f1fh6PlYZwkW4xCJLJucJ5MiQp07HAkMVW5w+k8
+Xvuk4i5quh3N+2kzKHOOiQCDmN0sz0XjOE+7XBvM1lvz3+UarLfgSVmW8aheLd7e
+aIl5ItBk8844ZJ60LrQ+JiIqvqJemxyIM6epoZvY5a3ZshZpcLilC5hW8QA

[VOTE] Release Apache Tomcat 10.1.8

[Christopher Schultz]

The proposed Apache Tomcat 10.1.8 release is now available for
voting.

The notable changes compared to 10.1.7 are:

- Reduce the default value of maxParameterCount from 10,000 to 1,000.

- Correct a regression in the fix for bug 66442 that meant that streams
  without a response body did not decrement the active stream count
  when completing leading to ERR_HTTP2_SERVER_REFUSED_STREAM for some
  connections.

- Expand the validation of the value of the Sec-Websocket-Key header in
  the HTTP upgrade request that initiates a WebSocket connection. The
  value is not decoded but it is checked for the correct length and that
  only valid characters from the base64 alphabet are used.

- Implement RFC 9239; note the MIME types for Javascript has changed
  to text/javascript.

For full details, see the change log:
https://nightlies.apache.org/tomcat/tomcat-10.1.x/docs/changelog.html

Applications that run on Tomcat 9 and earlier will not run on Tomcat 10 
without changes. Java EE applications designed for Tomcat 9 and earlier 
may be placed in the $CATALINA_BASE/webapps-javaee directory and Tomcat 
will automatically convert them to Jakarta EE and copy them to the 
webapps directory.


It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-10/v10.1.8/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1429

The tag is:
https://github.com/apache/tomcat/tree/10.1.8
477b206c9f05d2e70438a440bd40ab523662

The proposed 10.1.8 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 10.1.8

-
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: Increment version numbers for next release.

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new c6a341203f Increment version numbers for next release.
c6a341203f is described below

commit c6a341203fe15a5424e5042c82467ed0df54586f
Author: Christopher Schultz 
AuthorDate: Fri Apr 14 16:11:57 2023 -0400

Increment version numbers for next release.
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 6 --
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d2d8a45b67..e6844a4b2e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=10
 version.minor=1
-version.build=8
+version.build=9
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index e3400dd5d1..4a11ddf5ed 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=10.1.8
+maven.asf.release.deploy.version=10.1.9
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7e1b56c5a4..ee59cb5a9c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   
@@ -302,7 +304,7 @@
 
   
 
-
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] tag 8.5.88 created (now e035e21170)

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a change to tag 8.5.88
in repository https://gitbox.apache.org/repos/asf/tomcat.git


  at e035e21170 (commit)
This tag includes the following new commits:

 new e035e21170 Tag 8.5.88

The 1 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.



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 01/01: Tag 8.5.88

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to tag 8.5.88
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit e035e211705c7ec7a2ecf666f4a1fdf0965e9977
Author: schultz 
AuthorDate: Fri Apr 14 13:30:14 2023 -0700

Tag 8.5.88
---
 build.properties.release |  52 +++
 res/install-win/Uninstall.exe.sig| Bin 0 -> 10247 bytes
 res/install-win/tomcat-installer.exe.sig | Bin 0 -> 10247 bytes
 res/maven/mvn.properties.release |  27 
 webapps/docs/changelog.xml   |   2 +-
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/build.properties.release b/build.properties.release
new file mode 100644
index 00..5fdd448615
--- /dev/null
+++ b/build.properties.release
@@ -0,0 +1,52 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Any unwanted settings may be over-ridden in a build.properties file located
+# in the same directory as this file.
+
+# Set the version-dev to "" (empty string) as this is not a development 
release.
+version.dev=
+
+# Ensure consistent timestamps for reproducible builds.
+ant.tstamp.now.iso=2023-04-14T20:16:27Z
+
+# Enable insertion of detached signatures into the Windows installer.
+do.codesigning=true
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
+
+# Reproducible builds require the use of the build tools defined below. The
+# vendors (where appropriate) and versions must match exactly for a 
reproducible
+# build since this data is embedded in various files, particularly JAR file
+# manifests, as part of the build process.
+#
+# Apache Ant:  Apache Ant(TM) version 1.10.12 compiled on October 13 2021
+#
+# Java Name:   OpenJDK 64-Bit Server VM
+# Java Vendor: Eclipse Adoptium
+# Java Version:11.0.18+10
+
+# The following is provided for information only. Builds will be repeatable
+# whether or not the build environment in consistent with this information.
+#
+# OS:  amd64 Windows 10 10.0
+# File encoding:   Cp1252
+#
+# Release Manager: schultz
diff --git a/res/install-win/Uninstall.exe.sig 
b/res/install-win/Uninstall.exe.sig
new file mode 100644
index 00..83d1cf5317
Binary files /dev/null and b/res/install-win/Uninstall.exe.sig differ
diff --git a/res/install-win/tomcat-installer.exe.sig 
b/res/install-win/tomcat-installer.exe.sig
new file mode 100644
index 00..c20b04a76b
Binary files /dev/null and b/res/install-win/tomcat-installer.exe.sig differ
diff --git a/res/maven/mvn.properties.release b/res/maven/mvn.properties.release
new file mode 100644
index 00..281ac61e4e
--- /dev/null
+++ b/res/maven/mvn.properties.release
@@ -0,0 +1,27 @@
+# -
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# -
+
+# This file was auto-generated by the pre-release Ant target.
+
+# Remove "-dev" from the version since this is not a development release.
+maven.asf.release.deploy.version=8.5.88
+
+# Re-use the same GPG executable.
+gpg.exec=C:/Program Files (x86)/gnupg/bin/gpg.exe
+
+# Set the user name to u

svn commit: r61287 [2/2] - in /dev/tomcat/tomcat-8/v8.5.88: ./ bin/ bin/embed/ bin/extras/ src/

[schultz]

Added: dev/tomcat/tomcat-8/v8.5.88/bin/extras/catalina-ws.jar.asc
==
--- dev/tomcat/tomcat-8/v8.5.88/bin/extras/catalina-ws.jar.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.88/bin/extras/catalina-ws.jar.asc Fri Apr 14 
20:31:10 2023
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmQ5tiYACgkQHPApP6U8
+pFg0lQ//XtyiVhP3YVUZFPoErbUwTmIDyEr1kPAPzTm+ae1dxHTD+Ocl7xJK2d9I
+E9JIYTqKcbo4MZsjY+1rmgvAQm9ZGBXuLaqkWSms3qmE8VtTFNLoOEeSCOH0ZjZ0
+OgCGLitJNsbJvJ5gdifLey2WbIrB9jHOtBA4MeB0Tvw2d+Zayb9u0R1TcsIsxWc8
+6aYy7/jiu11PifFbe6dQDk/tHfJm9xiBT4wTKqphuTuxqZIVgdKvApQfVYvyBodU
+uDZrniFbuxeOrE70NEUVCKHf623XSkuHc0pqZOmyKMZoJqrqwvVWMqSL0zhKQyT9
+UVLtH//ZB5IndUll78+7IbGA/mlS7+W3nvdZrw9oncgbzk/ycFi501loMxvwqNt8
+7rseC5QjbROBj26a2RlKh1PIKeMFwhk9qlPX2uAKP/TBVOQMrKwvMA6od18EHUVC
+U4TE5sFyrJ/U8FHF9WtvcLyFKhYpLDvG2vF2poWpi4rcT3gFCAgNFsUTF/z91KGe
+nXZ0VszuMUciRQUwQrFYTlXF27AyxQw3lT2bv3XK5moHTHgDHngUXlWiWP3Tb2o6
+6xl0ERVWAjVwQdm4FhTvG30zOj1e3xTL9KjCuexbsOE+emPHJNf94XnS39lXbFkG
+wT3EKKcsD/VNBa/Cm9PVRThTW1k9qJo3+fgsqoZ0uFnwtCGY5K4=
+=duMs
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.88/bin/extras/catalina-ws.jar.sha512
==
--- dev/tomcat/tomcat-8/v8.5.88/bin/extras/catalina-ws.jar.sha512 (added)
+++ dev/tomcat/tomcat-8/v8.5.88/bin/extras/catalina-ws.jar.sha512 Fri Apr 14 
20:31:10 2023
@@ -0,0 +1 @@
+9ba5443da1a87360e3406486b25608e7c0074d3a3b1e2114d85db9a91db8840223510d45a6d93c1c24338059b3756ab28501698b90190d7ab7c53b3745d7361b
 *catalina-ws.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.asc
==
--- dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.asc Fri Apr 
14 20:31:10 2023
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmQ5t4EACgkQHPApP6U8
+pFgutRAAggDCwNyPXCH2fdcBrygzC2ot30jQS/cVFtI4SchDWEppeTLljQPt5eZ9
+BsRT7Hfkq4wm72wY/4tFyESdIQ/2mjpqxgUZuSk5jcFwt+DoUIc61QotVDDwNo3l
+orQZr6Jbnp5sdrzKaO0ediGYtozMTnBmy2Lpx0D4QTvnyHTni3zrRfKMLEWIsZWe
+sM/kSo3s1/kNtVX2RSDbztHzvjoe9a12JwJ14cPBQBLH3FnzHTOZqfhFfkO7tSsv
+2u74q7kgA0nMxhKWKeHq2o5FjLaEUvJw3h97M2Qt6sbwEbIn5yOdcnDUaRmGfKi0
++Zb4P5JM9bQK4C++goi0ZIkjgwLJ4MvKoBhLAcIfxFU6Mr7YaPB3NRBWsuI0NH2i
+FCOoo6xLkiP39HCXEbNh/0iedT/9jfkp1GBq7bkhK2D9gGFFzbodZowgWZdp4dv+
+bI1+bR/1BLVAec8+avtJaUor2clVC3zP9e+fCG1WJYPwKTkNjSGqZEmp501MLsQv
+BEu1yrZ19/6QskGFfdPy0cOyP+jtPOZmmn7Kyspu3rldAasuarp0lNGXUsqCA8iV
+s3YbNIQXHJtxrMGBBQfu5ciemntjy8/7LfVfbA3MkuP9eqTzkpasnA2VMq3sVMGA
+c+ZtEiLr5oMrfSHhz62jVaJDOaduIkPsOWL5hEcbnDrl0rfNFz4=
+=iakz
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.sha512
==
--- dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.sha512 
(added)
+++ dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.sha512 Fri 
Apr 14 20:31:10 2023
@@ -0,0 +1 @@
+f3db0daf451ab6ef34163e2adf6388cd4d4502c7b28915f3ae954b79ea3fe5ed17c900294bac0b192268431a62d501b3b8d35f6d9e0bcb3ae1f9962ac3b8a084
 *apache-tomcat-8.5.88-src.tar.gz
\ No newline at end of file

Added: dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.zip
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.zip
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.zip.asc
==
--- dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.zip.asc (added)
+++ dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.zip.asc Fri Apr 14 
20:31:10 2023
@@ -0,0 +1,16 @@
+-BEGIN PGP SIGNATURE-
+
+iQIzBAABCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAmQ5t2QACgkQHPApP6U8
+pFhmtw/+NxLN5koFh7jDOIF8vBgr8TQ1vJphSlCmg9qaQOBVI/UQVpEOJqF0fikR
+JBbY/nYXHwPLci8CuejV8/Ny1zWwOqymtQcKc7qn7AtUJLu7QixZ00/S4g8mPaNo
+2sFn0zqPuCT4DkasKIExQGdJDkZcsL4ecDSvNWjSvCGY+BEhOvB5N+ovOMLvsb2z
+wpxCdeGe+SUsI563+wpsE4EDmmPV2LllpHRKVnbureH+AoF5KdYl/yIPmfyBbChT
+FU5RGUp/WD3Y/mOcIhKCwvxki46q2eYVaCLRfYvZKAtEMW/ZI1LxERo0DAtyoiIk
+TanHw7STybi+UTwy6ZYGMM/poOxOc40FB9rnEOBp

svn commit: r61287 [1/2] - in /dev/tomcat/tomcat-8/v8.5.88: ./ bin/ bin/embed/ bin/extras/ src/

[schultz]

Author: schultz
Date: Fri Apr 14 20:31:10 2023
New Revision: 61287

Log:
Upload 8.5.88 for voting.

Added:
dev/tomcat/tomcat-8/v8.5.88/
dev/tomcat/tomcat-8/v8.5.88/KEYS
dev/tomcat/tomcat-8/v8.5.88/README.html
dev/tomcat/tomcat-8/v8.5.88/RELEASE-NOTES
dev/tomcat/tomcat-8/v8.5.88/bin/
dev/tomcat/tomcat-8/v8.5.88/bin/README.html
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-deployer.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-deployer.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-deployer.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-deployer.zip   (with 
props)
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-deployer.zip.asc
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-deployer.zip.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-fulldocs.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-fulldocs.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-fulldocs.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-windows-x64.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-windows-x64.zip.asc
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-windows-x64.zip.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-windows-x86.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-windows-x86.zip.asc
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88-windows-x86.zip.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.exe   (with props)
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.exe.asc
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.exe.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.tar.gz   (with props)
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.zip   (with props)
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.zip.asc
dev/tomcat/tomcat-8/v8.5.88/bin/apache-tomcat-8.5.88.zip.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/embed/
dev/tomcat/tomcat-8/v8.5.88/bin/embed/apache-tomcat-8.5.88-embed.tar.gz   
(with props)
dev/tomcat/tomcat-8/v8.5.88/bin/embed/apache-tomcat-8.5.88-embed.tar.gz.asc

dev/tomcat/tomcat-8/v8.5.88/bin/embed/apache-tomcat-8.5.88-embed.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/embed/apache-tomcat-8.5.88-embed.zip   
(with props)
dev/tomcat/tomcat-8/v8.5.88/bin/embed/apache-tomcat-8.5.88-embed.zip.asc
dev/tomcat/tomcat-8/v8.5.88/bin/embed/apache-tomcat-8.5.88-embed.zip.sha512
dev/tomcat/tomcat-8/v8.5.88/bin/extras/
dev/tomcat/tomcat-8/v8.5.88/bin/extras/catalina-ws.jar   (with props)
dev/tomcat/tomcat-8/v8.5.88/bin/extras/catalina-ws.jar.asc
dev/tomcat/tomcat-8/v8.5.88/bin/extras/catalina-ws.jar.sha512
dev/tomcat/tomcat-8/v8.5.88/src/
dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz   (with 
props)
dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.asc
dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.tar.gz.sha512
dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.zip   (with props)
dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.zip.asc
dev/tomcat/tomcat-8/v8.5.88/src/apache-tomcat-8.5.88-src.zip.sha512

Added: dev/tomcat/tomcat-8/v8.5.88/KEYS
==
--- dev/tomcat/tomcat-8/v8.5.88/KEYS (added)
+++ dev/tomcat/tomcat-8/v8.5.88/KEYS Fri Apr 14 20:31:10 2023
@@ -0,0 +1,785 @@
+This file contains the PGP&GPG keys of various Apache developers.
+Please don't use them for email unless you have to. Their main
+purpose is code signing.
+
+Apache users: pgp < KEYS
+Apache developers:
+(pgpk -ll  && pgpk -xa ) >> this file.
+  or
+(gpg --fingerprint --list-sigs 
+ && gpg --armor --export ) >> this file.
+
+Apache developers: please ensure that your key is also available via the
+PGP keyservers (such as pgpkeys.mit.edu).
+
+
+Type Bits/KeyIDDate   User ID
+pub  2048/F22C4FED 2001/07/02 Andy Armstrong 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: PGPfreeware 7.0.3 for non-commercial use 
+
+mQGiBDtAWuURBADZ0KUEyUkSUiTA09e7tvEbX25STsjxrR+DNTainCls+XlkVOij
+gBv216lqge9tIsS0L6hCP4OQbFf/64qVtJssX4QXdyiZGb5wpmcj0Mz602Ew8r+N
+I0S5NvmogoYWW7BlP4r61jNxO5zrr03KaijM5r4ipJdLUxyOmM6P2jRPUwCg/5gm
+bpqiYl7pXX5FgDeB36tmD+UD/06iLqOnoiKO0vMbOk7URclhCObMNrHqxTxozMTS
+B9soYURbIeArei+plYo2n+1qB12ayybjhVu3uksXRdT9bEkyxMfslvLbIpDAG8Cz
+gNftTbKx/MVS7cQU0II8BKo2Akr+1FZah+sD4ovK8SfkMXUQUbTeefTntsAQKyyU
+9M9tA/9on9tBiHFl0qVJht6N4GiJ2G689v7rS2giLgKjetjiCduxBXEgvUSuyQID
+nF9ATrpXjITwsRlGKFmpZiFm5oCeCXihIVH0u6q066xNW2AXkLVoJ1l1Rs2Z0lsb
+0cq3xEAcwAmYLKQvCtgDV8CYgWKVmPi+49rSuQn7Lo9l02OUbLQgQW

[tomcat] branch 8.5.x updated: Increment version numbers for next release.

[schultz]

This is an automated email from the ASF dual-hosted git repository.

schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 88ee88b984 Increment version numbers for next release.
88ee88b984 is described below

commit 88ee88b9846e197e9ff2fa8e0776e2af19ee470a
Author: Christopher Schultz 
AuthorDate: Fri Apr 14 16:34:42 2023 -0400

Increment version numbers for next release.
---
 build.properties.default | 2 +-
 res/maven/mvn.properties.default | 2 +-
 webapps/docs/changelog.xml   | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 3f3134c001..edfd86ec70 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -31,7 +31,7 @@
 # - Version Control Flags -
 version.major=8
 version.minor=5
-version.build=88
+version.build=89
 version.patch=0
 version.suffix=
 version.dev=-dev
diff --git a/res/maven/mvn.properties.default b/res/maven/mvn.properties.default
index 098ef04204..326292d0fc 100644
--- a/res/maven/mvn.properties.default
+++ b/res/maven/mvn.properties.default
@@ -39,7 +39,7 @@ 
maven.asf.release.repo.url=https://repository.apache.org/service/local/staging/d
 maven.asf.release.repo.repositoryId=apache.releases.https
 
 # Release version info
-maven.asf.release.deploy.version=8.5.88
+maven.asf.release.deploy.version=8.5.89
 
 #Where do we load the libraries from
 tomcat.lib.path=../../output/build/lib
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 36bed45866..f5d33f1434 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -104,7 +104,9 @@
   They eventually become mixed with the numbered issues (i.e., numbered
   issues do not "pop up" wrt. others).
 -->
-
+
+
+
   
 
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[VOTE] Release Apache Tomcat 8.5.88

[Christopher Schultz]

The proposed Apache Tomcat 8.5.88 release is now available for voting.

The notable changes compared to 8.5.87 are:

- Reduce the default value of maxParameterCount from 10,000 to 1,000.

- Correct a regression in the fix for bug 66442 that meant that streams
  without a response body did not decrement the active stream count
  when completing, leading to
  ERR_HTTP2_SERVER_REFUSED_STREAM for some connections.

- Refactor synchronization blocks locking on SocketWrapper to use
  ReentrantLock to support users wishing to experiment with project
  Loom.

- Implement RFC 9239; note the MIME types for Javascript has changed
  to text/javascript.

Along with lots of other bug fixes and improvements.

For full details, see the changelog:
https://nightlies.apache.org/tomcat/tomcat-8.5.x/docs/changelog.html

It can be obtained from:
https://dist.apache.org/repos/dist/dev/tomcat/tomcat-8/v8.5.88/

The Maven staging repo is:
https://repository.apache.org/content/repositories/orgapachetomcat-1430

The tag is:
https://github.com/apache/tomcat/tree/8.5.88/


The proposed 8.5.88 release is:
[ ] Broken - do not release
[ ] Stable - go ahead and release as 8.5.88 (stable)

-
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