[tomcat] branch main updated: Add missing Javadoc

[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 d43edc0  Add missing Javadoc
d43edc0 is described below

commit d43edc0a49c762a4069686eaa4b1e53043bd3ff9
Author: Mark Thomas 
AuthorDate: Tue May 25 14:55:31 2021 +0100

Add missing Javadoc
---
 java/jakarta/el/ELContext.java | 2 ++
 java/jakarta/el/ELResolver.java| 1 +
 java/jakarta/el/ExpressionFactory.java | 1 +
 3 files changed, 4 insertions(+)

diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index d406a12..1c86b98 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -289,6 +289,8 @@ public abstract class ELContext {
 /**
  * Coerce the supplied object to the requested type.
  *
+ * @param   The type to which the object should be coerced
+ *
  * @param obj  The object to be coerced
  * @param type The type to which the object should be coerced
  *
diff --git a/java/jakarta/el/ELResolver.java b/java/jakarta/el/ELResolver.java
index 43479e8..14625f7 100644
--- a/java/jakarta/el/ELResolver.java
+++ b/java/jakarta/el/ELResolver.java
@@ -126,6 +126,7 @@ public abstract class ELResolver {
 /**
  * Converts the given object to the given type. This default implementation
  * always returns null.
+ * @param  The type to which the object should be converted
  *
  * @param context The EL context for this evaluation
  * @param obj The object to convert
diff --git a/java/jakarta/el/ExpressionFactory.java 
b/java/jakarta/el/ExpressionFactory.java
index 825386f..d9a83df 100644
--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
@@ -217,6 +217,7 @@ public abstract class ExpressionFactory {
 
 /**
  * Coerce the supplied object to the requested type.
+ * @param   The type to which the object should be coerced
  *
  * @param obj  The object to be coerced
  * @param expectedType The type to which the object should be coerced

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

[tomcat] branch main updated: Add first part of generics for EL 5.0 API

[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 a2a9e48  Add first part of generics for EL 5.0 API
a2a9e48 is described below

commit a2a9e48348173478a82e18b6119524ee1adb21f9
Author: Mark Thomas 
AuthorDate: Tue May 25 14:39:47 2021 +0100

Add first part of generics for EL 5.0 API

There are more generics changes to implement around ValueExpression but
I want to do some more research as I think the current EL 5.0 API might
need some additional generics to get the full benefit.
---
 java/jakarta/el/BeanELResolver.java|  2 +-
 java/jakarta/el/CompositeELResolver.java   |  4 +-
 java/jakarta/el/ELContext.java |  4 +-
 java/jakarta/el/ELResolver.java|  2 +-
 java/jakarta/el/ExpressionFactory.java |  2 +-
 java/jakarta/el/TypeConverter.java |  3 +-
 java/org/apache/el/ExpressionFactoryImpl.java  |  2 +-
 java/org/apache/el/lang/ELSupport.java | 45 +++---
 java/org/apache/el/lang/EvaluationContext.java |  2 +-
 .../apache/jasper/runtime/JspContextWrapper.java   |  5 ++-
 test/jakarta/el/TesterELResolverOne.java   |  6 ++-
 test/jakarta/el/TesterELResolverTwo.java   |  6 ++-
 12 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/java/jakarta/el/BeanELResolver.java 
b/java/jakarta/el/BeanELResolver.java
index 7525e06..8eed486 100644
--- a/java/jakarta/el/BeanELResolver.java
+++ b/java/jakarta/el/BeanELResolver.java
@@ -137,7 +137,7 @@ public class BeanELResolver extends ELResolver {
 
 ExpressionFactory factory = ELManager.getExpressionFactory();
 
-String methodName = (String) factory.coerceToType(method, 
String.class);
+String methodName = factory.coerceToType(method, String.class);
 
 // Find the matching method
 Method matchingMethod =
diff --git a/java/jakarta/el/CompositeELResolver.java 
b/java/jakarta/el/CompositeELResolver.java
index d144f2c..2ff04fa 100644
--- a/java/jakarta/el/CompositeELResolver.java
+++ b/java/jakarta/el/CompositeELResolver.java
@@ -151,11 +151,11 @@ public class CompositeELResolver extends ELResolver {
 }
 
 @Override
-public Object convertToType(ELContext context, Object obj, Class type) {
+public  T convertToType(ELContext context, Object obj, Class type) {
 context.setPropertyResolved(false);
 int sz = this.size;
 for (int i = 0; i < sz; i++) {
-Object result = this.resolvers[i].convertToType(context, obj, 
type);
+T result = this.resolvers[i].convertToType(context, obj, type);
 if (context.isPropertyResolved()) {
 return result;
 }
diff --git a/java/jakarta/el/ELContext.java b/java/jakarta/el/ELContext.java
index c58037a..d406a12 100644
--- a/java/jakarta/el/ELContext.java
+++ b/java/jakarta/el/ELContext.java
@@ -299,14 +299,14 @@ public abstract class ELContext {
  *
  * @since EL 3.0
  */
-public Object convertToType(Object obj, Class type) {
+public  T convertToType(Object obj, Class type) {
 
 boolean originalResolved = isPropertyResolved();
 setPropertyResolved(false);
 try {
 ELResolver resolver = getELResolver();
 if (resolver != null) {
-Object result = resolver.convertToType(this, obj, type);
+T result = resolver.convertToType(this, obj, type);
 if (isPropertyResolved()) {
 return result;
 }
diff --git a/java/jakarta/el/ELResolver.java b/java/jakarta/el/ELResolver.java
index 5c3a928..43479e8 100644
--- a/java/jakarta/el/ELResolver.java
+++ b/java/jakarta/el/ELResolver.java
@@ -135,7 +135,7 @@ public abstract class ELResolver {
  *
  * @since EL 3.0
  */
-public Object convertToType(ELContext context, Object obj, Class type) {
+public  T convertToType(ELContext context, Object obj, Class type) {
 context.setPropertyResolved(false);
 return null;
 }
diff --git a/java/jakarta/el/ExpressionFactory.java 
b/java/jakarta/el/ExpressionFactory.java
index 67b3556..825386f 100644
--- a/java/jakarta/el/ExpressionFactory.java
+++ b/java/jakarta/el/ExpressionFactory.java
@@ -226,7 +226,7 @@ public abstract class ExpressionFactory {
  * @throws ELException
  *  If the conversion fails
  */
-public abstract Object coerceToType(Object obj, Class expectedType);
+public abstract  T coerceToType(Object obj, Class expectedType);
 
 /**
  * @return This default implementation returns null
diff --git a/java/jakarta/el/TypeConverter.java 
b/java/jakarta/el/TypeConverter.java
index 8acfddc..abbae0e 100644
--- a/java/jakarta/el/TypeConverter.java
+++ 

[tomcat] branch main updated: Add the remaining generics for EL 5.0

[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 2a61a91  Add the remaining generics for EL 5.0
2a61a91 is described below

commit 2a61a91f7efb4eb278880dc21b9bf9a1b06b2e07
Author: Mark Thomas 
AuthorDate: Tue May 25 15:11:00 2021 +0100

Add the remaining generics for EL 5.0
---
 java/jakarta/el/ELProcessor.java  |  2 +-
 java/jakarta/el/ValueExpression.java  |  4 ++-
 java/org/apache/el/ValueExpressionImpl.java   |  5 +--
 java/org/apache/el/ValueExpressionLiteral.java|  5 +--
 java/org/apache/jasper/el/JspValueExpression.java | 40 ---
 webapps/docs/changelog.xml|  4 +++
 6 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/java/jakarta/el/ELProcessor.java b/java/jakarta/el/ELProcessor.java
index 7abf7fc..98ff6a3 100644
--- a/java/jakarta/el/ELProcessor.java
+++ b/java/jakarta/el/ELProcessor.java
@@ -55,7 +55,7 @@ public class ELProcessor {
 }
 
 
-public Object getValue(String expression, Class expectedType) {
+public  T getValue(String expression, Class expectedType) {
 ValueExpression ve = factory.createValueExpression(
 context, bracket(expression), expectedType);
 return ve.getValue(context);
diff --git a/java/jakarta/el/ValueExpression.java 
b/java/jakarta/el/ValueExpression.java
index 528f7c2..cbaba0c 100644
--- a/java/jakarta/el/ValueExpression.java
+++ b/java/jakarta/el/ValueExpression.java
@@ -21,6 +21,8 @@ public abstract class ValueExpression extends Expression {
 private static final long serialVersionUID = 8577809572381654673L;
 
 /**
+ * @param  The expected type for the result of evaluating this value
+ *expression
  * @param context The EL context for this evaluation
  *
  * @return The result of evaluating this value expression
@@ -34,7 +36,7 @@ public abstract class ValueExpression extends Expression {
  *  Wraps any exception throw whilst resolving a property or
  *  variable
  */
-public abstract Object getValue(ELContext context);
+public abstract  T getValue(ELContext context);
 
 /**
  * @param context The EL context for this evaluation
diff --git a/java/org/apache/el/ValueExpressionImpl.java 
b/java/org/apache/el/ValueExpressionImpl.java
index 91b3e1d..e4c434e 100644
--- a/java/org/apache/el/ValueExpressionImpl.java
+++ b/java/org/apache/el/ValueExpressionImpl.java
@@ -181,8 +181,9 @@ public final class ValueExpressionImpl extends 
ValueExpression implements
  *
  * @see jakarta.el.ValueExpression#getValue(jakarta.el.ELContext)
  */
+@SuppressWarnings("unchecked")
 @Override
-public Object getValue(ELContext context) throws PropertyNotFoundException,
+public  T getValue(ELContext context) throws PropertyNotFoundException,
 ELException {
 EvaluationContext ctx = new EvaluationContext(context, this.fnMapper,
 this.varMapper);
@@ -192,7 +193,7 @@ public final class ValueExpressionImpl extends 
ValueExpression implements
 value = context.convertToType(value, this.expectedType);
 }
 context.notifyAfterEvaluation(getExpressionString());
-return value;
+return (T) value;
 }
 
 /*
diff --git a/java/org/apache/el/ValueExpressionLiteral.java 
b/java/org/apache/el/ValueExpressionLiteral.java
index ca87e15..2ecfe8d 100644
--- a/java/org/apache/el/ValueExpressionLiteral.java
+++ b/java/org/apache/el/ValueExpressionLiteral.java
@@ -48,8 +48,9 @@ public final class ValueExpressionLiteral extends 
ValueExpression implements
 this.expectedType = expectedType;
 }
 
+@SuppressWarnings("unchecked")
 @Override
-public Object getValue(ELContext context) {
+public  T getValue(ELContext context) {
 context.notifyBeforeEvaluation(getExpressionString());
 Object result;
 if (this.expectedType != null) {
@@ -58,7 +59,7 @@ public final class ValueExpressionLiteral extends 
ValueExpression implements
 result = this.value;
 }
 context.notifyAfterEvaluation(getExpressionString());
-return result;
+return (T) result;
 }
 
 @Override
diff --git a/java/org/apache/jasper/el/JspValueExpression.java 
b/java/org/apache/jasper/el/JspValueExpression.java
index 9fbea5f..64f6ccd 100644
--- a/java/org/apache/jasper/el/JspValueExpression.java
+++ b/java/org/apache/jasper/el/JspValueExpression.java
@@ -62,10 +62,14 @@ public final class JspValueExpression extends 
ValueExpression implements
 context.notifyAfterEvaluation(getExpressionString());
 return result;
 } catch (PropertyNotFoundException e) {
-if (e instanceof 

[tomcat] branch 8.5.x updated: Code clean-up. Add braces for clarity.

[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 ded4135  Code clean-up. Add braces for clarity.
ded4135 is described below

commit ded413563add3046f8d56be5bac8d910d2c1140f
Author: Mark Thomas 
AuthorDate: Tue May 25 09:15:13 2021 +0100

Code clean-up. Add braces for clarity.
---
 .../apache/catalina/core/ApplicationContext.java   |  22 +-
 .../catalina/core/ApplicationFilterChain.java  |  15 +-
 .../catalina/core/ApplicationFilterConfig.java |   6 +-
 .../catalina/core/ApplicationFilterFactory.java|  27 ++-
 .../catalina/core/ApplicationHttpRequest.java  |  27 ++-
 .../catalina/core/ApplicationHttpResponse.java |  54 +++--
 .../apache/catalina/core/ApplicationRequest.java   |   9 +-
 .../apache/catalina/core/ApplicationResponse.java  |  18 +-
 .../org/apache/catalina/core/AsyncContextImpl.java |   4 +-
 java/org/apache/catalina/core/ContainerBase.java   |  42 ++--
 .../catalina/core/NamingContextListener.java   |  28 ++-
 java/org/apache/catalina/core/StandardContext.java | 245 ++---
 java/org/apache/catalina/core/StandardEngine.java  |  18 +-
 java/org/apache/catalina/core/StandardHost.java|  18 +-
 .../org/apache/catalina/core/StandardPipeline.java |  22 +-
 java/org/apache/catalina/core/StandardServer.java  |  15 +-
 java/org/apache/catalina/core/StandardService.java |  18 +-
 .../catalina/core/StandardThreadExecutor.java  |   3 +-
 java/org/apache/catalina/core/StandardWrapper.java |  54 +++--
 .../apache/catalina/core/StandardWrapperValve.java |  12 +-
 .../core/ThreadLocalLeakPreventionListener.java|   4 +-
 java/org/apache/catalina/ha/ClusterListener.java   |  13 +-
 .../apache/catalina/ha/backend/CollectedInfo.java  |   9 +-
 .../catalina/ha/backend/HeartbeatListener.java |   5 +-
 .../catalina/ha/backend/MultiCastSender.java   |   3 +-
 java/org/apache/catalina/ha/backend/TcpSender.java |   7 +-
 .../catalina/ha/context/ReplicatedContext.java |  14 +-
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |  79 ---
 .../catalina/ha/deploy/FileMessageFactory.java |  15 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |  18 +-
 .../apache/catalina/ha/session/BackupManager.java  |  15 +-
 .../catalina/ha/session/ClusterManagerBase.java|  14 +-
 .../ha/session/ClusterSessionListener.java |  10 +-
 .../apache/catalina/ha/session/DeltaManager.java   |  49 +++--
 .../apache/catalina/ha/session/DeltaRequest.java   |  44 ++--
 .../apache/catalina/ha/session/DeltaSession.java   |  45 ++--
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |  82 +--
 37 files changed, 736 insertions(+), 347 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 4511e87..91d7ffe 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -345,14 +345,17 @@ public class ApplicationContext implements ServletContext 
{
 @Override
 public String getMimeType(String file) {
 
-if (file == null)
+if (file == null) {
 return null;
+}
 int period = file.lastIndexOf('.');
-if (period < 0)
+if (period < 0) {
 return null;
+}
 String extension = file.substring(period + 1);
-if (extension.length() < 1)
+if (extension.length() < 1) {
 return null;
+}
 return context.findMimeMapping(extension);
 
 }
@@ -368,13 +371,15 @@ public class ApplicationContext implements ServletContext 
{
 public RequestDispatcher getNamedDispatcher(String name) {
 
 // Validate the name argument
-if (name == null)
+if (name == null) {
 return null;
+}
 
 // Create and return a corresponding request dispatcher
 Wrapper wrapper = (Wrapper) context.findChild(name);
-if (wrapper == null)
+if (wrapper == null) {
 return null;
+}
 
 return new ApplicationDispatcher(wrapper, null, null, null, null, 
null, name);
 
@@ -1148,7 +1153,9 @@ public class ApplicationContext implements ServletContext 
{
 match = true;
 }
 
-if (match) return;
+if (match) {
+return;
+}
 
 if (t instanceof ServletContextListener) {
 throw new IllegalArgumentException(sm.getString(
@@ -1377,8 +1384,9 @@ public class ApplicationContext implements ServletContext 
{
  */
 void setAttributeReadOnly(String name) {
 
-if (attributes.containsKey(name))
+if (attributes.containsKey(name)) {
 readOnlyAttributes.put(name, name);
+}
 
 }
 
diff --git 

buildbot failure in on tomcat-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-trunk while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/5853

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch main] a2a9e48348173478a82e18b6119524ee1adb21f9
Blamelist: Mark Thomas 

BUILD FAILED: failed compile

Sincerely,
 -The Buildbot




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

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

[Michael Osipov]

Am 2021-05-24 um 20:55 schrieb Mark Thomas:

On 24/05/2021 18:43, Rémy Maucherat wrote:

On Mon, May 24, 2021 at 6:34 PM  wrote:


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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
  new 620e06c  Remove code deprecated in 10.1.x apart from the APR
Endpoint
620e06c is described below

commit 620e06c468a02ca98dc4beacf556dd12d2440877
Author: Mark Thomas 
AuthorDate: Mon May 24 17:34:09 2021 +0100

 Remove code deprecated in 10.1.x apart from the APR Endpoint


Ah, it's *that* APR time again :)


Indeed. My plan was to give it a few days now folks have been reminded 
that this is going to happen and then do the APR removal in a separate 
commit.


I have an important fix for APR on Windows which affects also Tomcat as 
well. A very subtile one. Can you hold off for a moment? I will prepare 
a decent decription for dev@tomcat.a.o today and already have a suitable 
fix for it.


Michael


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

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

[Mark Thomas]

On 25/05/2021 08:27, Michael Osipov wrote:

Am 2021-05-24 um 20:55 schrieb Mark Thomas:

On 24/05/2021 18:43, Rémy Maucherat wrote:

On Mon, May 24, 2021 at 6:34 PM  wrote:


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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
  new 620e06c  Remove code deprecated in 10.1.x apart from the APR
Endpoint
620e06c is described below

commit 620e06c468a02ca98dc4beacf556dd12d2440877
Author: Mark Thomas 
AuthorDate: Mon May 24 17:34:09 2021 +0100

 Remove code deprecated in 10.1.x apart from the APR Endpoint


Ah, it's *that* APR time again :)


Indeed. My plan was to give it a few days now folks have been reminded 
that this is going to happen and then do the APR removal in a separate 
commit.


I have an important fix for APR on Windows which affects also Tomcat as 
well. A very subtile one. Can you hold off for a moment? I will prepare 
a decent decription for dev@tomcat.a.o today and already have a suitable 
fix for it.


What is the benefit of holding off on the removal of the APR endpoint 
from 10.1.x?


Mark

-
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: Code clean-up. Add braces for clarity.

[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 6ddcb00  Code clean-up. Add braces for clarity.
6ddcb00 is described below

commit 6ddcb0081a00c2cdacc5a905fbb35922e2b2ad53
Author: Mark Thomas 
AuthorDate: Tue May 25 09:15:13 2021 +0100

Code clean-up. Add braces for clarity.
---
 .../apache/catalina/core/ApplicationContext.java   |  22 +-
 .../catalina/core/ApplicationFilterChain.java  |  15 +-
 .../catalina/core/ApplicationFilterConfig.java |   6 +-
 .../catalina/core/ApplicationFilterFactory.java|  27 ++-
 .../catalina/core/ApplicationHttpRequest.java  |  27 ++-
 .../catalina/core/ApplicationHttpResponse.java |  54 +++--
 .../apache/catalina/core/ApplicationRequest.java   |   9 +-
 .../apache/catalina/core/ApplicationResponse.java  |  18 +-
 .../org/apache/catalina/core/AsyncContextImpl.java |   4 +-
 java/org/apache/catalina/core/ContainerBase.java   |  42 ++--
 .../catalina/core/NamingContextListener.java   |  28 ++-
 java/org/apache/catalina/core/StandardContext.java | 245 ++---
 java/org/apache/catalina/core/StandardEngine.java  |  18 +-
 java/org/apache/catalina/core/StandardHost.java|  18 +-
 .../org/apache/catalina/core/StandardPipeline.java |  22 +-
 java/org/apache/catalina/core/StandardServer.java  |  15 +-
 java/org/apache/catalina/core/StandardService.java |  18 +-
 .../catalina/core/StandardThreadExecutor.java  |   3 +-
 java/org/apache/catalina/core/StandardWrapper.java |  54 +++--
 .../apache/catalina/core/StandardWrapperValve.java |  12 +-
 .../core/ThreadLocalLeakPreventionListener.java|   4 +-
 java/org/apache/catalina/ha/ClusterListener.java   |  13 +-
 .../apache/catalina/ha/backend/CollectedInfo.java  |  11 +-
 .../catalina/ha/backend/HeartbeatListener.java |   5 +-
 .../catalina/ha/backend/MultiCastSender.java   |   3 +-
 java/org/apache/catalina/ha/backend/TcpSender.java |   7 +-
 .../catalina/ha/context/ReplicatedContext.java |  14 +-
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |  79 ---
 .../catalina/ha/deploy/FileMessageFactory.java |  15 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |  18 +-
 .../apache/catalina/ha/session/BackupManager.java  |  15 +-
 .../catalina/ha/session/ClusterManagerBase.java|  14 +-
 .../ha/session/ClusterSessionListener.java |  10 +-
 .../apache/catalina/ha/session/DeltaManager.java   |  45 ++--
 .../apache/catalina/ha/session/DeltaRequest.java   |  44 ++--
 .../apache/catalina/ha/session/DeltaSession.java   |  45 ++--
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |  82 +--
 37 files changed, 734 insertions(+), 347 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 697b956..9ec829a 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -345,14 +345,17 @@ public class ApplicationContext implements ServletContext 
{
 @Override
 public String getMimeType(String file) {
 
-if (file == null)
+if (file == null) {
 return null;
+}
 int period = file.lastIndexOf('.');
-if (period < 0)
+if (period < 0) {
 return null;
+}
 String extension = file.substring(period + 1);
-if (extension.length() < 1)
+if (extension.length() < 1) {
 return null;
+}
 return context.findMimeMapping(extension);
 
 }
@@ -368,13 +371,15 @@ public class ApplicationContext implements ServletContext 
{
 public RequestDispatcher getNamedDispatcher(String name) {
 
 // Validate the name argument
-if (name == null)
+if (name == null) {
 return null;
+}
 
 // Create and return a corresponding request dispatcher
 Wrapper wrapper = (Wrapper) context.findChild(name);
-if (wrapper == null)
+if (wrapper == null) {
 return null;
+}
 
 return new ApplicationDispatcher(wrapper, null, null, null, null, 
null, name);
 
@@ -1149,7 +1154,9 @@ public class ApplicationContext implements ServletContext 
{
 match = true;
 }
 
-if (match) return;
+if (match) {
+return;
+}
 
 if (t instanceof ServletContextListener) {
 throw new IllegalArgumentException(sm.getString(
@@ -1384,8 +1391,9 @@ public class ApplicationContext implements ServletContext 
{
  */
 void setAttributeReadOnly(String name) {
 
-if (attributes.containsKey(name))
+if (attributes.containsKey(name)) {
 readOnlyAttributes.put(name, name);
+}
 
 }
 
diff --git 

[tomcat] branch main updated: Code clean-up. Add braces for clarity.

[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 513a158  Code clean-up. Add braces for clarity.
513a158 is described below

commit 513a158ee793b52cc1c0fac7780423760818b631
Author: Mark Thomas 
AuthorDate: Tue May 25 09:15:13 2021 +0100

Code clean-up. Add braces for clarity.
---
 .../apache/catalina/core/ApplicationContext.java   |  22 +-
 .../catalina/core/ApplicationFilterChain.java  |  15 +-
 .../catalina/core/ApplicationFilterConfig.java |   6 +-
 .../catalina/core/ApplicationFilterFactory.java|  27 ++-
 .../catalina/core/ApplicationHttpRequest.java  |  27 ++-
 .../catalina/core/ApplicationHttpResponse.java |  54 +++--
 .../apache/catalina/core/ApplicationRequest.java   |   9 +-
 .../apache/catalina/core/ApplicationResponse.java  |  18 +-
 .../org/apache/catalina/core/AsyncContextImpl.java |   4 +-
 java/org/apache/catalina/core/ContainerBase.java   |  42 ++--
 .../catalina/core/NamingContextListener.java   |  28 ++-
 java/org/apache/catalina/core/StandardContext.java | 245 ++---
 java/org/apache/catalina/core/StandardEngine.java  |  18 +-
 java/org/apache/catalina/core/StandardHost.java|  18 +-
 .../org/apache/catalina/core/StandardPipeline.java |  22 +-
 java/org/apache/catalina/core/StandardServer.java  |  15 +-
 java/org/apache/catalina/core/StandardService.java |  18 +-
 .../catalina/core/StandardThreadExecutor.java  |   3 +-
 java/org/apache/catalina/core/StandardWrapper.java |  54 +++--
 .../apache/catalina/core/StandardWrapperValve.java |  12 +-
 .../core/ThreadLocalLeakPreventionListener.java|   4 +-
 java/org/apache/catalina/ha/ClusterListener.java   |  13 +-
 .../apache/catalina/ha/backend/CollectedInfo.java  |  11 +-
 .../catalina/ha/backend/HeartbeatListener.java |   5 +-
 .../catalina/ha/backend/MultiCastSender.java   |   3 +-
 java/org/apache/catalina/ha/backend/TcpSender.java |   7 +-
 .../catalina/ha/context/ReplicatedContext.java |  14 +-
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |  79 ---
 .../catalina/ha/deploy/FileMessageFactory.java |  15 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |  18 +-
 .../apache/catalina/ha/session/BackupManager.java  |  15 +-
 .../catalina/ha/session/ClusterManagerBase.java|  14 +-
 .../ha/session/ClusterSessionListener.java |  10 +-
 .../apache/catalina/ha/session/DeltaManager.java   |  45 ++--
 .../apache/catalina/ha/session/DeltaRequest.java   |  44 ++--
 .../apache/catalina/ha/session/DeltaSession.java   |  45 ++--
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |  82 +--
 37 files changed, 734 insertions(+), 347 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 5085f91..3eebb1e 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -330,14 +330,17 @@ public class ApplicationContext implements ServletContext 
{
 @Override
 public String getMimeType(String file) {
 
-if (file == null)
+if (file == null) {
 return null;
+}
 int period = file.lastIndexOf('.');
-if (period < 0)
+if (period < 0) {
 return null;
+}
 String extension = file.substring(period + 1);
-if (extension.length() < 1)
+if (extension.length() < 1) {
 return null;
+}
 return context.findMimeMapping(extension);
 
 }
@@ -353,13 +356,15 @@ public class ApplicationContext implements ServletContext 
{
 public RequestDispatcher getNamedDispatcher(String name) {
 
 // Validate the name argument
-if (name == null)
+if (name == null) {
 return null;
+}
 
 // Create and return a corresponding request dispatcher
 Wrapper wrapper = (Wrapper) context.findChild(name);
-if (wrapper == null)
+if (wrapper == null) {
 return null;
+}
 
 return new ApplicationDispatcher(wrapper, null, null, null, null, 
null, name);
 
@@ -1134,7 +1139,9 @@ public class ApplicationContext implements ServletContext 
{
 match = true;
 }
 
-if (match) return;
+if (match) {
+return;
+}
 
 if (t instanceof ServletContextListener) {
 throw new IllegalArgumentException(sm.getString(
@@ -1369,8 +1376,9 @@ public class ApplicationContext implements ServletContext 
{
  */
 void setAttributeReadOnly(String name) {
 
-if (attributes.containsKey(name))
+if (attributes.containsKey(name)) {
 readOnlyAttributes.put(name, name);
+}
 
 }
 
diff --git 

[tomcat] branch 10.0.x updated: Code clean-up. Add braces for clarity.

[markt]

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 5719527  Code clean-up. Add braces for clarity.
5719527 is described below

commit 57195275fa2f0bd4fafdcc8d582931f47a111336
Author: Mark Thomas 
AuthorDate: Tue May 25 09:15:13 2021 +0100

Code clean-up. Add braces for clarity.
---
 .../apache/catalina/core/ApplicationContext.java   |  22 +-
 .../catalina/core/ApplicationFilterChain.java  |  15 +-
 .../catalina/core/ApplicationFilterConfig.java |   6 +-
 .../catalina/core/ApplicationFilterFactory.java|  27 ++-
 .../catalina/core/ApplicationHttpRequest.java  |  27 ++-
 .../catalina/core/ApplicationHttpResponse.java |  54 +++--
 .../apache/catalina/core/ApplicationRequest.java   |   9 +-
 .../apache/catalina/core/ApplicationResponse.java  |  18 +-
 .../org/apache/catalina/core/AsyncContextImpl.java |   4 +-
 java/org/apache/catalina/core/ContainerBase.java   |  42 ++--
 .../catalina/core/NamingContextListener.java   |  28 ++-
 java/org/apache/catalina/core/StandardContext.java | 245 ++---
 java/org/apache/catalina/core/StandardEngine.java  |  18 +-
 java/org/apache/catalina/core/StandardHost.java|  18 +-
 .../org/apache/catalina/core/StandardPipeline.java |  22 +-
 java/org/apache/catalina/core/StandardServer.java  |  15 +-
 java/org/apache/catalina/core/StandardService.java |  18 +-
 .../catalina/core/StandardThreadExecutor.java  |   3 +-
 java/org/apache/catalina/core/StandardWrapper.java |  54 +++--
 .../apache/catalina/core/StandardWrapperValve.java |  12 +-
 .../core/ThreadLocalLeakPreventionListener.java|   4 +-
 java/org/apache/catalina/ha/ClusterListener.java   |  13 +-
 .../apache/catalina/ha/backend/CollectedInfo.java  |  11 +-
 .../catalina/ha/backend/HeartbeatListener.java |   5 +-
 .../catalina/ha/backend/MultiCastSender.java   |   3 +-
 java/org/apache/catalina/ha/backend/TcpSender.java |   7 +-
 .../catalina/ha/context/ReplicatedContext.java |  14 +-
 .../apache/catalina/ha/deploy/FarmWarDeployer.java |  79 ---
 .../catalina/ha/deploy/FileMessageFactory.java |  15 +-
 java/org/apache/catalina/ha/deploy/WarWatcher.java |  18 +-
 .../apache/catalina/ha/session/BackupManager.java  |  15 +-
 .../catalina/ha/session/ClusterManagerBase.java|  14 +-
 .../ha/session/ClusterSessionListener.java |  10 +-
 .../apache/catalina/ha/session/DeltaManager.java   |  45 ++--
 .../apache/catalina/ha/session/DeltaRequest.java   |  44 ++--
 .../apache/catalina/ha/session/DeltaSession.java   |  45 ++--
 .../apache/catalina/ha/tcp/SimpleTcpCluster.java   |  82 +--
 37 files changed, 734 insertions(+), 347 deletions(-)

diff --git a/java/org/apache/catalina/core/ApplicationContext.java 
b/java/org/apache/catalina/core/ApplicationContext.java
index 5085f91..3eebb1e 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -330,14 +330,17 @@ public class ApplicationContext implements ServletContext 
{
 @Override
 public String getMimeType(String file) {
 
-if (file == null)
+if (file == null) {
 return null;
+}
 int period = file.lastIndexOf('.');
-if (period < 0)
+if (period < 0) {
 return null;
+}
 String extension = file.substring(period + 1);
-if (extension.length() < 1)
+if (extension.length() < 1) {
 return null;
+}
 return context.findMimeMapping(extension);
 
 }
@@ -353,13 +356,15 @@ public class ApplicationContext implements ServletContext 
{
 public RequestDispatcher getNamedDispatcher(String name) {
 
 // Validate the name argument
-if (name == null)
+if (name == null) {
 return null;
+}
 
 // Create and return a corresponding request dispatcher
 Wrapper wrapper = (Wrapper) context.findChild(name);
-if (wrapper == null)
+if (wrapper == null) {
 return null;
+}
 
 return new ApplicationDispatcher(wrapper, null, null, null, null, 
null, name);
 
@@ -1134,7 +1139,9 @@ public class ApplicationContext implements ServletContext 
{
 match = true;
 }
 
-if (match) return;
+if (match) {
+return;
+}
 
 if (t instanceof ServletContextListener) {
 throw new IllegalArgumentException(sm.getString(
@@ -1369,8 +1376,9 @@ public class ApplicationContext implements ServletContext 
{
  */
 void setAttributeReadOnly(String name) {
 
-if (attributes.containsKey(name))
+if (attributes.containsKey(name)) {
 readOnlyAttributes.put(name, name);
+}
 
 }
 
diff --git 

svn commit: r1890187 - in /tomcat/site/trunk: docs/ci.html docs/whichversion.html xdocs/ci.xml xdocs/whichversion.xml

[markt]

Author: markt
Date: Tue May 25 08:29:28 2021
New Revision: 1890187

URL: http://svn.apache.org/viewvc?rev=1890187=rev
Log:
Update CI and version pages for 10.1.x and fix previous copy/paste 
errors/omissions

Modified:
tomcat/site/trunk/docs/ci.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/ci.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/ci.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ci.html?rev=1890187=1890186=1890187=diff
==
--- tomcat/site/trunk/docs/ci.html (original)
+++ tomcat/site/trunk/docs/ci.html Tue May 25 08:29:28 2021
@@ -61,12 +61,31 @@ prepared and published by ASF Buildbot,
   
 
 
+  tomcat-10.0.x
+  
+
+  Source path: https://github.com/apache/tomcat/tree/10.0.x;>https://github.com/apache/tomcat/tree/10.0.x
+  https://ci.apache.org/builders/tomcat-10.0.x;>Build status 
page for tomcat-10.0.xThis builder is triggered after 
each commit. It does a release build and runs tests (using multiple parallel 
threads).
+  https://ci.apache.org/builders/tomcat-10.0.x-periodic;>Build status 
page for tomcat-10.0.x-periodicThis builder is 
triggered once a day. It runs tests serially and generates a coverage 
report.
+  https://ci.apache.org/projects/tomcat/tomcat-10.0.x/; 
rel="nofollow">Published files:
+
+  http://ci.apache.org/projects/tomcat/tomcat-10.0.x/docs/index.html; 
rel="nofollow">Documentation
+  http://ci.apache.org/projects/tomcat/tomcat-10.0.x/logs/; 
rel="nofollow">JUnit logs
+   by revision number. The recent ones are at the bottom.
+  http://ci.apache.org/projects/tomcat/tomcat-10.0.x/coverage/; 
rel="nofollow">Coverage report
+  http://ci.apache.org/projects/tomcat/tomcat-10.0.x/rat-output.html; 
rel="nofollow">RAT report
+
+  
+
+  
+
+
   tomcat-9-trunk
   
 
   Source path: https://github.com/apache/tomcat/tree/9.0.x;>https://github.com/apache/tomcat/tree/9.0.x
-  https://ci.apache.org/builders/tomcat-9-trunk;>Build status 
page for tomcat-trunkThis builder is triggered after 
each commit. It does a release build and runs tests (using multiple parallel 
threads).
-  https://ci.apache.org/builders/tomcat-9-periodic;>Build 
status page for tomcat-trunk-periodicThis builder is 
triggered once a day. It runs tests serially and generates a coverage 
report.
+  https://ci.apache.org/builders/tomcat-9-trunk;>Build status 
page for tomcat-9-trunkThis builder is triggered after 
each commit. It does a release build and runs tests (using multiple parallel 
threads).
+  https://ci.apache.org/builders/tomcat-9-periodic;>Build 
status page for tomcat-9-trunk-periodicThis builder is 
triggered once a day. It runs tests serially and generates a coverage 
report.
   https://ci.apache.org/projects/tomcat/tomcat9/; 
rel="nofollow">Published files:
 
   http://ci.apache.org/projects/tomcat/tomcat9/docs/index.html; 
rel="nofollow">Documentation

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1890187=1890186=1890187=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Tue May 25 08:29:28 2021
@@ -24,6 +24,17 @@ specifications and the respective Ap
 
 
 
+  5.1
+  TBD
+  TBD
+  TBD
+  TBD
+  10.1.x
+  None
+  8 and later
+
+
+
   5.0
   3.0
   4.0
@@ -188,23 +199,32 @@ a number of relatively minor bugs. Beta
 minor bugs. Stable releases are intended for production use and are expected to
 run stably for extended periods of time.
 
-Apache Tomcat 10.x
+Apache Tomcat 10.1.x
+
+Apache Tomcat 10.1.x is the current focus of development. 
It
+builds on Tomcat 10.0.x and implements the Servlet
+5.1, JSP TBD, EL TBD, 
WebSocket TBD
+ and Authentication TBD specifications (the versions 
required by
+Jakarta EE 10 platform).
+
+
+Apache Tomcat 10.0.x
 
-Apache Tomcat 10.x is the current focus of development. It
-builds on Tomcat 9.0.x and implements the Servlet
-5.0, JSP 3.0, EL 4.0, 
WebSocket 2.0
- and Authentication 2.0 specifications (the versions 
required by
+Apache Tomcat 10.0.x builds on Tomcat 9.0.x and implements
+the Servlet 5.0, JSP 3.0,
+EL 4.0, WebSocket 2.0 and
+Authentication 2.0 specifications (the versions required by
 Jakarta EE 9 platform).
 
 
 Apache Tomcat 9.x
 
-Apache Tomcat 9.x is the current focus of development. It
-builds on Tomcat 8.0.x and 8.5.x and implements the Servlet
-4.0, JSP 2.3, EL 3.0, 
WebSocket 1.1
- and JASPIC 1.1 specifications (the versions 
required by
-Java EE 8 platform). In addition to this, it includes
-the following significant improvements:
+Apache Tomcat 9.x builds on Tomcat 8.0.x and 8.5.x and
+implements the Servlet 4.0, JSP 2.3,
+EL 3.0, WebSocket 1.1 

Buildbot renaming

[Mark Thomas]

All,

Looking ahead to when we will have a 9.10.x branch, the naming of the 
builds and output directories in buildbot isn't ideal. I'd like to move 
everything over to the n.n.x naming convention. That would mean the 
following changes:


tomcat-trunk-> tomcat-10.1.x
outputs to
tomcat10-> tomcat-10.1.x

tomcat-9-trunk  -> tomcat-9.0.x
outputs to
tomcat9 -> tomcat-9.0.x

tomcat-85-trunk -> tomcat-8.5.x
outputs to
tomcat85-> tomcat-8.5.x

tomcat-7-trunk  -> tomcat-7.0.x
outputs to
tomcat7 -> tomcat-7.0.x

Changing the builder name means the build counter will restart at 0.
We can retain the old output directories until we have a reasonable 
history of builds in the new locations. I've been periodically cleaning 
out old builds and keeping ~100 old ones and no-one has noticed - well, 
no-one has complained ;) - so removing the old dirs once we have ~100 
builds in the new locations seems reasonable.


Thoughts?

Mark

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

buildbot failure in on tomcat-85-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2742

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] ded413563add3046f8d56be5bac8d910d2c1140f
Blamelist: Mark Thomas 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




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

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

[Mark Thomas]

On 25/05/2021 09:03, Michael Osipov wrote:

Am 2021-05-25 um 09:44 schrieb Mark Thomas:

On 25/05/2021 08:27, Michael Osipov wrote:

Am 2021-05-24 um 20:55 schrieb Mark Thomas:

On 24/05/2021 18:43, Rémy Maucherat wrote:

On Mon, May 24, 2021 at 6:34 PM  wrote:


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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
  new 620e06c  Remove code deprecated in 10.1.x apart from the 
APR

Endpoint
620e06c is described below

commit 620e06c468a02ca98dc4beacf556dd12d2440877
Author: Mark Thomas 
AuthorDate: Mon May 24 17:34:09 2021 +0100

 Remove code deprecated in 10.1.x apart from the APR Endpoint


Ah, it's *that* APR time again :)


Indeed. My plan was to give it a few days now folks have been 
reminded that this is going to happen and then do the APR removal in 
a separate commit.


I have an important fix for APR on Windows which affects also Tomcat 
as well. A very subtile one. Can you hold off for a moment? I will 
prepare a decent decription for dev@tomcat.a.o today and already have 
a suitable fix for it.


What is the benefit of holding off on the removal of the APR endpoint 
from 10.1.x?


Just for clarification, 10.x on main will move to 10.1.x and APR will 
only run on 9 and 8.5?


Correct.

10.1.x will continue to support the use of the Tomcat Native Connector 
(i.e. the native library) to provide OpenSSL support for NIO and NIO2. 
The plan is that version 2 of that library will be significantly reduced 
in scope to only provide the functionality necessary to hook into OpenSSL.


Mark

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

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

[Michael Osipov]

Am 2021-05-25 um 10:06 schrieb Mark Thomas:

On 25/05/2021 09:03, Michael Osipov wrote:

Am 2021-05-25 um 09:44 schrieb Mark Thomas:

On 25/05/2021 08:27, Michael Osipov wrote:

Am 2021-05-24 um 20:55 schrieb Mark Thomas:

On 24/05/2021 18:43, Rémy Maucherat wrote:

On Mon, May 24, 2021 at 6:34 PM  wrote:


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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
  new 620e06c  Remove code deprecated in 10.1.x apart from 
the APR

Endpoint
620e06c is described below

commit 620e06c468a02ca98dc4beacf556dd12d2440877
Author: Mark Thomas 
AuthorDate: Mon May 24 17:34:09 2021 +0100

 Remove code deprecated in 10.1.x apart from the APR Endpoint


Ah, it's *that* APR time again :)


Indeed. My plan was to give it a few days now folks have been 
reminded that this is going to happen and then do the APR removal 
in a separate commit.


I have an important fix for APR on Windows which affects also Tomcat 
as well. A very subtile one. Can you hold off for a moment? I will 
prepare a decent decription for dev@tomcat.a.o today and already 
have a suitable fix for it.


What is the benefit of holding off on the removal of the APR endpoint 
from 10.1.x?


Just for clarification, 10.x on main will move to 10.1.x and APR will 
only run on 9 and 8.5?


Correct.

10.1.x will continue to support the use of the Tomcat Native Connector 
(i.e. the native library) to provide OpenSSL support for NIO and NIO2. 
The plan is that version 2 of that library will be significantly reduced 
in scope to only provide the functionality necessary to hook into OpenSSL.


Alright, please decide yourself whether this should go into 10.x [1] for 
those who want branch off/retain APR here. Otherwise I will provide a 
polished patch for < 10.


Michael

[1] 
https://github.com/michael-o/tomcat/commit/5393bcb991b924a18169ba34264ec2bc5c009b22



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

Re: Buildbot renaming

[Rémy Maucherat]

On Tue, May 25, 2021 at 11:33 AM Mark Thomas  wrote:

> All,
>
> Looking ahead to when we will have a 9.10.x branch, the naming of the
> builds and output directories in buildbot isn't ideal. I'd like to move
> everything over to the n.n.x naming convention. That would mean the
> following changes:
>
> tomcat-trunk-> tomcat-10.1.x
> outputs to
> tomcat10-> tomcat-10.1.x
>
> tomcat-9-trunk  -> tomcat-9.0.x
> outputs to
> tomcat9 -> tomcat-9.0.x
>
> tomcat-85-trunk -> tomcat-8.5.x
> outputs to
> tomcat85-> tomcat-8.5.x
>
> tomcat-7-trunk  -> tomcat-7.0.x
> outputs to
> tomcat7 -> tomcat-7.0.x
>
> Changing the builder name means the build counter will restart at 0.
> We can retain the old output directories until we have a reasonable
> history of builds in the new locations. I've been periodically cleaning
> out old builds and keeping ~100 old ones and no-one has noticed - well,
> no-one has complained ;) - so removing the old dirs once we have ~100
> builds in the new locations seems reasonable.
>
> Thoughts?
>

+1, it's more consistent.
Too bad, I knew the output URLs quite well by now ;)

Rémy


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

Re: [tomcat] branch main updated: Remove code deprecated in 10.1.x apart from the APR Endpoint

[Michael Osipov]

Am 2021-05-25 um 09:44 schrieb Mark Thomas:

On 25/05/2021 08:27, Michael Osipov wrote:

Am 2021-05-24 um 20:55 schrieb Mark Thomas:

On 24/05/2021 18:43, Rémy Maucherat wrote:

On Mon, May 24, 2021 at 6:34 PM  wrote:


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

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
  new 620e06c  Remove code deprecated in 10.1.x apart from the APR
Endpoint
620e06c is described below

commit 620e06c468a02ca98dc4beacf556dd12d2440877
Author: Mark Thomas 
AuthorDate: Mon May 24 17:34:09 2021 +0100

 Remove code deprecated in 10.1.x apart from the APR Endpoint


Ah, it's *that* APR time again :)


Indeed. My plan was to give it a few days now folks have been 
reminded that this is going to happen and then do the APR removal in 
a separate commit.


I have an important fix for APR on Windows which affects also Tomcat 
as well. A very subtile one. Can you hold off for a moment? I will 
prepare a decent decription for dev@tomcat.a.o today and already have 
a suitable fix for it.


What is the benefit of holding off on the removal of the APR endpoint 
from 10.1.x?


Just for clarification, 10.x on main will move to 10.1.x and APR will 
only run on 9 and 8.5?


M


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

[tomcat] branch main updated: Update EL version for 10.1.x to EL 5.0 - there will be API changes

[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 098c280  Update EL version for 10.1.x to EL 5.0 - there will be API 
changes
098c280 is described below

commit 098c280cb2186d9bef351a36d238efbc89a37bd0
Author: Mark Thomas 
AuthorDate: Tue May 25 11:57:58 2021 +0100

Update EL version for 10.1.x to EL 5.0 - there will be API changes
---
 RELEASE-NOTES   |  2 +-
 build.xml   |  2 +-
 webapps/docs/changelog.xml  | 10 --
 webapps/docs/class-loader-howto.xml |  2 +-
 webapps/docs/project.xml|  2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b90c48b..7bd6f7c 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -74,7 +74,7 @@ for use by web applications (by placing them in "lib"):
 * catalina-storeconfig.jar (Generation of XML configuration from current state)
 * catalina-tribes.jar (Group communication)
 * ecj-@JDT_VERSION@.jar (Eclipse JDT Java compiler)
-* el-api.jar (EL 4.0 API)
+* el-api.jar (EL 5.0 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
 * jasper-el.jar (Jasper 2 EL implementation)
 * jsp-api.jar (JSP 3.0 API)
diff --git a/build.xml b/build.xml
index f244afa..2a41f76 100644
--- a/build.xml
+++ b/build.xml
@@ -56,7 +56,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 9c11ad4..8ac487a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,8 +119,9 @@
   
 
   
-Incremented supported Servlet version to 5.1 to align with the current
-development branch of the Servlet specification. (markt)
+Incremented tje supported Jakarta Servlet version to 5.1 to align with
+the current development branch of the Jakarta Servlet specification.
+(markt)
   
   
 65301: RemoteIpValve will now avoid getting
@@ -169,6 +170,11 @@
   
 
   
+Incremented the supported Jakarta Expression Language version to 5.0 to
+align with the current development branch of the Jakarta Expression
+Language specification. (markt)
+  
+  
 Review code used to generate Java source from JSPs and tags and remove
 code found to be unnecessary. (markt)
   
diff --git a/webapps/docs/class-loader-howto.xml 
b/webapps/docs/class-loader-howto.xml
index a566f3f..a85ead7 100644
--- a/webapps/docs/class-loader-howto.xml
+++ b/webapps/docs/class-loader-howto.xml
@@ -140,7 +140,7 @@ loaders as it is initialized:
 configuration files from current state
 catalina-tribes.jar  Group communication package.
 ecj-*.jar  Eclipse JDT Java compiler.
-el-api.jar  EL 4.0 API.
+el-api.jar  EL 5.0 API.
 jasper.jar  Tomcat Jasper JSP Compiler and 
Runtime.
 jasper-el.jar  Tomcat Jasper EL implementation.
 jsp-api.jar  JSP 3.0 API.
diff --git a/webapps/docs/project.xml b/webapps/docs/project.xml
index e4cf153..d241683 100644
--- a/webapps/docs/project.xml
+++ b/webapps/docs/project.xml
@@ -85,7 +85,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 9b385fe  Fix typo
9b385fe is described below

commit 9b385febce3f4eb0dffc45c5faf1e481f658c0bc
Author: Mark Thomas 
AuthorDate: Tue May 25 12:25:48 2021 +0100

Fix typo
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 8ac487a..01412cf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -119,7 +119,7 @@
   
 
   
-Incremented tje supported Jakarta Servlet version to 5.1 to align with
+Incremented the supported Jakarta Servlet version to 5.1 to align with
 the current development branch of the Jakarta Servlet specification.
 (markt)
   

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

buildbot success in on tomcat-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/5854

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch main] d43edc0a49c762a4069686eaa4b1e53043bd3ff9
Blamelist: Mark Thomas 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] branch 10.0.x updated: Update schema used in web-fragments

[markt]

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 4ea6233  Update schema used in web-fragments
4ea6233 is described below

commit 4ea6233daab181ea36aca38b775ca0f3ccfe92e8
Author: Mark Thomas 
AuthorDate: Tue May 25 16:28:47 2021 +0100

Update schema used in web-fragments
---
 res/META-INF/jasper-el.jar/web-fragment.xml|  8 
 res/META-INF/jasper.jar/web-fragment.xml   |  8 
 res/META-INF/tomcat-websocket.jar/web-fragment.xml | 12 ++--
 webapps/docs/changelog.xml |  9 +
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/res/META-INF/jasper-el.jar/web-fragment.xml 
b/res/META-INF/jasper-el.jar/web-fragment.xml
index 26b2e6c..6769e6f 100644
--- a/res/META-INF/jasper-el.jar/web-fragment.xml
+++ b/res/META-INF/jasper-el.jar/web-fragment.xml
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://xmlns.jcp.org/xml/ns/javaee;
+https://jakarta.ee/xml/ns/jakartaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+  https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd;
+  version="5.0"
   metadata-complete="true">
 org_apache_jasper_el
 
diff --git a/res/META-INF/jasper.jar/web-fragment.xml 
b/res/META-INF/jasper.jar/web-fragment.xml
index 24ecb31..0e7f4dc 100644
--- a/res/META-INF/jasper.jar/web-fragment.xml
+++ b/res/META-INF/jasper.jar/web-fragment.xml
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://xmlns.jcp.org/xml/ns/javaee;
+https://jakarta.ee/xml/ns/jakartaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+  https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd;
+  version="5.0"
   metadata-complete="true">
 org_apache_jasper
 
diff --git a/res/META-INF/tomcat-websocket.jar/web-fragment.xml 
b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
index f912fb1..6a2d315 100644
--- a/res/META-INF/tomcat-websocket.jar/web-fragment.xml
+++ b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://xmlns.jcp.org/xml/ns/javaee;
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
-  metadata-complete="true">
+https://jakarta.ee/xml/ns/jakartaee;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+  https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd;
+  version="5.0"
+  metadata-complete="true">
   org_apache_tomcat_websocket
   
 
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ea8d6df..afe93b3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -161,6 +161,11 @@
 a tag handler, only define the local variable JspWriter 
out
 when it is going to be used. (markt)
   
+  
+Update the web-fragment.xml included in
+jasper.jar and jasper-el.jar to use the
+Servlet 5.0 schema. (markt)
+  
 
   
   
@@ -171,6 +176,10 @@
 size was an exact multiple of 8192. Based on a patch provided by 
Saksham
 Verma. (markt)
   
+  
+Update the web-fragment.xml included in
+tomcat-websocket.jarto use the Servlet 5.0 schema. (markt)
+  
 
   
   

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

[tomcat] branch 10.0.x updated: Export no longer needed. Only used in main branch.

[markt]

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new e444caf  Export no longer needed. Only used in main branch.
e444caf is described below

commit e444caf0b17f8df5a807e6b3be1e784d31fe65a7
Author: Mark Thomas 
AuthorDate: Tue May 25 16:51:00 2021 +0100

Export no longer needed. Only used in main branch.
---
 .../apache/tomcat/buildutil/translate/Export.java  | 56 --
 1 file changed, 56 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Export.java 
b/java/org/apache/tomcat/buildutil/translate/Export.java
deleted file mode 100644
index b05ee13..000
--- a/java/org/apache/tomcat/buildutil/translate/Export.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-* 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.
-*/
-package org.apache.tomcat.buildutil.translate;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Generates a single properties file per language for import into a 
translation
- * tool.
- */
-public class Export {
-
-private static final Map translations = new HashMap<>();
-
-public static void main(String... args) throws IOException {
-File root = new File(".");
-for (String dir : Constants.SEARCH_DIRS) {
-File directory = new File(dir);
-Utils.processDirectory(root, directory, translations);
-}
-
-outputTranslations();
-}
-
-
-private static void outputTranslations() {
-
-File storageDir = new File(Constants.STORAGE_DIR);
-if (!storageDir.exists()) {
-storageDir.mkdirs();
-}
-
-for (Map.Entry translationEntry : 
translations.entrySet()) {
- Utils.export(translationEntry.getKey(), 
translationEntry.getValue(), storageDir);
-}
-}
-}
-

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

[Bug 65329] Incorrect handling for WINVER in NMAKEmakefile

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65329

Michael Osipov  changed:

   What|Removed |Added

 CC||micha...@apache.org
Summary|Incorrect handling for  |Incorrect handling for
   |WINVER on NMAKEmakefile |WINVER in NMAKEmakefile
 OS||All

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: A missed EL version update

[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 41bfe9f  A missed EL version update
41bfe9f is described below

commit 41bfe9f5a4898a2cc1ef7750b086b96c5c3070e6
Author: Mark Thomas 
AuthorDate: Tue May 25 16:43:51 2021 +0100

A missed EL version update
---
 BUILDING.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BUILDING.txt b/BUILDING.txt
index 9c6d883..956ca68 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -20,7 +20,7 @@
 
 
 This project contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a 
container that
-implements the Jakarta Servlet 5.1, JSP 3.0, EL 4.0, WebSocket 2.0 and
+implements the Jakarta Servlet 5.1, JSP 3.0, EL 5.0, WebSocket 2.0 and
 Authentication 2.0 specifications from the Jakarta EE project at Eclipse
 .
 

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

[tomcat] branch main updated: Some more Java EE 8 to Jakarta EE 9 updates

[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 7cf3561  Some more Java EE 8 to Jakarta EE 9 updates
7cf3561 is described below

commit 7cf356168e018271271dc0fce2ed924cfc124dc1
Author: Mark Thomas 
AuthorDate: Tue May 25 16:47:41 2021 +0100

Some more Java EE 8 to Jakarta EE 9 updates
---
 webapps/docs/appdev/deployment.xml |  4 ++--
 webapps/docs/appdev/introduction.xml   | 20 +++--
 webapps/docs/appdev/sample/web/WEB-INF/web.xml |  8 +++
 webapps/docs/index.xml | 30 +-
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/webapps/docs/appdev/deployment.xml 
b/webapps/docs/appdev/deployment.xml
index 06349f5..38b349d 100644
--- a/webapps/docs/appdev/deployment.xml
+++ b/webapps/docs/appdev/deployment.xml
@@ -136,8 +136,8 @@ drivers that are required for both your application or 
internal Tomcat use
 Out of the box, a standard Tomcat installation includes a variety
 of pre-installed shared library files, including:
 
-The Servlet 4.0 and JSP 2.3 APIs that are fundamental
-to writing servlets and JavaServer Pages.
+The Servlet 5.0 and JSP 3.0 APIs that are fundamental
+to writing servlets and JSPs.
 
 
 
diff --git a/webapps/docs/appdev/introduction.xml 
b/webapps/docs/appdev/introduction.xml
index 76995cc..875f3a1 100644
--- a/webapps/docs/appdev/introduction.xml
+++ b/webapps/docs/appdev/introduction.xml
@@ -62,27 +62,23 @@ the details of your particular environment.
 information, documentation, and software that is useful in developing
 web applications with Tomcat.
 
-https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html;>https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html
 -
-JavaServer Pages (JSP) Specification, Version 2.3.  Describes
+https://jakarta.ee/specifications/pages/3.0/;>https://jakarta.ee/specifications/pages/3.0/
 -
+Jakarta Server Pages (JSP), Version 3.0.  Describes
 the programming environment provided by standard implementations
-of the JavaServer Pages (JSP) technology.  In conjunction with
+of the Jakarta Server Pages technology.  In conjunction with
 the Servlet API Specification (see below), this document describes
-what a portable API page is allowed to contain.  Specific
+what a portable JSP page is allowed to contain.  Specific
 information on scripting (Chapter 9), tag extensions (Chapter 7),
-and packaging JSP pages (Appendix A) is useful.  The Javadoc
-API Documentation is included in the specification, and with the
-Tomcat download.
-https://jcp.org/aboutJava/communityprocess/final/jsr369/index.html;>https://jcp.org/aboutJava/communityprocess/final/jsr369/index.html
 -
-Servlet API Specification, Version 4.0.  Describes the
+and packaging JSP pages (Appendix A) is useful..
+https://jakarta.ee/specifications/servlet/5.0/;>https://jakarta.ee/specifications/servlet/5.0/
 -
+Jakarta Servlet API Specification, Version 5.0.  Describes the
 programming environment that must be provided by all servlet
 containers conforming to this specification.  In particular, you
 will need this document to understand the web application
 directory structure and deployment file (Chapter 10), methods of
 mapping request URIs to servlets (Chapter 12), container managed
 security (Chapter 13), and the syntax of the web.xml
-Web Application Deployment Descriptor (Chapter 14).  The Javadoc
-API Documentation is included in the specification, and with the
-Tomcat download.
+Web Application Deployment Descriptor (Chapter 14).
 
 
 
diff --git a/webapps/docs/appdev/sample/web/WEB-INF/web.xml 
b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
index 8502f99..717c137 100644
--- a/webapps/docs/appdev/sample/web/WEB-INF/web.xml
+++ b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://xmlns.jcp.org/xml/ns/javaee;
+https://jakarta.ee/xml/ns/jakartaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+  https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd;
+  version="5.0">
 
 Hello, World Application
 
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index 317fd32..cfa893f 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -164,34 +164,34 @@ are responsible for installing, configuring, and 
operating an Apache Tomcat serv
 - Complete documentation and HOWTOs on the JK native 

[tomcat] branch 10.0.x updated: Some more Java EE 8 to Jakarta EE 9 updates

[markt]

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new cfc5c38  Some more Java EE 8 to Jakarta EE 9 updates
cfc5c38 is described below

commit cfc5c38ffbee8448caa19cc01b67944d9bbd4f3d
Author: Mark Thomas 
AuthorDate: Tue May 25 16:47:41 2021 +0100

Some more Java EE 8 to Jakarta EE 9 updates
---
 webapps/docs/appdev/deployment.xml |  4 ++--
 webapps/docs/appdev/introduction.xml   | 20 +++--
 webapps/docs/appdev/sample/web/WEB-INF/web.xml |  8 +++
 webapps/docs/index.xml | 30 +-
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/webapps/docs/appdev/deployment.xml 
b/webapps/docs/appdev/deployment.xml
index 06349f5..38b349d 100644
--- a/webapps/docs/appdev/deployment.xml
+++ b/webapps/docs/appdev/deployment.xml
@@ -136,8 +136,8 @@ drivers that are required for both your application or 
internal Tomcat use
 Out of the box, a standard Tomcat installation includes a variety
 of pre-installed shared library files, including:
 
-The Servlet 4.0 and JSP 2.3 APIs that are fundamental
-to writing servlets and JavaServer Pages.
+The Servlet 5.0 and JSP 3.0 APIs that are fundamental
+to writing servlets and JSPs.
 
 
 
diff --git a/webapps/docs/appdev/introduction.xml 
b/webapps/docs/appdev/introduction.xml
index 76995cc..875f3a1 100644
--- a/webapps/docs/appdev/introduction.xml
+++ b/webapps/docs/appdev/introduction.xml
@@ -62,27 +62,23 @@ the details of your particular environment.
 information, documentation, and software that is useful in developing
 web applications with Tomcat.
 
-https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html;>https://jcp.org/aboutJava/communityprocess/mrel/jsr245/index2.html
 -
-JavaServer Pages (JSP) Specification, Version 2.3.  Describes
+https://jakarta.ee/specifications/pages/3.0/;>https://jakarta.ee/specifications/pages/3.0/
 -
+Jakarta Server Pages (JSP), Version 3.0.  Describes
 the programming environment provided by standard implementations
-of the JavaServer Pages (JSP) technology.  In conjunction with
+of the Jakarta Server Pages technology.  In conjunction with
 the Servlet API Specification (see below), this document describes
-what a portable API page is allowed to contain.  Specific
+what a portable JSP page is allowed to contain.  Specific
 information on scripting (Chapter 9), tag extensions (Chapter 7),
-and packaging JSP pages (Appendix A) is useful.  The Javadoc
-API Documentation is included in the specification, and with the
-Tomcat download.
-https://jcp.org/aboutJava/communityprocess/final/jsr369/index.html;>https://jcp.org/aboutJava/communityprocess/final/jsr369/index.html
 -
-Servlet API Specification, Version 4.0.  Describes the
+and packaging JSP pages (Appendix A) is useful..
+https://jakarta.ee/specifications/servlet/5.0/;>https://jakarta.ee/specifications/servlet/5.0/
 -
+Jakarta Servlet API Specification, Version 5.0.  Describes the
 programming environment that must be provided by all servlet
 containers conforming to this specification.  In particular, you
 will need this document to understand the web application
 directory structure and deployment file (Chapter 10), methods of
 mapping request URIs to servlets (Chapter 12), container managed
 security (Chapter 13), and the syntax of the web.xml
-Web Application Deployment Descriptor (Chapter 14).  The Javadoc
-API Documentation is included in the specification, and with the
-Tomcat download.
+Web Application Deployment Descriptor (Chapter 14).
 
 
 
diff --git a/webapps/docs/appdev/sample/web/WEB-INF/web.xml 
b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
index 8502f99..717c137 100644
--- a/webapps/docs/appdev/sample/web/WEB-INF/web.xml
+++ b/webapps/docs/appdev/sample/web/WEB-INF/web.xml
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://xmlns.jcp.org/xml/ns/javaee;
+https://jakarta.ee/xml/ns/jakartaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd;
-  version="4.0">
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+  https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd;
+  version="5.0">
 
 Hello, World Application
 
diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index aa07fc0..9eef688 100644
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -164,34 +164,34 @@ are responsible for installing, configuring, and 
operating an Apache Tomcat serv
 - Complete documentation and HOWTOs on the JK native 

[tomcat] branch 10.0.x updated: Update JspC to use Servlet 5.0 schemas

[markt]

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 4be0c01  Update JspC to use Servlet 5.0 schemas
4be0c01 is described below

commit 4be0c01ca2fe57961c2bf20261ec8fbde2ce295d
Author: Mark Thomas 
AuthorDate: Tue May 25 17:19:48 2021 +0100

Update JspC to use Servlet 5.0 schemas
---
 java/org/apache/jasper/resources/LocalStrings.properties | 16 
 .../apache/jasper/resources/LocalStrings_cs.properties   | 16 
 .../apache/jasper/resources/LocalStrings_de.properties   | 16 
 .../apache/jasper/resources/LocalStrings_es.properties   | 16 
 .../apache/jasper/resources/LocalStrings_fr.properties   | 16 
 .../apache/jasper/resources/LocalStrings_ja.properties   | 16 
 .../apache/jasper/resources/LocalStrings_ko.properties   | 16 
 .../jasper/resources/LocalStrings_pt_BR.properties   | 16 
 .../jasper/resources/LocalStrings_zh_CN.properties   | 16 
 webapps/docs/changelog.xml   |  4 
 10 files changed, 76 insertions(+), 72 deletions(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 9a73999..25673d5 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -364,11 +364,11 @@ jspc.webfrg.footer=\n\
 \n\
 \n
 jspc.webfrg.header=\n\
-http://xmlns.jcp.org/xml/ns/javaee"\n\
+https://jakarta.ee/xml/ns/jakartaee"\n\
 \  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\  
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\  version="4.0"\n\
+\  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\  
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\  version="5.0"\n\
 \  metadata-complete="true">\n\
 \  org_apache_jasper.jspc\n\
 \  \n\
@@ -392,11 +392,11 @@ jspc.webxml.footer=\n\
 \n\
 \n
 jspc.webxml.header=\n\
-http://xmlns.jcp.org/xml/ns/javaee"\n\
+https://jakarta.ee/xml/ns/jakartaee"\n\
 \ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\n\
 \ metadata-complete="false">\n\
 

[tomcat] 03/03: Update JspC to use Servlet 5.0 schemas

[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 1235b8b98ca0443ead49048aa88a4d69392b
Author: Mark Thomas 
AuthorDate: Tue May 25 17:19:48 2021 +0100

Update JspC to use Servlet 5.0 schemas
---
 java/org/apache/jasper/resources/LocalStrings.properties | 16 
 .../apache/jasper/resources/LocalStrings_cs.properties   | 16 
 .../apache/jasper/resources/LocalStrings_de.properties   | 16 
 .../apache/jasper/resources/LocalStrings_es.properties   | 16 
 .../apache/jasper/resources/LocalStrings_fr.properties   | 16 
 .../apache/jasper/resources/LocalStrings_ja.properties   | 16 
 .../apache/jasper/resources/LocalStrings_ko.properties   | 16 
 .../jasper/resources/LocalStrings_pt_BR.properties   | 16 
 .../jasper/resources/LocalStrings_zh_CN.properties   | 16 
 webapps/docs/changelog.xml   |  4 
 10 files changed, 76 insertions(+), 72 deletions(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings.properties 
b/java/org/apache/jasper/resources/LocalStrings.properties
index 9a73999..25673d5 100644
--- a/java/org/apache/jasper/resources/LocalStrings.properties
+++ b/java/org/apache/jasper/resources/LocalStrings.properties
@@ -364,11 +364,11 @@ jspc.webfrg.footer=\n\
 \n\
 \n
 jspc.webfrg.header=\n\
-http://xmlns.jcp.org/xml/ns/javaee"\n\
+https://jakarta.ee/xml/ns/jakartaee"\n\
 \  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\  
http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd"\n\
-\  version="4.0"\n\
+\  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\  
https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd"\n\
+\  version="5.0"\n\
 \  metadata-complete="true">\n\
 \  org_apache_jasper.jspc\n\
 \  \n\
@@ -392,11 +392,11 @@ jspc.webxml.footer=\n\
 \n\
 \n
 jspc.webxml.header=\n\
-http://xmlns.jcp.org/xml/ns/javaee"\n\
+https://jakarta.ee/xml/ns/jakartaee"\n\
 \ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\n\
-\ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee\n\
-\ http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd"\n\
-\ version="4.0"\n\
+\ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee\n\
+\ https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"\n\
+\ version="5.0"\n\
 \ metadata-complete="false">\n\
 

APR connector on Windows 8+ fails to listen on all addresses

[Michael Osipov]

Folks,

we needed to deploy Tomcat 9.0.x on a Windows server (no jokes, please), 
but the contractor wasn't able to configure the APR connector to accept 
on external interfaces even after a day.
After my analysis it turned out be a subtile bug in libapr which affects 
Windows users only. I am also surprised why no one complained before.


Setup:
* Windows 8+ or Windows Server 2016/2019
* Have at least IPv6 available, no IP addresses necessary, ::1 is sufficient
* Any Tomcat with libtcnative 1.2.28 with the DLL compiled by Mark Thomas.
* Start Tomcat with the AprLifecycleListener and make sure that no 
address (hostname) is set.


To make a long investigation story short:
libapr, thus libtcnative suffer from a very subtile bug only visible
on dual-stack systems. Since on INET6 sockets IPV6_V6ONLY is 1 by 
default on Windows, no IPv4 addresses are bound. In the case above, 
Tomcat is only accessible on ::1. APR is supposed to set IPV6_V6ONLY to 
0 by default, but this fails because APR 1.7.x does not recognise 
anything above Windows 7 and assumes it to be Windows XP by default. As 
you might know Vista was the first Windows with true IPv6 an 
dual-sockets. When setsockopt is invoked APR gives you 70023, not 
implemented.


I was able, according to Mark's instructions, to compile OpenSSL, APR 
and Tomcat Native on Windows 10 and deploy on Windows Server 2019.

I'd like to push
* https://github.com/michael-o/tomcat/compare/main...clean-bind
* https://github.com/michael-o/tomcat-native/compare/main...clean-bind
as well as the real fix in APR 1.7.x: 
https://github.com/michael-o/apr/compare/1.7.x...1.7.x-windows


I ran all unit tests (main) with those modifications on these platforms:
* Windows 10, APR 1.7.0, 1.7.1-dev
* Windows Server 2019, APR 1.7.0, 1.7.1-dev
* FreeBSD 12-STABLE, APR 1.7.0, 1.7.1-dev
* RHEL 7, APR 1.4.8
* HP-UX 11i, APR 1.6.6

Some hosts are dual-stack, some IPv4 only. Moreover, I wrote a simple 
program which binds the socket for tracing only: 
https://gist.github.com/michael-o/dfb86df472f62d2b2dff6ef12ee3758e
It runs as expected on the above platforms, even with zone id on 
link-local addresses.


If no one objects, I'll merge soon.

Mark, I don't know when the next APR release will happen, but I consider 
this to be very annoying. Maybe it makes sense to push 1.2.29 with APR 
1.7.1-dev to please Windows users?


Michael

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

[Bug 65329] New: Incorrect handling for WINVER on NMAKEmakefile

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65329

Bug ID: 65329
   Summary: Incorrect handling for WINVER on NMAKEmakefile
   Product: Tomcat Native
   Version: 1.2.28
  Hardware: PC
Status: NEW
  Severity: major
  Priority: P2
 Component: Library
  Assignee: dev@tomcat.apache.org
  Reporter: micha...@apache.org
  Target Milestone: ---

The supplied NMAKEmakefiles

* does not recognize Windows releases after 7 (8, 8.1, 10),
* passes incorrect macro values to activate features in the compiler, e.g, 
-D_WIN32_WINNT=0x0700 for Windows 7. The value is wrong.

Proper values are documented here:
*
https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-160
*
https://docs.microsoft.com/en-us/windows/win32/api/winnt/ns-winnt-osversioninfoa

So those files need to add new values and fix existing incorrect values.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Renamings with APR removal in 10.1.x

[Michael Osipov]

Mark,

since you are going to remove all bits soon, will you rename Java items 
with still carry the APR substring? E.g., AprLifecycleListener will be a 
misleading name for obvious reasons.


Michael

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


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

[tomcat] branch main updated: Update schema used in web-fragments

[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 5ba1cda  Update schema used in web-fragments
5ba1cda is described below

commit 5ba1cdaaa6a4862929c68a3c6d8beeac61bcec36
Author: Mark Thomas 
AuthorDate: Tue May 25 16:28:47 2021 +0100

Update schema used in web-fragments
---
 res/META-INF/jasper-el.jar/web-fragment.xml|  8 
 res/META-INF/jasper.jar/web-fragment.xml   |  8 
 res/META-INF/tomcat-websocket.jar/web-fragment.xml | 12 ++--
 webapps/docs/changelog.xml |  9 +
 4 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/res/META-INF/jasper-el.jar/web-fragment.xml 
b/res/META-INF/jasper-el.jar/web-fragment.xml
index 26b2e6c..6769e6f 100644
--- a/res/META-INF/jasper-el.jar/web-fragment.xml
+++ b/res/META-INF/jasper-el.jar/web-fragment.xml
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://xmlns.jcp.org/xml/ns/javaee;
+https://jakarta.ee/xml/ns/jakartaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+  https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd;
+  version="5.0"
   metadata-complete="true">
 org_apache_jasper_el
 
diff --git a/res/META-INF/jasper.jar/web-fragment.xml 
b/res/META-INF/jasper.jar/web-fragment.xml
index 24ecb31..0e7f4dc 100644
--- a/res/META-INF/jasper.jar/web-fragment.xml
+++ b/res/META-INF/jasper.jar/web-fragment.xml
@@ -15,11 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://xmlns.jcp.org/xml/ns/javaee;
+https://jakarta.ee/xml/ns/jakartaee;
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+  https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd;
+  version="5.0"
   metadata-complete="true">
 org_apache_jasper
 
diff --git a/res/META-INF/tomcat-websocket.jar/web-fragment.xml 
b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
index f912fb1..6a2d315 100644
--- a/res/META-INF/tomcat-websocket.jar/web-fragment.xml
+++ b/res/META-INF/tomcat-websocket.jar/web-fragment.xml
@@ -15,12 +15,12 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-http://xmlns.jcp.org/xml/ns/javaee;
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-  http://xmlns.jcp.org/xml/ns/javaee/web-fragment_4_0.xsd;
-  version="4.0"
-  metadata-complete="true">
+https://jakarta.ee/xml/ns/jakartaee;
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+  xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee
+  https://jakarta.ee/xml/ns/jakartaee/web-fragment_5_0.xsd;
+  version="5.0"
+  metadata-complete="true">
   org_apache_tomcat_websocket
   
 
\ No newline at end of file
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 818fbe1..5a11a70 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,11 @@
 Add generics to the EL 5.0 API to align with the current EL 5.0
 development branch. (markt)
   
+  
+Update the web-fragment.xml included in
+jasper.jar and jasper-el.jar to use the
+Servlet 5.0 schema. (markt)
+  
 
   
   
@@ -201,6 +206,10 @@
 size was an exact multiple of 8192. Based on a patch provided by 
Saksham
 Verma. (markt)
   
+  
+Update the web-fragment.xml included in
+tomcat-websocket.jarto use the Servlet 5.0 schema. (markt)
+  
 
   
   

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

[tomcat] branch main updated (7cf3561 -> 1235b8b)

[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 7cf3561  Some more Java EE 8 to Jakarta EE 9 updates
 new 7708a78  Improvements to French translations. (remm)
 new fe38920  Improvements to Korean translations. (woonsan)
 new 1235b8b  Update JspC to use Servlet 5.0 schemas

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


Summary of changes:
 java/org/apache/coyote/LocalStrings_fr.properties|  1 +
 java/org/apache/coyote/LocalStrings_ko.properties|  1 +
 java/org/apache/jasper/resources/LocalStrings.properties | 16 
 .../apache/jasper/resources/LocalStrings_cs.properties   | 16 
 .../apache/jasper/resources/LocalStrings_de.properties   | 16 
 .../apache/jasper/resources/LocalStrings_es.properties   | 16 
 .../apache/jasper/resources/LocalStrings_fr.properties   | 16 
 .../apache/jasper/resources/LocalStrings_ja.properties   | 16 
 .../apache/jasper/resources/LocalStrings_ko.properties   | 16 
 .../jasper/resources/LocalStrings_pt_BR.properties   | 16 
 .../jasper/resources/LocalStrings_zh_CN.properties   | 16 
 .../apache/tomcat/websocket/LocalStrings_fr.properties   |  5 +
 .../apache/tomcat/websocket/LocalStrings_ko.properties   |  5 +
 .../tomcat/websocket/pojo/LocalStrings_fr.properties |  2 ++
 .../tomcat/websocket/pojo/LocalStrings_ko.properties |  2 ++
 webapps/docs/changelog.xml   | 14 ++
 16 files changed, 102 insertions(+), 72 deletions(-)

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

[tomcat] 01/03: Improvements to French translations. (remm)

[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 7708a78c80f921e9cdc3e38a5758c96e4fea7aac
Author: Mark Thomas 
AuthorDate: Tue May 25 17:09:25 2021 +0100

Improvements to French translations. (remm)
---
 java/org/apache/coyote/LocalStrings_fr.properties| 1 +
 java/org/apache/tomcat/websocket/LocalStrings_fr.properties  | 5 +
 java/org/apache/tomcat/websocket/pojo/LocalStrings_fr.properties | 2 ++
 webapps/docs/changelog.xml   | 7 +++
 4 files changed, 15 insertions(+)

diff --git a/java/org/apache/coyote/LocalStrings_fr.properties 
b/java/org/apache/coyote/LocalStrings_fr.properties
index f11cd6d..b40dadd 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -52,6 +52,7 @@ abstractProtocolHandler.start=Démarrage du gestionnaire de 
protocole [{0}]
 abstractProtocolHandler.stop=Arrêt du gestionnaire de protocole [{0}]
 
 asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour 
une requête dans l''état Async [{1}]
+asyncStateMachine.stateChange=Changement de l''état async de [{0}] à [{1}]
 
 compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête 
Content-Encoding en vérifiant si la compression était déjà utilisée
 
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties 
b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
index 4d12b3c..72f3c1e 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
@@ -33,6 +33,9 @@ backgroundProcessManager.processFailed=Un processus 
d'arrière-plan a échoué
 
 caseInsensitiveKeyMap.nullKey=Les clés nulles ne sont pas admises
 
+clientEndpointHolder.instanceCreationFailed=Echec de la création du 
WebSocketEndpoint
+clientEndpointHolder.instanceRegistrationFailed=Echec de l'enregistrement de 
l'instance de l'Endpoint dans l'InstanceManager
+
 futureToSendHandler.timeout=Le délai d''attente de l''opération est dépassé 
après avoir attendu [{0}] [{1}] pour qu''elle se termine
 
 perMessageDeflate.alreadyClosed=Le transformateur a été fermé et ne peut plus 
être utilisé
@@ -85,6 +88,7 @@ wsRemoteEndpoint.closed=Le message ne sera pas envoyé parce 
que la session WebS
 wsRemoteEndpoint.closedDuringMessage=Le reste du message ne sera pas envoyé 
parce que la session WebSocket est déjà fermée.
 wsRemoteEndpoint.closedOutputStream=La méthode ne peut pas être appelée alors 
que l'OutputStream a été fermée
 wsRemoteEndpoint.closedWriter=Cette méthode ne doit pas être appelée car le 
Writer a été fermé
+wsRemoteEndpoint.encoderDestoryFailed=Echec de la destruction de l''encodeur 
de type [{0}]
 wsRemoteEndpoint.flushOnCloseFailed=Le groupement de messages est toujours 
actif après fermeture de la session, impossible d'envoyer les messages restants
 wsRemoteEndpoint.invalidEncoder=L''encodeur spécifié de type [{0}] n''a pu 
être instancié
 wsRemoteEndpoint.noEncoder=Pas d''encodeur spécifié pour un objet de classe 
[{0}]
@@ -102,6 +106,7 @@ wsSession.duplicateHandlerBinary=Un gestionnaire de message 
binaire a déjà ét
 wsSession.duplicateHandlerPong=Un gestionnaire de messages pong a déjà été 
configuré
 wsSession.duplicateHandlerText=Un gestionnaire de message texte a déjà été 
configuré
 wsSession.flushFailOnClose=Impossible d'envoyer la file de messages lors de la 
fermeture de la session
+wsSession.instanceCreateFailed=Echec de la création de l'instance de l'Endpoint
 wsSession.instanceNew=L'enregistrement de l'instance de la terminaison a échoué
 wsSession.invalidHandlerTypePong=Un gestionnaire de message pong doit 
implémenter MessageHandler.Whole
 wsSession.messageFailed=Impossible d'écrire le message WebSocket complet car 
la connection a été fermée
diff --git a/java/org/apache/tomcat/websocket/pojo/LocalStrings_fr.properties 
b/java/org/apache/tomcat/websocket/pojo/LocalStrings_fr.properties
index 806ef3f..929f634 100644
--- a/java/org/apache/tomcat/websocket/pojo/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_fr.properties
@@ -22,6 +22,8 @@ pojoEndpointBase.onOpenFail=Impossible d’appeler la méthode 
onOpen du point d
 pojoMessageHandlerWhole.decodeIoFail=Erreur d'IO lors du décodage du message
 pojoMessageHandlerWhole.maxBufferSize=La taille maximale de message supportée 
par cette implémentation est Integer.MAX_VALUE
 
+pojoMessageHandlerWholeBase.decodeDestoryFailed=Echec de la destruction du 
décodeur de type [{0}]
+
 pojoMethodMapping.decodePathParamFail=Echec de décodage de la valeur de 
paramètre de chemin [{0}] vers le type attendu [{1}]
 pojoMethodMapping.duplicateAnnotation=Annotations dupliquées [{0}] présentes 
pour la classe [{1}]
 pojoMethodMapping.duplicateLastParam=Multiple (derniers) paramètres booléens 
présents sur 

[tomcat] 02/03: Improvements to Korean translations. (woonsan)

[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 fe38920463f40dd483a65ab14ad789234e7977b0
Author: Mark Thomas 
AuthorDate: Tue May 25 17:11:44 2021 +0100

Improvements to Korean translations. (woonsan)
---
 java/org/apache/coyote/LocalStrings_ko.properties| 1 +
 java/org/apache/tomcat/websocket/LocalStrings_ko.properties  | 5 +
 java/org/apache/tomcat/websocket/pojo/LocalStrings_ko.properties | 2 ++
 webapps/docs/changelog.xml   | 3 +++
 4 files changed, 11 insertions(+)

diff --git a/java/org/apache/coyote/LocalStrings_ko.properties 
b/java/org/apache/coyote/LocalStrings_ko.properties
index 669647a..6847030 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -52,6 +52,7 @@ abstractProtocolHandler.start=프로토콜 핸들러 [{0}]을(를) 시작합니
 abstractProtocolHandler.stop=프로토콜 핸들러 [{0}]을(를) 중지시킵니다.
 
 asyncStateMachine.invalidAsyncState=비동기 상태가 [{1}]인 요청에 대하여, [{0}]을(를) 호출하는 것은 
유효하지 않습니다.
+asyncStateMachine.stateChange=비동기 상태를 [{0}]에서 [{1}](으)로 변경합니다.
 
 compressionConfig.ContentEncodingParseFail=압축이 이미 사용되는지 여부를 점검하는 중, 
Content-Encoding 헤더를 파싱하지 못했습니다.
 
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties 
b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
index 096ddd2..dc4e6b9 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_ko.properties
@@ -33,6 +33,9 @@ backgroundProcessManager.processFailed=백그라운드 프로세스가 실패했
 
 caseInsensitiveKeyMap.nullKey=널인 키들은 허용되지 않습니다.
 
+clientEndpointHolder.instanceCreationFailed=WebSocketEndpoint를 생성하지 못했습니다.
+clientEndpointHolder.instanceRegistrationFailed=InstanceManager를 통해 Endpoint를 
등록하지 못했습니다.
+
 futureToSendHandler.timeout=[{0}] [{1}]이(가) 완료되기를 기다린 후, 작업 제한 시간을 초과했습니다.
 
 perMessageDeflate.alreadyClosed=해당 transformer가 이미 닫혔으므로 더이상 사용될 수 없습니다.
@@ -85,6 +88,7 @@ wsRemoteEndpoint.closed=웹소켓 세션이 이미 닫혔기 때문에, 메시
 wsRemoteEndpoint.closedDuringMessage=웹소켓 세션이 이미 닫혔기 때문에, 메시지의 나머지 부분은 전달되지 않을 
것입니다.
 wsRemoteEndpoint.closedOutputStream=OutputStream이 이미 닫혀 있으므로, 이 메소드는 호출될 수 
없습니다.
 wsRemoteEndpoint.closedWriter=Writer가 이미 닫혔기 때문에, 이 메소드는 호출될 수 없습니다.
+wsRemoteEndpoint.encoderDestoryFailed=[{0}] 타입의 인코더를 소멸시키지 못했습니다.
 wsRemoteEndpoint.flushOnCloseFailed=세션이 이미 종료된 이후에도, 메시지들이 배치(batch)에 포함되어 
있습니다. 배치에 남아있는 메시지들을 배출할 수 없습니다.
 wsRemoteEndpoint.invalidEncoder=지정된 타입 [{0}]의 Encoder의 인스턴스를 생성할 수 없었습니다.
 wsRemoteEndpoint.noEncoder=클래스 [{0}]의 객체를 위한 인코더가 지정되지 않았습니다.
@@ -102,6 +106,7 @@ wsSession.duplicateHandlerBinary=바이너리 메시지 핸들러가 이미 설
 wsSession.duplicateHandlerPong=Pong 메시지 핸들러가 이미 설정되었습니다.
 wsSession.duplicateHandlerText=텍스트 메시지 핸들러가 이미 설정되어 있습니다.
 wsSession.flushFailOnClose=세션이 닫힐 때, 배치에 쌓인 메시지들을 배출하지 못했습니다.
+wsSession.instanceCreateFailed=Endpoint 개체 생성 실패
 wsSession.instanceNew=엔드포인트 인스턴스 등록 실패
 wsSession.invalidHandlerTypePong=Pong 메시지 핸들러는 반드시 MessageHandler.Whole을 구현해야 
합니다.
 wsSession.messageFailed=웹소켓 연결이 이미 닫혔기 때문에, 완전한 메시지를 쓸 수 없습니다.
diff --git a/java/org/apache/tomcat/websocket/pojo/LocalStrings_ko.properties 
b/java/org/apache/tomcat/websocket/pojo/LocalStrings_ko.properties
index 052eb0d..b9f4243 100644
--- a/java/org/apache/tomcat/websocket/pojo/LocalStrings_ko.properties
+++ b/java/org/apache/tomcat/websocket/pojo/LocalStrings_ko.properties
@@ -22,6 +22,8 @@ pojoEndpointBase.onOpenFail=타입이 [{0}]인 POJO를 위한, POJO 엔드포인
 pojoMessageHandlerWhole.decodeIoFail=메시지를 디코딩하는 중 IO 오류 발생
 pojoMessageHandlerWhole.maxBufferSize=이 구현을 위해 지원되는 최대 메시지 크기는 
Integer.MAX_VALUE입니다.
 
+pojoMessageHandlerWholeBase.decodeDestoryFailed=[{0}] 타입의 디코더를 소멸시키지 못했습니다.
+
 pojoMethodMapping.decodePathParamFail=경로 파라미터 값 [{0}]을(를), 요구되는 타입 [{1}](으)로 
디코드하지 못했습니다.
 pojoMethodMapping.duplicateAnnotation=중복된 [{0}] annotation들이 클래스 [{1}]에 존재합니다.
 pojoMethodMapping.duplicateLastParam=OnMessage로 annotate된 클래스 [{1}]의 메소드 
[{0}]에, 여러 개의 boolean 타입의 (마지막) 파라미터들이 존재합니다.
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5ddacab..035be32 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -226,6 +226,9 @@
   
 Improvements to French translations. (remm)
   
+  
+Improvements to Korean translations. (woonsan)
+  
 
   
 

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

POEditor translations currently corrupted

[Mark Thomas]

All,

The translations we manage via POEditor are currently corrupted. This is 
entirely my fault. In trying to fix a small bug, I introduced a bigger one.


No translations have been lost. Reverting my fix and re-exporting the 
translations from a clean git checkout will restore everything. However, 
I would still like to fix the small bug so I'll be working on this for 
the next few hours which means the translations will remain corrupted 
for that time.


I'll post again when the translations have been restored. Hopefully with 
the small bug fixed as well.


Mark

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

[Bug 65330] NullPointerException on LDAP auth since tomcat 9.0.46 (works on 9.0.45)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65330

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |DUPLICATE
 Status|NEW |RESOLVED

--- Comment #1 from Mark Thomas  ---
As a workaround adding the following to the JNDIRealm should fix this:

userRoleAttribute="cn"

*** This bug has been marked as a duplicate of bug 65308 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 65308] NPE in JNDIRealm when no userRoleAttribute is given

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65308

Mark Thomas  changed:

   What|Removed |Added

 CC||sl...@aceslash.net

--- Comment #4 from Mark Thomas  ---
*** Bug 65330 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 10.0.x updated: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

[michaelo]

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

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new f5e5091  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr
f5e5091 is described below

commit f5e50917669f1c102ea9f07bf99dfdba8a63cb9e
Author: Michael Osipov 
AuthorDate: Tue May 25 20:14:19 2021 +0200

AprLifecycleListener does not show dev version suffix for libtcnative and 
libapr
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 12 +---
 webapps/docs/changelog.xml  |  4 
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 6b6a8e7..ca6e4cd 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -213,8 +213,8 @@ public class AprLifecycleListener
 return;
 }
 if (apver < rqver) {
-log.error(sm.getString("aprListener.tcnInvalid", major + "."
-+ minor + "." + patch,
+log.error(sm.getString("aprListener.tcnInvalid",
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_REQUIRED_MINOR + "." +
 TCN_REQUIRED_PATCH));
@@ -230,17 +230,15 @@ public class AprLifecycleListener
 }
 if (apver < rcver) {
 initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
-major + "." + minor + "." + patch,
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_RECOMMENDED_MINOR + "." +
 TCN_RECOMMENDED_PV));
 }
 
 initInfoLogMessages.add(sm.getString("aprListener.tcnValid",
-major + "." + minor + "." + patch,
-Library.APR_MAJOR_VERSION + "." +
-Library.APR_MINOR_VERSION + "." +
-Library.APR_PATCH_VERSION));
+Library.versionString(),
+Library.aprVersionString()));
 
 // Log APR flags
 initInfoLogMessages.add(sm.getString("aprListener.flags",
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2ae624f..fd166d2 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,6 +135,10 @@
 before attempting conversion to String. Pull request provided by
 tianshuang. (markt)
   
+  
+AprLifecycleListener does not show dev version suffix for libtcnative
+and libapr. (michaelo)
+  
 
   
   

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

[Bug 65330] New: NullPointerException on LDAP auth since tomcat 9.0.46 (works on 9.0.45)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65330

Bug ID: 65330
   Summary: NullPointerException on LDAP auth since tomcat 9.0.46
(works on 9.0.45)
   Product: Tomcat 9
   Version: 9.0.46
  Hardware: PC
OS: Linux
Status: NEW
  Severity: regression
  Priority: P2
 Component: Catalina
  Assignee: dev@tomcat.apache.org
  Reporter: sl...@aceslash.net
  Target Milestone: -

I suppose this regression is due to Bug 65224 .

This is the relevant server.xml configuration:

  


  


This configuration works on tomcat 9.0.45, I use it to log users to the manager
context.

On 9.0.46, it doesn't work and it raises the following exception:

25-May-2021 19:36:08.098 INFO [main] org.apache.coyote.AbstractProtocol.start
Starting ProtocolHandler ["http-nio2-8080"]
25-May-2021 19:36:08.101 INFO [main] org.apache.coyote.AbstractProtocol.start
Starting ProtocolHandler ["https-openssl-apr-8443"]
25-May-2021 19:36:08.106 INFO [main] org.apache.catalina.startup.Catalina.start
Server startup in [1095] milliseconds
25-May-2021 19:36:17.828 INFO [http-nio2-8080-exec-2]
org.apache.catalina.realm.JNDIRealm.authenticate Exception performing
authentication. Retrying...
java.lang.NullPointerException
at
org.apache.catalina.realm.JNDIRealm.doAttributeValueEscaping(JNDIRealm.java:2884)
at
org.apache.catalina.realm.JNDIRealm.getRoles(JNDIRealm.java:1892)
at
org.apache.catalina.realm.JNDIRealm.authenticate(JNDIRealm.java:1350)
at
org.apache.catalina.realm.JNDIRealm.authenticate(JNDIRealm.java:1232)
at
org.apache.catalina.realm.CombinedRealm.authenticate(CombinedRealm.java:191)
at
org.apache.catalina.realm.LockOutRealm.authenticate(LockOutRealm.java:154)
at
org.apache.catalina.authenticator.BasicAuthenticator.doAuthenticate(BasicAuthenticator.java:101)
at
org.apache.catalina.authenticator.AuthenticatorBase.invoke(AuthenticatorBase.java:632)
at
org.apache.catalina.valves.RequestFilterValve.process(RequestFilterValve.java:378)
at
org.apache.catalina.valves.RemoteAddrValve.invoke(RemoteAddrValve.java:56)
at
org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:143)
at
org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:92)
at
org.apache.catalina.valves.AbstractAccessLogValve.invoke(AbstractAccessLogValve.java:687)
at
org.apache.catalina.valves.RemoteIpValve.invoke(RemoteIpValve.java:764)
at
org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:78)
at
org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:357)
at
org.apache.coyote.http11.Http11Processor.service(Http11Processor.java:374)
at
org.apache.coyote.AbstractProcessorLight.process(AbstractProcessorLight.java:65)
at
org.apache.coyote.AbstractProtocol$ConnectionHandler.process(AbstractProtocol.java:893)
at
org.apache.tomcat.util.net.Nio2Endpoint$SocketProcessor.doRun(Nio2Endpoint.java:1685)
at
org.apache.tomcat.util.net.SocketProcessorBase.run(SocketProcessorBase.java:49)
at
org.apache.tomcat.util.net.AbstractEndpoint.processSocket(AbstractEndpoint.java:1167)
at
org.apache.tomcat.util.net.Nio2Endpoint.setSocketOptions(Nio2Endpoint.java:331)
at
org.apache.tomcat.util.net.Nio2Endpoint$Nio2Acceptor.completed(Nio2Endpoint.java:451)
at
org.apache.tomcat.util.net.Nio2Endpoint$Nio2Acceptor.completed(Nio2Endpoint.java:387)
at
java.base/sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:127)
at java.base/sun.nio.ch.Invoker$2.run(Invoker.java:219)
at
java.base/sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
at
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
at
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
at
org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61)
at java.base/java.lang.Thread.run(Thread.java:829)


-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: 

[tomcat] branch apache-main created (now 7929f10)

[michaelo]

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

michaelo pushed a change to branch apache-main
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


  at 7929f10  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr

This branch includes the following new commits:

 new 7929f10  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr

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: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

[michaelo]

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

michaelo pushed a commit to branch apache-main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 7929f10f12e7d9e958f16086e28928e9adc9af62
Author: Michael Osipov 
AuthorDate: Tue May 25 20:14:19 2021 +0200

AprLifecycleListener does not show dev version suffix for libtcnative and 
libapr
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 12 +---
 webapps/docs/changelog.xml  |  4 
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 6b6a8e7..ca6e4cd 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -213,8 +213,8 @@ public class AprLifecycleListener
 return;
 }
 if (apver < rqver) {
-log.error(sm.getString("aprListener.tcnInvalid", major + "."
-+ minor + "." + patch,
+log.error(sm.getString("aprListener.tcnInvalid",
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_REQUIRED_MINOR + "." +
 TCN_REQUIRED_PATCH));
@@ -230,17 +230,15 @@ public class AprLifecycleListener
 }
 if (apver < rcver) {
 initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
-major + "." + minor + "." + patch,
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_RECOMMENDED_MINOR + "." +
 TCN_RECOMMENDED_PV));
 }
 
 initInfoLogMessages.add(sm.getString("aprListener.tcnValid",
-major + "." + minor + "." + patch,
-Library.APR_MAJOR_VERSION + "." +
-Library.APR_MINOR_VERSION + "." +
-Library.APR_PATCH_VERSION));
+Library.versionString(),
+Library.aprVersionString()));
 
 // Log APR flags
 initInfoLogMessages.add(sm.getString("aprListener.flags",
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7f8b6ad..6e20426 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -156,6 +156,10 @@
 setAttribute(), getAttribute() and
 getAttributes() introduced in Servlet 5.1. (markt)
   
+  
+AprLifecycleListener does not show dev version suffix for libtcnative
+and libapr. (michaelo)
+  
 
   
   

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

[Bug 65332] New: AccessControlException when using Ant instead of ECJ to compile JSPs at runtime

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65332

Bug ID: 65332
   Summary: AccessControlException when using Ant instead of ECJ
to compile JSPs at runtime
   Product: Tomcat 9
   Version: 9.0.x
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
  Assignee: dev@tomcat.apache.org
  Reporter: csuth...@apache.org
  Target Milestone: -

I have one user that doesn't have ECJ available for their Tomcat installation
and uses Ant to compile JSPs at runtime. Upon switching over to Java 11 they
found that they get access exceptions when trying to access their JSPs at
runtime. You can reproduce this with a vanilla install (instructions below),
but I don't think the fix I'm using is the best.

To reproduce:
1) Install Tomcat and Java 11 (or later)
2) Delete ecj*.jar from $CATALINA_HOME/lib/
3) Add ant.jar and ant-launcher.jar to your $CATALINA_HOME/bin/setenv.sh, per
instructions at https://tomcat.apache.org/tomcat-9.0-doc/jasper-howto.html.
Note that tools.jar was removed in Java 9, so you can't add it; the doc needs
an amendment.
4) Start Tomcat with the Security Manager enabled using Java 11
5) Access localhost:8080/, which gets you the default ROOT/index.jsp and a HTTP
Status of 500 with a stack trace and AccessControlException

I fixed the issue in their testing environment by adding the code block
mentioned in the comments of
https://bugs.java.com/bugdatabase/view_bug.do?bug_id=JDK-8210274 to their
security policy. I'm not the best with java security, so I thought I'd open an
issue here and see if anyone has better or simpler ideas on how to make vanilla
Tomcat with Ant to compile JSPs work out of the box like it does with ECJ.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 7.0.x updated: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

[michaelo]

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

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


The following commit(s) were added to refs/heads/7.0.x by this push:
 new d283a04  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr
d283a04 is described below

commit d283a04f7e63035012183e76ebfa9e7a31eab040
Author: Michael Osipov 
AuthorDate: Tue May 25 20:14:19 2021 +0200

AprLifecycleListener does not show dev version suffix for libtcnative and 
libapr
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 12 +---
 webapps/docs/changelog.xml  |  4 
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index acf4301..4cc0955 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -220,8 +220,8 @@ public class AprLifecycleListener
 return;
 }
 if (apver < rqver) {
-log.error(sm.getString("aprListener.tcnInvalid", major + "."
-+ minor + "." + patch,
+log.error(sm.getString("aprListener.tcnInvalid",
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_REQUIRED_MINOR + "." +
 TCN_REQUIRED_PATCH));
@@ -237,17 +237,15 @@ public class AprLifecycleListener
 }
 if (apver < rcver) {
 initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
-major + "." + minor + "." + patch,
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_RECOMMENDED_MINOR + "." +
 TCN_RECOMMENDED_PV));
 }
 
 initInfoLogMessages.add(sm.getString("aprListener.tcnValid",
-major + "." + minor + "." + patch,
-Library.APR_MAJOR_VERSION + "." +
-Library.APR_MINOR_VERSION + "." +
-Library.APR_PATCH_VERSION));
+Library.versionString(),
+Library.aprVersionString()));
 
 // Log APR flags
 initInfoLogMessages.add(sm.getString("aprListener.flags",
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1994d8c..bbfc78a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -125,6 +125,10 @@
 63508: NPE in JNDIRealm when no 
userRoleAttribute
 is given. (fschumacher)
   
+  
+AprLifecycleListener does not show dev version suffix for libtcnative
+and libapr. (michaelo)
+  
 
   
   

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

[Bug 65330] NullPointerException on LDAP auth since tomcat 9.0.46 (works on 9.0.45)

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65330

sl...@aceslash.net changed:

   What|Removed |Added

 Resolution|DUPLICATE   |FIXED

--- Comment #2 from sl...@aceslash.net ---
Thank you for the workaround!

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch main updated: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

[michaelo]

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

michaelo 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 7929f10  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr
7929f10 is described below

commit 7929f10f12e7d9e958f16086e28928e9adc9af62
Author: Michael Osipov 
AuthorDate: Tue May 25 20:14:19 2021 +0200

AprLifecycleListener does not show dev version suffix for libtcnative and 
libapr
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 12 +---
 webapps/docs/changelog.xml  |  4 
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 6b6a8e7..ca6e4cd 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -213,8 +213,8 @@ public class AprLifecycleListener
 return;
 }
 if (apver < rqver) {
-log.error(sm.getString("aprListener.tcnInvalid", major + "."
-+ minor + "." + patch,
+log.error(sm.getString("aprListener.tcnInvalid",
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_REQUIRED_MINOR + "." +
 TCN_REQUIRED_PATCH));
@@ -230,17 +230,15 @@ public class AprLifecycleListener
 }
 if (apver < rcver) {
 initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
-major + "." + minor + "." + patch,
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_RECOMMENDED_MINOR + "." +
 TCN_RECOMMENDED_PV));
 }
 
 initInfoLogMessages.add(sm.getString("aprListener.tcnValid",
-major + "." + minor + "." + patch,
-Library.APR_MAJOR_VERSION + "." +
-Library.APR_MINOR_VERSION + "." +
-Library.APR_PATCH_VERSION));
+Library.versionString(),
+Library.aprVersionString()));
 
 // Log APR flags
 initInfoLogMessages.add(sm.getString("aprListener.flags",
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7f8b6ad..6e20426 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -156,6 +156,10 @@
 setAttribute(), getAttribute() and
 getAttributes() introduced in Servlet 5.1. (markt)
   
+  
+AprLifecycleListener does not show dev version suffix for libtcnative
+and libapr. (michaelo)
+  
 
   
   

-
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: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

[michaelo]

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

michaelo 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 018083f  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr
018083f is described below

commit 018083f93b0a6ad4fd8290959bebbb40cf1edd75
Author: Michael Osipov 
AuthorDate: Tue May 25 20:14:19 2021 +0200

AprLifecycleListener does not show dev version suffix for libtcnative and 
libapr
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 12 +---
 webapps/docs/changelog.xml  |  4 
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 0bde68c..1bd2e24 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -218,8 +218,8 @@ public class AprLifecycleListener
 return;
 }
 if (apver < rqver) {
-log.error(sm.getString("aprListener.tcnInvalid", major + "."
-+ minor + "." + patch,
+log.error(sm.getString("aprListener.tcnInvalid",
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_REQUIRED_MINOR + "." +
 TCN_REQUIRED_PATCH));
@@ -235,17 +235,15 @@ public class AprLifecycleListener
 }
 if (apver < rcver) {
 initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
-major + "." + minor + "." + patch,
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_RECOMMENDED_MINOR + "." +
 TCN_RECOMMENDED_PV));
 }
 
 initInfoLogMessages.add(sm.getString("aprListener.tcnValid",
-major + "." + minor + "." + patch,
-Library.APR_MAJOR_VERSION + "." +
-Library.APR_MINOR_VERSION + "." +
-Library.APR_PATCH_VERSION));
+Library.versionString(),
+Library.aprVersionString()));
 
 // Log APR flags
 initInfoLogMessages.add(sm.getString("aprListener.flags",
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4e0e299..72311eb 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,10 @@
 it does not contain a charset. Also remove the outdated workaround for
 the buggy Adobe Reader 9 plug-in for IE. (markt)
   
+  
+AprLifecycleListener does not show dev version suffix for libtcnative
+and libapr. (michaelo)
+  
 
   
   

-
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: AprLifecycleListener does not show dev version suffix for libtcnative and libapr

[michaelo]

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

michaelo 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 9745d4b  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr
9745d4b is described below

commit 9745d4b5eda124a3fc7f843a8d7d99bb164b36ca
Author: Michael Osipov 
AuthorDate: Tue May 25 20:14:19 2021 +0200

AprLifecycleListener does not show dev version suffix for libtcnative and 
libapr
---
 java/org/apache/catalina/core/AprLifecycleListener.java | 12 +---
 webapps/docs/changelog.xml  |  4 
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java 
b/java/org/apache/catalina/core/AprLifecycleListener.java
index 51c8308..b8ddb71 100644
--- a/java/org/apache/catalina/core/AprLifecycleListener.java
+++ b/java/org/apache/catalina/core/AprLifecycleListener.java
@@ -213,8 +213,8 @@ public class AprLifecycleListener
 return;
 }
 if (apver < rqver) {
-log.error(sm.getString("aprListener.tcnInvalid", major + "."
-+ minor + "." + patch,
+log.error(sm.getString("aprListener.tcnInvalid",
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_REQUIRED_MINOR + "." +
 TCN_REQUIRED_PATCH));
@@ -230,17 +230,15 @@ public class AprLifecycleListener
 }
 if (apver < rcver) {
 initInfoLogMessages.add(sm.getString("aprListener.tcnVersion",
-major + "." + minor + "." + patch,
+Library.versionString(),
 TCN_REQUIRED_MAJOR + "." +
 TCN_RECOMMENDED_MINOR + "." +
 TCN_RECOMMENDED_PV));
 }
 
 initInfoLogMessages.add(sm.getString("aprListener.tcnValid",
-major + "." + minor + "." + patch,
-Library.APR_MAJOR_VERSION + "." +
-Library.APR_MINOR_VERSION + "." +
-Library.APR_PATCH_VERSION));
+Library.versionString(),
+Library.aprVersionString()));
 
 // Log APR flags
 initInfoLogMessages.add(sm.getString("aprListener.flags",
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 043903f..bfa9611 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -144,6 +144,10 @@
 it does not contain a charset. Also remove the outdated workaround for
 the buggy Adobe Reader 9 plug-in for IE. (markt)
   
+  
+AprLifecycleListener does not show dev version suffix for libtcnative
+and libapr. (michaelo)
+  
 
   
   

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

[tomcat] 01/03: Align with other languages

[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 de456f50c85e7952275802863b2f9f61b949f9b0
Author: Mark Thomas 
AuthorDate: Tue May 25 20:44:40 2021 +0100

Align with other languages
---
 java/org/apache/jasper/resources/LocalStrings_ja.properties | 4 
 java/org/apache/jasper/resources/LocalStrings_ko.properties | 4 
 2 files changed, 8 deletions(-)

diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties 
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 3990cf5..25dbe0a 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -372,18 +372,15 @@ jspc.webfrg.header=\n\
 \n\
-\n\
 \n
 jspc.webinc.footer=\n\
-\n\
 \n
 jspc.webinc.header=\n\
 \n\
-\n\
 \n
 jspc.webinc.insertEnd=
 jspc.webinc.insertStart=
@@ -400,7 +397,6 @@ jspc.webxml.header=\n\
 \n\
-\n\
 \n
 
 jstl.OSAfterWriter=Writer が使用されている場合は出力ストリームを使用できません。
diff --git a/java/org/apache/jasper/resources/LocalStrings_ko.properties 
b/java/org/apache/jasper/resources/LocalStrings_ko.properties
index fba9176..44f4893 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ko.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ko.properties
@@ -374,18 +374,15 @@ jspc.webfrg.header=\n\
 \n\
-\n\
 \n
 jspc.webinc.footer=\n\
-\n\
 \n
 jspc.webinc.header=\n\
 \n\
-\n\
 \n
 jspc.webinc.insertEnd=
 jspc.webinc.insertStart=
@@ -402,7 +399,6 @@ jspc.webxml.header=\n\
 \n\
-\n\
 \n
 
 jstl.OSAfterWriter=만일 writer가 이미 사용된 경우에는, 출력 스트림을 사용할 수 없습니다.

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

[tomcat] 02/03: Update import/export to handle POEditor behaviours

[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 3199da4a8ba72112d882a9f23d65953d1954606b
Author: Mark Thomas 
AuthorDate: Tue May 25 22:02:42 2021 +0100

Update import/export to handle POEditor behaviours

The end results for
Tomcat-Export->Tomcat-Import
and
Tomcat-Export->POEditor-Import->POEditor-Export->Tomcat-Import
are now much more similar
---
 .../apache/tomcat/buildutil/translate/Import.java  |  2 +-
 .../apache/tomcat/buildutil/translate/Utils.java   | 53 --
 .../tomcat/buildutil/translate/TestUtils.java  | 39 ++--
 3 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java 
b/java/org/apache/tomcat/buildutil/translate/Import.java
index ae40353..e1fe9a3 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -82,7 +82,7 @@ public class Import {
 w.write(System.lineSeparator());
 }
 
-w.write(cKey.key + "=" + Utils.formatValue(value));
+w.write(cKey.key + "=" + Utils.formatValueImport(value));
 w.write(System.lineSeparator());
 }
 if (w != null) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java 
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 326d7fc..4550448 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -32,9 +32,10 @@ import java.util.regex.Pattern;
 
 public class Utils {
 
-private static final Pattern ADD_CONTINUATION = Pattern.compile("\\n", 
Pattern.MULTILINE);
 private static final Pattern ESCAPE_LEADING_SPACE = 
Pattern.compile("^(\\s)", Pattern.MULTILINE);
-private static final Pattern FIX_SINGLE_QUOTE = 
Pattern.compile("(?\\n", 
Utils.formatValueImport("\\n\\\n\\n"));
+}
+
+@Test
+public void testFormatValue02() {
+// Import from POEditor
+Assert.assertEquals("\\n\\\n\\n", 
Utils.formatValueImport("\\n\\n"));
+}
+
+@Test
+public void testFormatValue03() {
+// Export from Tomcat
+Assert.assertEquals("line1\\n\\\nline2\\n\\\nline3", 
Utils.formatValueExport("line1\nline2\nline3"));
+}
+
+@Test
+public void testFormatValue04() {
+// Export from Tomcat
+Assert.assertEquals(Utils.PADDING + "\\n\\\nline2\\n\\\nline3", 
Utils.formatValueExport("\nline2\nline3"));
+}
+
+@Test
+public void testFormatValue05() {
+// Export from Tomcat
+Assert.assertEquals("line1\\n\\\n\\tline2\\n\\\n\\tline3", 
Utils.formatValueExport("line1\n\tline2\n\tline3"));
+}
 }

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

[tomcat] branch main updated (7929f10 -> 1bd131c)

[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 7929f10  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr
 new de456f5  Align with other languages
 new 3199da4  Update import/export to handle POEditor behaviours
 new 1bd131c  Add a couple of French translations

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


Summary of changes:
 .../jasper/resources/LocalStrings_fr.properties|  2 +
 .../jasper/resources/LocalStrings_ja.properties|  4 --
 .../jasper/resources/LocalStrings_ko.properties|  4 --
 .../apache/tomcat/buildutil/translate/Import.java  |  2 +-
 .../apache/tomcat/buildutil/translate/Utils.java   | 53 --
 .../tomcat/buildutil/translate/TestUtils.java  | 39 ++--
 6 files changed, 77 insertions(+), 27 deletions(-)

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

Re: POEditor translations currently corrupted

[Mark Thomas]

On 25/05/2021 18:16, Mark Thomas wrote:

All,

The translations we manage via POEditor are currently corrupted. This is 
entirely my fault. In trying to fix a small bug, I introduced a bigger one.


No translations have been lost. Reverting my fix and re-exporting the 
translations from a clean git checkout will restore everything. However, 
I would still like to fix the small bug so I'll be working on this for 
the next few hours which means the translations will remain corrupted 
for that time.


I'll post again when the translations have been restored. Hopefully with 
the small bug fixed as well.


All fixed.

Mark

-
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 (018083f -> 8404dea)

[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 018083f  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr
 new 5ca6279  Update import/export to handle POEditor behaviours
 new 8404dea  Back-port translation updates

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


Summary of changes:
 java/org/apache/coyote/LocalStrings_fr.properties  |  1 +
 java/org/apache/coyote/LocalStrings_ko.properties  |  1 +
 .../jasper/resources/LocalStrings_fr.properties|  2 +
 .../jasper/resources/LocalStrings_ja.properties|  2 -
 .../jasper/resources/LocalStrings_ko.properties|  2 -
 .../apache/tomcat/buildutil/translate/Import.java  |  2 +-
 .../apache/tomcat/buildutil/translate/Utils.java   | 53 --
 .../tomcat/websocket/LocalStrings_fr.properties|  5 ++
 .../tomcat/websocket/LocalStrings_ko.properties|  5 ++
 .../websocket/pojo/LocalStrings_fr.properties  |  2 +
 .../websocket/pojo/LocalStrings_ko.properties  |  2 +
 webapps/docs/changelog.xml | 10 
 12 files changed, 69 insertions(+), 18 deletions(-)

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

[tomcat] 02/02: Back-port translation updates

[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 8404deaf470081c29c981109f87995862245bcad
Author: Mark Thomas 
AuthorDate: Tue May 25 22:28:27 2021 +0100

Back-port translation updates
---
 java/org/apache/coyote/LocalStrings_fr.properties  |  1 +
 java/org/apache/coyote/LocalStrings_ko.properties  |  1 +
 java/org/apache/jasper/resources/LocalStrings_fr.properties|  2 ++
 java/org/apache/jasper/resources/LocalStrings_ja.properties|  2 --
 java/org/apache/jasper/resources/LocalStrings_ko.properties|  2 --
 java/org/apache/tomcat/websocket/LocalStrings_fr.properties|  5 +
 java/org/apache/tomcat/websocket/LocalStrings_ko.properties|  5 +
 .../apache/tomcat/websocket/pojo/LocalStrings_fr.properties|  2 ++
 .../apache/tomcat/websocket/pojo/LocalStrings_ko.properties|  2 ++
 webapps/docs/changelog.xml | 10 ++
 10 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/coyote/LocalStrings_fr.properties 
b/java/org/apache/coyote/LocalStrings_fr.properties
index 22e4e10..5b1a46f 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -48,6 +48,7 @@ abstractProtocolHandler.start=Démarrage du gestionnaire de 
protocole [{0}]
 abstractProtocolHandler.stop=Arrêt du gestionnaire de protocole [{0}]
 
 asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour 
une requête dans l''état Async [{1}]
+asyncStateMachine.stateChange=Changement de l''état async de [{0}] à [{1}]
 
 compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête 
Content-Encoding en vérifiant si la compression était déjà utilisée
 
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties 
b/java/org/apache/coyote/LocalStrings_ko.properties
index 27b55b7..9db20d2 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -48,6 +48,7 @@ abstractProtocolHandler.start=프로토콜 핸들러 [{0}]을(를) 시작합니
 abstractProtocolHandler.stop=프로토콜 핸들러 [{0}]을(를) 중지시킵니다.
 
 asyncStateMachine.invalidAsyncState=비동기 상태가 [{1}]인 요청에 대하여, [{0}]을(를) 호출하는 것은 
유효하지 않습니다.
+asyncStateMachine.stateChange=비동기 상태를 [{0}]에서 [{1}](으)로 변경합니다.
 
 compressionConfig.ContentEncodingParseFail=압축이 이미 사용되는지 여부를 점검하는 중, 
Content-Encoding 헤더를 파싱하지 못했습니다.
 
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 9419b02..1902a69 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -187,6 +187,7 @@ jsp.error.simpletag.badbodycontent=La TLD de la classe 
[{0}] spécifie un body-c
 jsp.error.single.line.number=Une erreur s''est produite à la ligne : [{0}] 
dans le fichier jsp : [{1}]
 jsp.error.stream.close.failed=Erreur à la fermeture du flux
 jsp.error.stream.closed=Flux fermé
+jsp.error.string_interpreter_class.instantiation=Impossible de charger ou 
d''instancier la classe du StringInterpreter [{0}]
 jsp.error.tag.conflict.attr=Directive de tag : il est illégal d''avoir 
plusieurs occurrences de l''attribut [{0}] avec des valeurs différentes 
(ancienne : [{1}], nouvelle [{2}])
 jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Directive de tag : il 
est illégal d''avoir plusieurs occurrences de "deferredSyntaxAllowedAsLiteral" 
avec des valeurs différentes (ancienne : [{0}], nouvelle [{1}])
 jsp.error.tag.conflict.iselignored=Directive de tag : il est illégal d''avoir 
plusieurs occurrences de "isELIgnored" avec des valeurs différentes (ancienne : 
[{0}], nouvelle [{1}])
@@ -283,6 +284,7 @@ jsp.warning.strictQuoteEscaping=WARNING : Valeur invalide 
pour le paramètre d'i
 jsp.warning.suppressSmap=WARNING : valeur invalide d' l'initParam 
suppressSmap. La valeur par défaut "false" sera utilisée
 jsp.warning.tagPreDestroy=Erreur lors du traitement de preDestroy pour 
l''instance de tag [{0}]
 jsp.warning.tagRelease=Erreur lors du traitement de release pour l''instance 
de tag [{0}]
+jsp.warning.trimspaces=WARNING : Valeur invalide pour le paramètre 
d'initialisation trimSpaces, la valeur par défaut "false" sera utilisée
 jsp.warning.unknown.sourceVM=La VM source [{0}] inconnue a été ignorée
 jsp.warning.unknown.targetVM=La VM cible [{0}] inconnue a été ignorée
 jsp.warning.unsupported.sourceVM=La VM source [{0}] demandée n''est pas 
supportée, [{1}] sera utilisé
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties 
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 083742c..4abfae4 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -376,13 +376,11 @@ jspc.webfrg.footer=\n\
 

[tomcat] 01/02: Update import/export to handle POEditor behaviours

[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 5ca6279c7c23e2528ec0fc95894305fdf938760e
Author: Mark Thomas 
AuthorDate: Tue May 25 22:02:42 2021 +0100

Update import/export to handle POEditor behaviours

The end results for
Tomcat-Export->Tomcat-Import
and
Tomcat-Export->POEditor-Import->POEditor-Export->Tomcat-Import
are now much more similar
---
 .../apache/tomcat/buildutil/translate/Import.java  |  2 +-
 .../apache/tomcat/buildutil/translate/Utils.java   | 53 --
 2 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java 
b/java/org/apache/tomcat/buildutil/translate/Import.java
index 3733248..1dcdd12 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -78,7 +78,7 @@ public class Import {
 w.write(System.lineSeparator());
 }
 
-w.write(cKey.key + "=" + Utils.formatValue(value));
+w.write(cKey.key + "=" + Utils.formatValueImport(value));
 w.write(System.lineSeparator());
 }
 if (w != null) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java 
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 63d3947..80a7756 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -32,9 +32,10 @@ import java.util.regex.Pattern;
 
 public class Utils {
 
-private static final Pattern ADD_CONTINUATION = Pattern.compile("\\n", 
Pattern.MULTILINE);
 private static final Pattern ESCAPE_LEADING_SPACE = 
Pattern.compile("^(\\s)", Pattern.MULTILINE);
-private static final Pattern FIX_SINGLE_QUOTE = 
Pattern.compile("(?

[Bug 65329] Incorrect handling for WINVER in NMAKEmakefile

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=65329

--- Comment #1 from Michael Osipov  ---
Yet another resource:
https://docs.microsoft.com/en-us/windows/win32/winprog/using-the-windows-headers

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in on tomcat-85-trunk

[buildbot]

The Buildbot has detected a restored build on builder tomcat-85-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-85-trunk/builds/2743

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' 
triggered this build
Build Source Stamp: [branch 8.5.x] 018083f93b0a6ad4fd8290959bebbb40cf1edd75
Blamelist: Michael Osipov 

Build succeeded!

Sincerely,
 -The Buildbot




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

[tomcat] 03/03: Add a couple of French translations

[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 1bd131c126bb60b29cb677d3d107e3bb68c0a64a
Author: Mark Thomas 
AuthorDate: Tue May 25 22:02:53 2021 +0100

Add a couple of French translations
---
 java/org/apache/jasper/resources/LocalStrings_fr.properties | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 4329375..19dd49f 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -197,6 +197,7 @@ jsp.error.simpletag.badbodycontent=La TLD de la classe 
[{0}] spécifie un body-c
 jsp.error.single.line.number=Une erreur s''est produite à la ligne : [{0}] 
dans le fichier jsp : [{1}]
 jsp.error.stream.close.failed=Erreur à la fermeture du flux
 jsp.error.stream.closed=Flux fermé
+jsp.error.string_interpreter_class.instantiation=Impossible de charger ou 
d''instancier la classe du StringInterpreter [{0}]
 jsp.error.tag.conflict.attr=Directive de tag : il est illégal d''avoir 
plusieurs occurrences de l''attribut [{0}] avec des valeurs différentes 
(ancienne : [{1}], nouvelle [{2}])
 jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Directive de tag : il 
est illégal d''avoir plusieurs occurrences de "deferredSyntaxAllowedAsLiteral" 
avec des valeurs différentes (ancienne : [{0}], nouvelle [{1}])
 jsp.error.tag.conflict.iselignored=Directive de tag : il est illégal d''avoir 
plusieurs occurrences de "isELIgnored" avec des valeurs différentes (ancienne : 
[{0}], nouvelle [{1}])
@@ -300,6 +301,7 @@ jsp.warning.strictWhitespace=WARNING : Valeur invalide pour 
le paramètre d'init
 jsp.warning.suppressSmap=WARNING : valeur invalide d' l'initParam 
suppressSmap. La valeur par défaut "false" sera utilisée
 jsp.warning.tagPreDestroy=Erreur lors du traitement de preDestroy pour 
l''instance de tag [{0}]
 jsp.warning.tagRelease=Erreur lors du traitement de release pour l''instance 
de tag [{0}]
+jsp.warning.trimspaces=WARNING : Valeur invalide pour le paramètre 
d'initialisation trimSpaces, la valeur par défaut "false" sera utilisée
 jsp.warning.unknown.sourceVM=La VM source [{0}] inconnue a été ignorée
 jsp.warning.unknown.targetVM=La VM cible [{0}] inconnue a été ignorée
 jsp.warning.unsupported.sourceVM=La VM source [{0}] demandée n''est pas 
supportée, [{1}] sera utilisé

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

[tomcat] 02/02: Back-port translation updates

[markt]

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

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

commit 626e0903f784d50b733ef7cec40ec48f94466de2
Author: Mark Thomas 
AuthorDate: Tue May 25 22:13:24 2021 +0100

Back-port translation updates
---
 java/org/apache/coyote/LocalStrings_fr.properties  |  1 +
 java/org/apache/coyote/LocalStrings_ko.properties  |  1 +
 java/org/apache/jasper/resources/LocalStrings_fr.properties|  2 ++
 java/org/apache/jasper/resources/LocalStrings_ja.properties|  4 
 java/org/apache/jasper/resources/LocalStrings_ko.properties|  4 
 java/org/apache/tomcat/websocket/LocalStrings_fr.properties|  5 +
 java/org/apache/tomcat/websocket/LocalStrings_ko.properties|  5 +
 .../apache/tomcat/websocket/pojo/LocalStrings_fr.properties|  2 ++
 .../apache/tomcat/websocket/pojo/LocalStrings_ko.properties|  2 ++
 webapps/docs/changelog.xml | 10 ++
 10 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/java/org/apache/coyote/LocalStrings_fr.properties 
b/java/org/apache/coyote/LocalStrings_fr.properties
index f11cd6d..b40dadd 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -52,6 +52,7 @@ abstractProtocolHandler.start=Démarrage du gestionnaire de 
protocole [{0}]
 abstractProtocolHandler.stop=Arrêt du gestionnaire de protocole [{0}]
 
 asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour 
une requête dans l''état Async [{1}]
+asyncStateMachine.stateChange=Changement de l''état async de [{0}] à [{1}]
 
 compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête 
Content-Encoding en vérifiant si la compression était déjà utilisée
 
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties 
b/java/org/apache/coyote/LocalStrings_ko.properties
index 669647a..6847030 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -52,6 +52,7 @@ abstractProtocolHandler.start=프로토콜 핸들러 [{0}]을(를) 시작합니
 abstractProtocolHandler.stop=프로토콜 핸들러 [{0}]을(를) 중지시킵니다.
 
 asyncStateMachine.invalidAsyncState=비동기 상태가 [{1}]인 요청에 대하여, [{0}]을(를) 호출하는 것은 
유효하지 않습니다.
+asyncStateMachine.stateChange=비동기 상태를 [{0}]에서 [{1}](으)로 변경합니다.
 
 compressionConfig.ContentEncodingParseFail=압축이 이미 사용되는지 여부를 점검하는 중, 
Content-Encoding 헤더를 파싱하지 못했습니다.
 
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index 4329375..19dd49f 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -197,6 +197,7 @@ jsp.error.simpletag.badbodycontent=La TLD de la classe 
[{0}] spécifie un body-c
 jsp.error.single.line.number=Une erreur s''est produite à la ligne : [{0}] 
dans le fichier jsp : [{1}]
 jsp.error.stream.close.failed=Erreur à la fermeture du flux
 jsp.error.stream.closed=Flux fermé
+jsp.error.string_interpreter_class.instantiation=Impossible de charger ou 
d''instancier la classe du StringInterpreter [{0}]
 jsp.error.tag.conflict.attr=Directive de tag : il est illégal d''avoir 
plusieurs occurrences de l''attribut [{0}] avec des valeurs différentes 
(ancienne : [{1}], nouvelle [{2}])
 jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Directive de tag : il 
est illégal d''avoir plusieurs occurrences de "deferredSyntaxAllowedAsLiteral" 
avec des valeurs différentes (ancienne : [{0}], nouvelle [{1}])
 jsp.error.tag.conflict.iselignored=Directive de tag : il est illégal d''avoir 
plusieurs occurrences de "isELIgnored" avec des valeurs différentes (ancienne : 
[{0}], nouvelle [{1}])
@@ -300,6 +301,7 @@ jsp.warning.strictWhitespace=WARNING : Valeur invalide pour 
le paramètre d'init
 jsp.warning.suppressSmap=WARNING : valeur invalide d' l'initParam 
suppressSmap. La valeur par défaut "false" sera utilisée
 jsp.warning.tagPreDestroy=Erreur lors du traitement de preDestroy pour 
l''instance de tag [{0}]
 jsp.warning.tagRelease=Erreur lors du traitement de release pour l''instance 
de tag [{0}]
+jsp.warning.trimspaces=WARNING : Valeur invalide pour le paramètre 
d'initialisation trimSpaces, la valeur par défaut "false" sera utilisée
 jsp.warning.unknown.sourceVM=La VM source [{0}] inconnue a été ignorée
 jsp.warning.unknown.targetVM=La VM cible [{0}] inconnue a été ignorée
 jsp.warning.unsupported.sourceVM=La VM source [{0}] demandée n''est pas 
supportée, [{1}] sera utilisé
diff --git a/java/org/apache/jasper/resources/LocalStrings_ja.properties 
b/java/org/apache/jasper/resources/LocalStrings_ja.properties
index 3990cf5..25dbe0a 100644
--- a/java/org/apache/jasper/resources/LocalStrings_ja.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_ja.properties
@@ -372,18 +372,15 @@ jspc.webfrg.header=\n\
 \n\
-\n\

[tomcat] branch 10.0.x updated (f5e5091 -> 626e090)

[markt]

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

markt pushed a change to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from f5e5091  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr
 new 43e919f  Update import/export to handle POEditor behaviours
 new 626e090  Back-port translation updates

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


Summary of changes:
 java/org/apache/coyote/LocalStrings_fr.properties  |  1 +
 java/org/apache/coyote/LocalStrings_ko.properties  |  1 +
 .../jasper/resources/LocalStrings_fr.properties|  2 +
 .../jasper/resources/LocalStrings_ja.properties|  4 --
 .../jasper/resources/LocalStrings_ko.properties|  4 --
 .../apache/tomcat/buildutil/translate/Import.java  |  2 +-
 .../apache/tomcat/buildutil/translate/Utils.java   | 53 --
 .../tomcat/websocket/LocalStrings_fr.properties|  5 ++
 .../tomcat/websocket/LocalStrings_ko.properties|  5 ++
 .../websocket/pojo/LocalStrings_fr.properties  |  2 +
 .../websocket/pojo/LocalStrings_ko.properties  |  2 +
 .../tomcat/buildutil/translate/TestUtils.java  | 39 ++--
 webapps/docs/changelog.xml | 10 
 13 files changed, 103 insertions(+), 27 deletions(-)

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

[tomcat] 01/02: Update import/export to handle POEditor behaviours

[markt]

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

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

commit 43e919f90952356513443c4ce804fe80c711c72f
Author: Mark Thomas 
AuthorDate: Tue May 25 22:02:42 2021 +0100

Update import/export to handle POEditor behaviours

The end results for
Tomcat-Export->Tomcat-Import
and
Tomcat-Export->POEditor-Import->POEditor-Export->Tomcat-Import
are now much more similar
---
 .../apache/tomcat/buildutil/translate/Import.java  |  2 +-
 .../apache/tomcat/buildutil/translate/Utils.java   | 53 --
 .../tomcat/buildutil/translate/TestUtils.java  | 39 ++--
 3 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java 
b/java/org/apache/tomcat/buildutil/translate/Import.java
index ae40353..e1fe9a3 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -82,7 +82,7 @@ public class Import {
 w.write(System.lineSeparator());
 }
 
-w.write(cKey.key + "=" + Utils.formatValue(value));
+w.write(cKey.key + "=" + Utils.formatValueImport(value));
 w.write(System.lineSeparator());
 }
 if (w != null) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java 
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 326d7fc..4550448 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -32,9 +32,10 @@ import java.util.regex.Pattern;
 
 public class Utils {
 
-private static final Pattern ADD_CONTINUATION = Pattern.compile("\\n", 
Pattern.MULTILINE);
 private static final Pattern ESCAPE_LEADING_SPACE = 
Pattern.compile("^(\\s)", Pattern.MULTILINE);
-private static final Pattern FIX_SINGLE_QUOTE = 
Pattern.compile("(?\\n", 
Utils.formatValueImport("\\n\\\n\\n"));
+}
+
+@Test
+public void testFormatValue02() {
+// Import from POEditor
+Assert.assertEquals("\\n\\\n\\n", 
Utils.formatValueImport("\\n\\n"));
+}
+
+@Test
+public void testFormatValue03() {
+// Export from Tomcat
+Assert.assertEquals("line1\\n\\\nline2\\n\\\nline3", 
Utils.formatValueExport("line1\nline2\nline3"));
+}
+
+@Test
+public void testFormatValue04() {
+// Export from Tomcat
+Assert.assertEquals(Utils.PADDING + "\\n\\\nline2\\n\\\nline3", 
Utils.formatValueExport("\nline2\nline3"));
+}
+
+@Test
+public void testFormatValue05() {
+// Export from Tomcat
+Assert.assertEquals("line1\\n\\\n\\tline2\\n\\\n\\tline3", 
Utils.formatValueExport("line1\n\tline2\n\tline3"));
+}
 }

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

[tomcat] 02/02: Back-port updates to translations

[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 83fd28ec2c3de0f91ee4e791b48d476fa5c9badc
Author: Mark Thomas 
AuthorDate: Tue May 25 22:22:33 2021 +0100

Back-port updates to translations
---
 java/org/apache/catalina/core/LocalStrings_fr.properties   |  2 +-
 java/org/apache/coyote/LocalStrings_fr.properties  |  1 +
 java/org/apache/coyote/LocalStrings_ko.properties  |  1 +
 java/org/apache/jasper/resources/LocalStrings_fr.properties|  2 ++
 java/org/apache/jasper/resources/LocalStrings_ja.properties|  2 --
 java/org/apache/jasper/resources/LocalStrings_ko.properties|  2 --
 java/org/apache/tomcat/util/net/LocalStrings_fr.properties |  1 +
 java/org/apache/tomcat/util/net/LocalStrings_ja.properties |  1 +
 java/org/apache/tomcat/util/net/LocalStrings_ko.properties |  1 +
 java/org/apache/tomcat/util/net/LocalStrings_zh_CN.properties  |  1 +
 java/org/apache/tomcat/websocket/LocalStrings_fr.properties|  5 +
 java/org/apache/tomcat/websocket/LocalStrings_ko.properties|  5 +
 .../apache/tomcat/websocket/pojo/LocalStrings_fr.properties|  2 ++
 .../apache/tomcat/websocket/pojo/LocalStrings_ko.properties|  2 ++
 webapps/docs/changelog.xml | 10 ++
 15 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/catalina/core/LocalStrings_fr.properties 
b/java/org/apache/catalina/core/LocalStrings_fr.properties
index daa194e..eba024d 100644
--- a/java/org/apache/catalina/core/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/core/LocalStrings_fr.properties
@@ -75,7 +75,7 @@ aprListener.aprInitError=La librairie Apache Tomcat Native 
basée sur APR n''a p
 aprListener.config=Configuration de APR/OpenSSL : useAprConnector [{0}], 
useOpenSSL [{1}]
 aprListener.currentFIPSMode=Mode FIPS actuel : [{0}]
 aprListener.enterAlreadyInFIPSMode=AprLifecycleListener est configuré pour 
forcer le mode FIPS mais la librairie est déjà en mode FIPS [{0}]
-aprListener.flags=Fonctionnalités d''APR : IPv6 [{0}], sendfile [{1}], accept 
filters [{2}], random [{3}, UDS [{4}]]
+aprListener.flags=Fonctionnalités d''APR : IPv6 [{0}], sendfile [{1}], accept 
filters [{2}], random [{3}], UDS [{4}]
 aprListener.initializeFIPSFailed=Echec d'entrée en mode FIPS
 aprListener.initializeFIPSSuccess=Entrée avec succès en mode FIPS
 aprListener.initializedOpenSSL=OpenSSL a été initialisé avec succès [{0}]
diff --git a/java/org/apache/coyote/LocalStrings_fr.properties 
b/java/org/apache/coyote/LocalStrings_fr.properties
index f11cd6d..b40dadd 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -52,6 +52,7 @@ abstractProtocolHandler.start=Démarrage du gestionnaire de 
protocole [{0}]
 abstractProtocolHandler.stop=Arrêt du gestionnaire de protocole [{0}]
 
 asyncStateMachine.invalidAsyncState=L''appel à [{0}] n''est pas valide pour 
une requête dans l''état Async [{1}]
+asyncStateMachine.stateChange=Changement de l''état async de [{0}] à [{1}]
 
 compressionConfig.ContentEncodingParseFail=Echec du traitement de l'en-tête 
Content-Encoding en vérifiant si la compression était déjà utilisée
 
diff --git a/java/org/apache/coyote/LocalStrings_ko.properties 
b/java/org/apache/coyote/LocalStrings_ko.properties
index 669647a..6847030 100644
--- a/java/org/apache/coyote/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/LocalStrings_ko.properties
@@ -52,6 +52,7 @@ abstractProtocolHandler.start=프로토콜 핸들러 [{0}]을(를) 시작합니
 abstractProtocolHandler.stop=프로토콜 핸들러 [{0}]을(를) 중지시킵니다.
 
 asyncStateMachine.invalidAsyncState=비동기 상태가 [{1}]인 요청에 대하여, [{0}]을(를) 호출하는 것은 
유효하지 않습니다.
+asyncStateMachine.stateChange=비동기 상태를 [{0}]에서 [{1}](으)로 변경합니다.
 
 compressionConfig.ContentEncodingParseFail=압축이 이미 사용되는지 여부를 점검하는 중, 
Content-Encoding 헤더를 파싱하지 못했습니다.
 
diff --git a/java/org/apache/jasper/resources/LocalStrings_fr.properties 
b/java/org/apache/jasper/resources/LocalStrings_fr.properties
index c1586fe..45d3c77 100644
--- a/java/org/apache/jasper/resources/LocalStrings_fr.properties
+++ b/java/org/apache/jasper/resources/LocalStrings_fr.properties
@@ -197,6 +197,7 @@ jsp.error.simpletag.badbodycontent=La TLD de la classe 
[{0}] spécifie un body-c
 jsp.error.single.line.number=Une erreur s''est produite à la ligne : [{0}] 
dans le fichier jsp : [{1}]
 jsp.error.stream.close.failed=Erreur à la fermeture du flux
 jsp.error.stream.closed=Flux fermé
+jsp.error.string_interpreter_class.instantiation=Impossible de charger ou 
d''instancier la classe du StringInterpreter [{0}]
 jsp.error.tag.conflict.attr=Directive de tag : il est illégal d''avoir 
plusieurs occurrences de l''attribut [{0}] avec des valeurs différentes 
(ancienne : [{1}], nouvelle [{2}])
 jsp.error.tag.conflict.deferredsyntaxallowedasliteral=Directive de tag : il 
est illégal 

[tomcat] branch 9.0.x updated (9745d4b -> 83fd28e)

[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 9745d4b  AprLifecycleListener does not show dev version suffix for 
libtcnative and libapr
 new 5e4525c  Update import/export to handle POEditor behaviours
 new 83fd28e  Back-port updates to translations

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:
 .../catalina/core/LocalStrings_fr.properties   |  2 +-
 java/org/apache/coyote/LocalStrings_fr.properties  |  1 +
 java/org/apache/coyote/LocalStrings_ko.properties  |  1 +
 .../jasper/resources/LocalStrings_fr.properties|  2 +
 .../jasper/resources/LocalStrings_ja.properties|  2 -
 .../jasper/resources/LocalStrings_ko.properties|  2 -
 .../apache/tomcat/buildutil/translate/Import.java  |  2 +-
 .../apache/tomcat/buildutil/translate/Utils.java   | 53 --
 .../tomcat/util/net/LocalStrings_fr.properties |  1 +
 .../tomcat/util/net/LocalStrings_ja.properties |  1 +
 .../tomcat/util/net/LocalStrings_ko.properties |  1 +
 .../tomcat/util/net/LocalStrings_zh_CN.properties  |  1 +
 .../tomcat/websocket/LocalStrings_fr.properties|  5 ++
 .../tomcat/websocket/LocalStrings_ko.properties|  5 ++
 .../websocket/pojo/LocalStrings_fr.properties  |  2 +
 .../websocket/pojo/LocalStrings_ko.properties  |  2 +
 .../tomcat/buildutil/translate/TestUtils.java  | 39 ++--
 webapps/docs/changelog.xml | 10 
 18 files changed, 108 insertions(+), 24 deletions(-)

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

[tomcat] 01/02: Update import/export to handle POEditor behaviours

[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 5e4525c4cf96954add9f116bdfb3782388f9d8e4
Author: Mark Thomas 
AuthorDate: Tue May 25 22:02:42 2021 +0100

Update import/export to handle POEditor behaviours

The end results for
Tomcat-Export->Tomcat-Import
and
Tomcat-Export->POEditor-Import->POEditor-Export->Tomcat-Import
are now much more similar
---
 .../apache/tomcat/buildutil/translate/Import.java  |  2 +-
 .../apache/tomcat/buildutil/translate/Utils.java   | 53 --
 .../tomcat/buildutil/translate/TestUtils.java  | 39 ++--
 3 files changed, 75 insertions(+), 19 deletions(-)

diff --git a/java/org/apache/tomcat/buildutil/translate/Import.java 
b/java/org/apache/tomcat/buildutil/translate/Import.java
index 3733248..1dcdd12 100644
--- a/java/org/apache/tomcat/buildutil/translate/Import.java
+++ b/java/org/apache/tomcat/buildutil/translate/Import.java
@@ -78,7 +78,7 @@ public class Import {
 w.write(System.lineSeparator());
 }
 
-w.write(cKey.key + "=" + Utils.formatValue(value));
+w.write(cKey.key + "=" + Utils.formatValueImport(value));
 w.write(System.lineSeparator());
 }
 if (w != null) {
diff --git a/java/org/apache/tomcat/buildutil/translate/Utils.java 
b/java/org/apache/tomcat/buildutil/translate/Utils.java
index 63d3947..80a7756 100644
--- a/java/org/apache/tomcat/buildutil/translate/Utils.java
+++ b/java/org/apache/tomcat/buildutil/translate/Utils.java
@@ -32,9 +32,10 @@ import java.util.regex.Pattern;
 
 public class Utils {
 
-private static final Pattern ADD_CONTINUATION = Pattern.compile("\\n", 
Pattern.MULTILINE);
 private static final Pattern ESCAPE_LEADING_SPACE = 
Pattern.compile("^(\\s)", Pattern.MULTILINE);
-private static final Pattern FIX_SINGLE_QUOTE = 
Pattern.compile("(?\\n", 
Utils.formatValueImport("\\n\\\n\\n"));
+}
+
+@Test
+public void testFormatValue02() {
+// Import from POEditor
+Assert.assertEquals("\\n\\\n\\n", 
Utils.formatValueImport("\\n\\n"));
+}
+
+@Test
+public void testFormatValue03() {
+// Export from Tomcat
+Assert.assertEquals("line1\\n\\\nline2\\n\\\nline3", 
Utils.formatValueExport("line1\nline2\nline3"));
+}
+
+@Test
+public void testFormatValue04() {
+// Export from Tomcat
+Assert.assertEquals(Utils.PADDING + "\\n\\\nline2\\n\\\nline3", 
Utils.formatValueExport("\nline2\nline3"));
+}
+
+@Test
+public void testFormatValue05() {
+// Export from Tomcat
+Assert.assertEquals("line1\\n\\\n\\tline2\\n\\\n\\tline3", 
Utils.formatValueExport("line1\n\tline2\n\tline3"));
+}
 }

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