[tomcat] branch 8.5.x updated: Remove unused code.
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 5dce0e6 Remove unused code.
5dce0e6 is described below
commit 5dce0e6bf383508b65cb556301c09fcd30ba3120
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:55:41 2021 +0100
Remove unused code.
No requirement to back-port translations from 8.5.x now.
---
.../tomcat/buildutil/translate/BackportBase.java | 65
.../buildutil/translate/BackportEnglish.java | 67
.../buildutil/translate/BackportTranslations.java | 76 --
.../tomcat/buildutil/translate/Constants.java | 2 -
.../apache/tomcat/buildutil/translate/Utils.java | 89 --
5 files changed, 299 deletions(-)
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportBase.java
b/java/org/apache/tomcat/buildutil/translate/BackportBase.java
deleted file mode 100644
index 1a4830f..000
--- a/java/org/apache/tomcat/buildutil/translate/BackportBase.java
+++ /dev/null
@@ -1,65 +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;
-
-/**
- * Base class providing common implementation for back-port utilities.
- */
-public abstract class BackportBase {
-
-protected final Map sourceTranslations = new
HashMap<>();
-protected final Map targetTranslations = new
HashMap<>();
-protected final File targetRoot;
-protected final Properties sourceEnglish;
-protected final Properties targetEnglish;
-protected final File storageDir;
-
-protected BackportBase(String... args) throws IOException {
-if (args.length != 1) {
-throw new IllegalArgumentException("Missing back-port target");
-}
-targetRoot = new File(args[0]);
-
-if (!targetRoot.isDirectory()) {
-throw new IllegalArgumentException("Back-port target not a
directory");
-}
-
-File sourceRoot = new File(".");
-for (String dir : Constants.SEARCH_DIRS) {
-File directory = new File(dir);
-Utils.processDirectory(sourceRoot, directory, sourceTranslations);
-}
-
-for (String dir : Constants.SEARCH_DIRS) {
-File directory = new File(targetRoot, dir);
-Utils.processDirectory(targetRoot, directory, targetTranslations);
-}
-
-sourceEnglish = sourceTranslations.get("");
-targetEnglish = targetTranslations.get("");
-
-storageDir = new File(targetRoot, Constants.STORAGE_DIR);
-}
-
-protected abstract void execute() throws IOException;
-}
diff --git a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
b/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
deleted file mode 100644
index 9a0c7ae..000
--- a/java/org/apache/tomcat/buildutil/translate/BackportEnglish.java
+++ /dev/null
@@ -1,67 +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.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Generates a set of English property files to back-port updates to a previous
- * version. Where a key exists in
[tomcat] branch 8.5.x updated: More translation backports
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 2c761e3 More translation backports
2c761e3 is described below
commit 2c761e33ab2217cf257d08cb79d5c6b976011f74
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:52:22 2021 +0100
More translation backports
---
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../apache/catalina/core/LocalStrings.properties | 2 +-
.../catalina/loader/LocalStrings_zh_CN.properties | 2 +-
.../catalina/manager/LocalStrings_zh_CN.properties | 2 +-
.../catalina/realm/LocalStrings_zh_CN.properties | 1 +
.../apache/catalina/valves/LocalStrings.properties | 2 --
.../coyote/http2/LocalStrings_zh_CN.properties | 8 +++-
.../tomcat/util/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/websocket/LocalStrings.properties | 22 --
webapps/docs/changelog.xml | 4 ++--
10 files changed, 15 insertions(+), 31 deletions(-)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
index e5ce28b..90a61e9 100644
---
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
@@ -28,5 +28,6 @@ jaspicAuthenticator.authenticate=通过JASPIC验证[{0}]的请求
persistentProviderRegistrations.deleteFail=无法删除临时文件[{0}]
persistentProviderRegistrations.existsDeleteFail=临时文件[{0}]已存在且无法删除
persistentProviderRegistrations.moveFail=无法将[{0}]移至[{1}]
+persistentProviderRegistrations.xmlFeatureEncoding=将JASPIC配置为允许XML配置文件中的java编码名称时出现异常。仅支持IANA编码名称。
simpleServerAuthConfig.noModules=“没有配置ServerAuthModules”
diff --git a/java/org/apache/catalina/core/LocalStrings.properties
b/java/org/apache/catalina/core/LocalStrings.properties
index 45495d0..3c5b58a 100644
--- a/java/org/apache/catalina/core/LocalStrings.properties
+++ b/java/org/apache/catalina/core/LocalStrings.properties
@@ -76,7 +76,7 @@ aprListener.aprInitError=The Apache Tomcat Native library
failed to load. The er
aprListener.config=APR/OpenSSL configuration: useAprConnector [{0}],
useOpenSSL [{1}]
aprListener.currentFIPSMode=Current FIPS mode: [{0}]
aprListener.enterAlreadyInFIPSMode=AprLifecycleListener is configured to force
entering FIPS mode, but library is already in FIPS mode [{0}]
-aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters
[{2}], random [{3}].
+aprListener.flags=APR capabilities: IPv6 [{0}], sendfile [{1}], accept filters
[{2}], random [{3}], UDS [{4}].
aprListener.initializeFIPSFailed=Failed to enter FIPS mode
aprListener.initializeFIPSSuccess=Successfully entered FIPS mode
aprListener.initializedOpenSSL=OpenSSL successfully initialized [{0}]
diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index 0e2e42c..72d2d9d 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -54,7 +54,7 @@ webappClassLoader.stopped=非法访问：此Web应用程序实例已停止。无
webappClassLoader.superCloseFail=调用父类的close()方法出现异常。
webappClassLoader.transformError=检测错误：无法转换类[{0}]，因为它的类文件格式是不合法的。
webappClassLoader.warnTimerThread=Web应用程序[{0}]似乎已通过java.util.Timer
API启动了名为[{1}]的TimerThread，但未能将其停止。 为防止内存泄漏，计时器（以及相关联的线程）已被强制取消。
-webappClassLoader.wrongVersion=(无法载入的.类 [{0}])
+webappClassLoader.wrongVersion=(无法载入的类 [{0}])
webappClassLoaderParallel.registrationFailed=将org.apache.catalina.loader.ParallelWebappClassLoader注册为能够并行加载类失败
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index 3bf1385..957e36c 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -66,7 +66,7 @@ htmlManagerServlet.diagnosticsLeakWarning=诊断检查将触发完整的垃圾
htmlManagerServlet.diagnosticsSsl=TLS连接器配置诊断
htmlManagerServlet.diagnosticsSslConnectorCertsButton=证书
htmlManagerServlet.diagnosticsSslConnectorCertsText=列出已配置的TLS虚拟主机以及各自的证书链
-htmlManagerServlet.diagnosticsSslConnectorCipherButton=密.码
+htmlManagerServlet.diagnosticsSslConnectorCipherButton=密码
htmlManagerServlet.diagnosticsSslConnectorCipherText=列出每个配置好的TLS虚拟主机和密码。
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=认证证书
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=列出每个配置好的TLS虚拟主机和认证证书。
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 4125d9a..bb38754 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/rea
[tomcat] branch 9.0.x updated: More translation backports
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 7e67a0f More translation backports
7e67a0f is described below
commit 7e67a0fea339560fbc7d92642270561342effa75
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:51:29 2021 +0100
More translation backports
---
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../catalina/loader/LocalStrings_zh_CN.properties | 2 +-
.../catalina/manager/LocalStrings_zh_CN.properties | 2 +-
.../catalina/mbeans/LocalStrings_zh_CN.properties | 1 +
.../catalina/realm/LocalStrings_zh_CN.properties | 1 +
.../catalina/users/LocalStrings_zh_CN.properties | 2 ++
.../apache/catalina/valves/LocalStrings.properties | 2 --
.../coyote/http2/LocalStrings_zh_CN.properties | 8 +++-
.../jasper/resources/LocalStrings.properties | 16 +++
.../tomcat/util/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/websocket/LocalStrings.properties | 24 +-
webapps/docs/changelog.xml | 4 ++--
12 files changed, 26 insertions(+), 39 deletions(-)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
index e5ce28b..90a61e9 100644
---
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
@@ -28,5 +28,6 @@ jaspicAuthenticator.authenticate=通过JASPIC验证[{0}]的请求
persistentProviderRegistrations.deleteFail=无法删除临时文件[{0}]
persistentProviderRegistrations.existsDeleteFail=临时文件[{0}]已存在且无法删除
persistentProviderRegistrations.moveFail=无法将[{0}]移至[{1}]
+persistentProviderRegistrations.xmlFeatureEncoding=将JASPIC配置为允许XML配置文件中的java编码名称时出现异常。仅支持IANA编码名称。
simpleServerAuthConfig.noModules=“没有配置ServerAuthModules”
diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index fa3e7c5..1ac2727 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -54,7 +54,7 @@ webappClassLoader.stopped=非法访问：此Web应用程序实例已停止。无
webappClassLoader.superCloseFail=调用父类的close()方法出现异常。
webappClassLoader.transformError=检测错误：无法转换类[{0}]，因为它的类文件格式是不合法的。
webappClassLoader.warnTimerThread=Web应用程序[{0}]似乎已通过java.util.Timer
API启动了名为[{1}]的TimerThread，但未能将其停止。 为防止内存泄漏，计时器（以及相关联的线程）已被强制取消。
-webappClassLoader.wrongVersion=(无法载入的.类 [{0}])
+webappClassLoader.wrongVersion=(无法载入的类 [{0}])
webappClassLoaderParallel.registrationFailed=将org.apache.catalina.loader.ParallelWebappClassLoader注册为能够并行加载类失败
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index f11fac4..316bf25 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -68,7 +68,7 @@ htmlManagerServlet.diagnosticsLeakWarning=诊断检查将触发完整的垃圾
htmlManagerServlet.diagnosticsSsl=TLS连接器配置诊断
htmlManagerServlet.diagnosticsSslConnectorCertsButton=证书
htmlManagerServlet.diagnosticsSslConnectorCertsText=列出已配置的TLS虚拟主机以及各自的证书链
-htmlManagerServlet.diagnosticsSslConnectorCipherButton=密.码
+htmlManagerServlet.diagnosticsSslConnectorCipherButton=密码
htmlManagerServlet.diagnosticsSslConnectorCipherText=列出每个配置好的TLS虚拟主机和密码。
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=认证证书
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=列出每个配置好的TLS虚拟主机和认证证书。
diff --git a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
index c9fcb3f..0507320 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
@@ -65,3 +65,4 @@ userMBean.destroyError.role=销毁角色[{0}]MBean时发生异常
userMBean.destroyError.user=销毁用户[{0}]MBean时发生异常
userMBean.invalidGroup=无效的组名[{0}]
userMBean.invalidRole=无效的角色名[{0}]
+userMBean.saveError=保存操作时出错
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 3108695..e23550f 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=域提供了无效的存储凭据字
dataSourceRealm.authenticateFailure=用户名[{0}]未成功验证
dataSourceRealm.authenticateSuccess=用户名[{0}]已成功通过身份验证。
dataSourceRealm.close=关闭数据库连接时发生异常
+dataSourceRealm.commit=关闭前提交连接异常
dataSourceRealm.exception=认证异常
dataSourceRealm.getPassword.exception=获取用户名[{0}]对应的密码失败。
dataSourceRealm.getRoles.exception=检索角色[{0}]异
[tomcat] branch 10.0.x updated: More translation backports
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 f5d0534 More translation backports
f5d0534 is described below
commit f5d053428014681f3683072147818f1dc43554e3
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:50:24 2021 +0100
More translation backports
---
.../catalina/authenticator/jaspic/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/loader/LocalStrings_zh_CN.properties | 2 +-
java/org/apache/catalina/manager/LocalStrings_zh_CN.properties| 2 +-
java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_zh_CN.properties | 1 +
java/org/apache/catalina/users/LocalStrings_zh_CN.properties | 2 ++
java/org/apache/coyote/http2/LocalStrings_zh_CN.properties| 8 +++-
java/org/apache/tomcat/util/LocalStrings_zh_CN.properties | 2 +-
webapps/docs/changelog.xml| 4 ++--
9 files changed, 13 insertions(+), 10 deletions(-)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
index e5ce28b..90a61e9 100644
---
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
@@ -28,5 +28,6 @@ jaspicAuthenticator.authenticate=通过JASPIC验证[{0}]的请求
persistentProviderRegistrations.deleteFail=无法删除临时文件[{0}]
persistentProviderRegistrations.existsDeleteFail=临时文件[{0}]已存在且无法删除
persistentProviderRegistrations.moveFail=无法将[{0}]移至[{1}]
+persistentProviderRegistrations.xmlFeatureEncoding=将JASPIC配置为允许XML配置文件中的java编码名称时出现异常。仅支持IANA编码名称。
simpleServerAuthConfig.noModules=“没有配置ServerAuthModules”
diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index 8ecd37d..119d311 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -54,7 +54,7 @@ webappClassLoader.stopped=非法访问：此Web应用程序实例已停止。无
webappClassLoader.superCloseFail=调用父类的close()方法出现异常。
webappClassLoader.transformError=检测错误：无法转换类[{0}]，因为它的类文件格式是不合法的。
webappClassLoader.warnTimerThread=Web应用程序[{0}]似乎已通过java.util.Timer
API启动了名为[{1}]的TimerThread，但未能将其停止。 为防止内存泄漏，计时器（以及相关联的线程）已被强制取消。
-webappClassLoader.wrongVersion=(无法载入的.类 [{0}])
+webappClassLoader.wrongVersion=(无法载入的类 [{0}])
webappClassLoaderParallel.registrationFailed=将org.apache.catalina.loader.ParallelWebappClassLoader注册为能够并行加载类失败
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index f11fac4..316bf25 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -68,7 +68,7 @@ htmlManagerServlet.diagnosticsLeakWarning=诊断检查将触发完整的垃圾
htmlManagerServlet.diagnosticsSsl=TLS连接器配置诊断
htmlManagerServlet.diagnosticsSslConnectorCertsButton=证书
htmlManagerServlet.diagnosticsSslConnectorCertsText=列出已配置的TLS虚拟主机以及各自的证书链
-htmlManagerServlet.diagnosticsSslConnectorCipherButton=密.码
+htmlManagerServlet.diagnosticsSslConnectorCipherButton=密码
htmlManagerServlet.diagnosticsSslConnectorCipherText=列出每个配置好的TLS虚拟主机和密码。
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=认证证书
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=列出每个配置好的TLS虚拟主机和认证证书。
diff --git a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
index 4143213..363b31a 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
@@ -60,3 +60,4 @@ userMBean.destroyError.role=销毁角色[{0}]MBean时发生异常
userMBean.destroyError.user=销毁用户[{0}]MBean时发生异常
userMBean.invalidGroup=无效的组名[{0}]
userMBean.invalidRole=无效的角色名[{0}]
+userMBean.saveError=保存操作时出错
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 740bfee..52dc891 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=域提供了无效的存储凭据字
dataSourceRealm.authenticateFailure=用户名[{0}]未成功验证
dataSourceRealm.authenticateSuccess=用户名[{0}]已成功通过身份验证。
dataSourceRealm.close=关闭数据库连接时发生异常
+dataSourceRealm.commit=关闭前提交连接异常
dataSourceRealm.exception=认证异常
dataSourceRealm.getPassword.exception=获取用户名[{0}]对应的密码失败。
dataSourceRealm.getRoles.exception=检索角色[{0}]异常
diff --git a/java/org/apache/catalina/users/LocalStrings_zh_CN.properties
b/java/or
[tomcat] branch main updated: Import/export cycle to fix ordering
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 fb6bdb5 Import/export cycle to fix ordering
fb6bdb5 is described below
commit fb6bdb54759e3c596810908db3ee87e1a57b7832
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:37:09 2021 +0100
Import/export cycle to fix ordering
---
java/org/apache/el/LocalStrings_zh_CN.properties | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/el/LocalStrings_zh_CN.properties
b/java/org/apache/el/LocalStrings_zh_CN.properties
index d5093d6..07c58df 100644
--- a/java/org/apache/el/LocalStrings_zh_CN.properties
+++ b/java/org/apache/el/LocalStrings_zh_CN.properties
@@ -16,20 +16,20 @@
elSupport.coerce.nonAbstract=无法将LambdaExpression强制到函数接口[{0}]，因为方法[{1}]不是抽象的
error.cannotSetVariables=不能在工厂上设置变量
+error.compare=无法将[{0}}]与[{1}]进行比较
error.context.null=ELConect为空
error.convert=无法将类型为[{1}]的[{0}]转换为[{2}]
-error.compare=无法将[{0}}]与[{1}]进行比较
error.fnMapper.method=找不到函数[{0}]
error.fnMapper.null=表达式使用函数，但未提供FunctionMapper
error.fnMapper.paramcount=函数[{0}]指定了[{1}]参数，但声明了[{2}]
error.function=调用函数[{0}]时出现问题
error.function.tooManyMethodParameterSets=为函数[{0}]指定了多组参数
error.identifier.noMethod=标识[{0}]为空，无法调用
-error.identifier.notjava=标识符[{0}]不是EL规范第1.19节要求的有效Java标识符（标识符::=Java语言标识符）。可以通过将系统属性org.apache.el.parser.SKIP_IDENTIFIER_CHECK设置为true来禁用此检查。
error.identifier.notMethodExpression=Identity [{0}]未引用方法表达式实例，返回类型[{1}]
+error.identifier.notjava=标识符[{0}]不是EL规范第1.19节要求的有效Java标识符（标识符::=Java语言标识符）。可以通过将系统属性org.apache.el.parser.SKIP_IDENTIFIER_CHECK设置为true来禁用此检查。
error.invalidMethodExpression=不是有效的方法表达式[{0}]
-error.invoke.wrongParams=方法[{0}]在调用时入参为 [{1}],预期入参为 [{2}]
error.invoke.tooFewParams=方法[{0}]在调用时入参为 [{1}],预期入参至少为 [{2}]
+error.invoke.wrongParams=方法[{0}]在调用时入参为 [{1}],预期入参为 [{2}]
error.lambda.tooManyMethodParameterSets=指定的方法参数集多于嵌套lambda表达式的集合
error.lambda.wrongNestedState=嵌套状态只能设置一次
error.method=无效的方法表达式：[{0}]
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf commented on pull request #446: Improvements to Chinese translations
markt-asf commented on pull request #446: URL: https://github.com/apache/tomcat/pull/446#issuecomment-912036780 The Apache Tomcat project uses POEditor to manage translations. The Tomcat project can be found at: https://poeditor.com/projects/view?id=221603 Everyone is able to create an account and contribute. I have manually merged this PR but it would be easier for us in the future if you contributed translations via POEditor. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] markt-asf closed pull request #446: Improvements to Chinese translations
markt-asf closed pull request #446: URL: https://github.com/apache/tomcat/pull/446 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Manually merge PR 446. Improve Chinese translations. DigitalFatCat
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 d62d35f Manually merge PR 446. Improve Chinese translations.
DigitalFatCat
d62d35f is described below
commit d62d35fd746e3c9af0a5b35d1b8ce9d96fc7014b
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:34:47 2021 +0100
Manually merge PR 446. Improve Chinese translations. DigitalFatCat
https://github.com/apache/tomcat/pull/446
---
.../jaspic/LocalStrings_zh_CN.properties | 1 +
.../catalina/loader/LocalStrings_zh_CN.properties | 2 +-
.../catalina/manager/LocalStrings_zh_CN.properties | 2 +-
.../catalina/mbeans/LocalStrings_zh_CN.properties | 1 +
.../catalina/realm/LocalStrings_zh_CN.properties | 1 +
.../catalina/users/LocalStrings_zh_CN.properties | 2 ++
.../coyote/http2/LocalStrings_zh_CN.properties | 8 +++---
java/org/apache/el/LocalStrings_zh_CN.properties | 31 ++
.../tomcat/util/LocalStrings_zh_CN.properties | 2 +-
.../tomcat/websocket/LocalStrings_zh_CN.properties | 1 +
webapps/docs/changelog.xml | 4 +--
11 files changed, 45 insertions(+), 10 deletions(-)
diff --git
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
index e5ce28b..90a61e9 100644
---
a/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/authenticator/jaspic/LocalStrings_zh_CN.properties
@@ -28,5 +28,6 @@ jaspicAuthenticator.authenticate=通过JASPIC验证[{0}]的请求
persistentProviderRegistrations.deleteFail=无法删除临时文件[{0}]
persistentProviderRegistrations.existsDeleteFail=临时文件[{0}]已存在且无法删除
persistentProviderRegistrations.moveFail=无法将[{0}]移至[{1}]
+persistentProviderRegistrations.xmlFeatureEncoding=将JASPIC配置为允许XML配置文件中的java编码名称时出现异常。仅支持IANA编码名称。
simpleServerAuthConfig.noModules=“没有配置ServerAuthModules”
diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index 8874fbb..a7834ac 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -53,7 +53,7 @@ webappClassLoader.stopped=非法访问：此Web应用程序实例已停止。无
webappClassLoader.superCloseFail=调用父类的close()方法出现异常。
webappClassLoader.transformError=检测错误：无法转换类[{0}]，因为它的类文件格式是不合法的。
webappClassLoader.warnTimerThread=Web应用程序[{0}]似乎已通过java.util.Timer
API启动了名为[{1}]的TimerThread，但未能将其停止。 为防止内存泄漏，计时器（以及相关联的线程）已被强制取消。
-webappClassLoader.wrongVersion=(无法载入的.类 [{0}])
+webappClassLoader.wrongVersion=(无法载入的类 [{0}])
webappClassLoaderParallel.registrationFailed=将org.apache.catalina.loader.ParallelWebappClassLoader注册为能够并行加载类失败
diff --git a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
index f11fac4..316bf25 100644
--- a/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_zh_CN.properties
@@ -68,7 +68,7 @@ htmlManagerServlet.diagnosticsLeakWarning=诊断检查将触发完整的垃圾
htmlManagerServlet.diagnosticsSsl=TLS连接器配置诊断
htmlManagerServlet.diagnosticsSslConnectorCertsButton=证书
htmlManagerServlet.diagnosticsSslConnectorCertsText=列出已配置的TLS虚拟主机以及各自的证书链
-htmlManagerServlet.diagnosticsSslConnectorCipherButton=密.码
+htmlManagerServlet.diagnosticsSslConnectorCipherButton=密码
htmlManagerServlet.diagnosticsSslConnectorCipherText=列出每个配置好的TLS虚拟主机和密码。
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsButton=认证证书
htmlManagerServlet.diagnosticsSslConnectorTrustedCertsText=列出每个配置好的TLS虚拟主机和认证证书。
diff --git a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
index 4143213..363b31a 100644
--- a/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/mbeans/LocalStrings_zh_CN.properties
@@ -60,3 +60,4 @@ userMBean.destroyError.role=销毁角色[{0}]MBean时发生异常
userMBean.destroyError.user=销毁用户[{0}]MBean时发生异常
userMBean.invalidGroup=无效的组名[{0}]
userMBean.invalidRole=无效的角色名[{0}]
+userMBean.saveError=保存操作时出错
diff --git a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
index 740bfee..52dc891 100644
--- a/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_zh_CN.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=域提供了无效的存储凭据字
dataSourceRealm.authenticateFailure=用户名[{0}]未成功验证
dataSourceRealm.authenticateSuccess=用户名[{0}]已成功通过身份验证。
dataSourceRealm.close=关闭数据库连接时发生异常
+dataSourceRealm.commit=关闭前提交连接异常
dataSourceRealm.exception=认证异常
dataSourceRealm.getPassword.exception=获取用户名[{0}]对应
[Bug 65368] enhance error message "Unable to unwrap data, invalid status [CLOSED]"
https://bz.apache.org/bugzilla/show_bug.cgi?id=65368 --- Comment #6 from adwsingh --- Does this also need to be fixed for sending response? I am seeing org.apache.catalina.connector.ClientAbortException: java.io.IOException: Unable to wrap data, invalid status [CLOSED] when the client has closed the connection before the server is able to respond back. Also for some reason this doesn't show up in 9.0.48 -- 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 8.5.x updated: Back-port translation updates
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 174f5af Back-port translation updates
174f5af is described below
commit 174f5afcb65b97f32c5fea11e09ef85de24c6f8e
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:16:30 2021 +0100
Back-port translation updates
---
java/org/apache/catalina/realm/LocalStrings_ja.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_ko.properties | 1 +
.../tribes/group/interceptors/LocalStrings_zh_CN.properties| 3 +--
webapps/docs/changelog.xml | 10 ++
4 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties
b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index fc317b9..a041039 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=ユーザ提供の資格情報とマ
dataSourceRealm.authenticateFailure=ユーザ名 [{0}] は認証に失敗しました
dataSourceRealm.authenticateSuccess=ユーザ名 [{0}] は認証に成功しました
dataSourceRealm.close=データベース接続をクローズ中の例外です
+dataSourceRealm.commit=クローズ前に接続をコミットした際に例外が発生しました
dataSourceRealm.exception=認証を実行中の例外です
dataSourceRealm.getPassword.exception=[{0}] のパスワードを取得中に例外が発生しました。
dataSourceRealm.getRoles.exception=[{0}] のロールを取得中に例外が発生しました。
diff --git a/java/org/apache/catalina/realm/LocalStrings_ko.properties
b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index b73d92e..89c8f9a 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=사용자가 제공한
credentials과
dataSourceRealm.authenticateFailure=사용자명 [{0}]은(는) 성공적으로 인증되지 않았습니다.
dataSourceRealm.authenticateSuccess=사용자명 [{0}]이(가) 성공적으로 인증되었습니다.
dataSourceRealm.close=데이터베이스 연결을 닫는 중 예외 발생
+dataSourceRealm.commit=데이터베이스 연결을 닫기 전, 커밋을 시도하는 중 SQLException 발생
dataSourceRealm.exception=인증 처리 수행 중 예외 발생
dataSourceRealm.getPassword.exception=[{0}]을(를) 위한 비밀번호를 조회하던 중 예외 발생
dataSourceRealm.getRoles.exception=사용자 [{0}]을(를) 위한 역할들을 조회하는 중 예외 발생
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index bd4117d..421d17f 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -76,8 +76,7 @@ throughputInterceptor.report=吞吐量拦截器报告[\n\
\错误消息：{6}\n\
\接收消息：{7} 消息数\n\
\接收速率：{8} MB/秒（从第一个消息开始）\n\
-\收到：{9}MB]\n\
-\n
+\收到：{9}MB]\n
twoPhaseCommitInterceptor.heartbeat.failed=无法在两阶段提交拦截器上执行心跳。
twoPhaseCommitInterceptor.originalMessage.missing=收到确认，但原始邮件丢失。Id:[{0}]
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a9a6ab4..5cff909 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -212,6 +212,16 @@
Switch to the CDN as the primary download location for ASF
dependencies.
(markt)
+
+Improvements to Chinese translations contributed by syseal, wolibo and
+ZhangJieWen. (markt)
+
+
+Improvements to Japanese translations contributed by tak7iji. (markt)
+
+
+Improvements to Korean translations. (woonsan)
+
-
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: Back-port translation updates
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 aee2adc Back-port translation updates
aee2adc is described below
commit aee2adc085db72dc767156553626239ddff7e5e0
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:14:21 2021 +0100
Back-port translation updates
---
java/org/apache/catalina/realm/LocalStrings_ja.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_ko.properties | 1 +
.../tribes/group/interceptors/LocalStrings_zh_CN.properties| 3 +--
java/org/apache/coyote/http2/LocalStrings_ja.properties| 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties| 1 +
webapps/docs/changelog.xml | 10 ++
6 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties
b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index 1e306cd..9daad2d 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=ユーザ提供の資格情報とマ
dataSourceRealm.authenticateFailure=ユーザ名 [{0}] は認証に失敗しました
dataSourceRealm.authenticateSuccess=ユーザ名 [{0}] は認証に成功しました
dataSourceRealm.close=データベース接続をクローズ中の例外です
+dataSourceRealm.commit=クローズ前に接続をコミットした際に例外が発生しました
dataSourceRealm.exception=認証を実行中の例外です
dataSourceRealm.getPassword.exception=[{0}] のパスワードを取得中に例外が発生しました。
dataSourceRealm.getRoles.exception=[{0}] のロールを取得中に例外が発生しました。
diff --git a/java/org/apache/catalina/realm/LocalStrings_ko.properties
b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index a3cfcc2..43a1f69 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=사용자가 제공한
credentials과
dataSourceRealm.authenticateFailure=사용자명 [{0}]은(는) 성공적으로 인증되지 않았습니다.
dataSourceRealm.authenticateSuccess=사용자명 [{0}]이(가) 성공적으로 인증되었습니다.
dataSourceRealm.close=데이터베이스 연결을 닫는 중 예외 발생
+dataSourceRealm.commit=데이터베이스 연결을 닫기 전, 커밋을 시도하는 중 SQLException 발생
dataSourceRealm.exception=인증 처리 수행 중 예외 발생
dataSourceRealm.getPassword.exception=[{0}]을(를) 위한 비밀번호를 조회하던 중 예외 발생
dataSourceRealm.getRoles.exception=사용자 [{0}]을(를) 위한 역할들을 조회하는 중 예외 발생
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index 8fd3f13..78e2cc7 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -97,8 +97,7 @@ throughputInterceptor.report=吞吐量拦截器报告[\n\
\错误消息：{6}\n\
\接收消息：{7} 消息数\n\
\接收速率：{8} MB/秒（从第一个消息开始）\n\
-\收到：{9}MB]\n\
-\n
+\收到：{9}MB]\n
twoPhaseCommitInterceptor.expiredMessage=正在删除过期邮件[{0}]
twoPhaseCommitInterceptor.heartbeat.failed=无法在两阶段提交拦截器上执行心跳。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 04731b9..a232213 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -144,6 +144,7 @@ upgradeHandler.releaseBacklog=コネクション[{0}]、ストリーム[{1}]は
upgradeHandler.reset.receive=Connection[{0}]、Stream[{1}]、[{2}]のためにリセットを受信しました
upgradeHandler.rst.debug=コネクション [{0}]、ストリーム [{1}]、エラー [{2}]、メッセージ [{3}]、RST
(ストリームを切断します)
upgradeHandler.sendPrefaceFail=コネクション [{0}]、クライアントにプリフェイスを送信できませんでした。
+upgradeHandler.sendfile.reservation=sendfileによるwriteの前の
接続[{0}]、ストリーム[{1}]、接続予約[{2}]、ストリーム予約[{3}]
upgradeHandler.socketCloseFailed=ソケットクローズ中のエラー
upgradeHandler.startRequestBodyFrame.result=接続[{0}]、ストリーム[{1}]
startRequestBodyFrameが [{2}] を返しました
upgradeHandler.stream.closed=ストリーム[{0}]がしばらく閉じられていました
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 742f90a..bd6d88d 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -144,6 +144,7 @@ upgradeHandler.releaseBacklog=연결 [{0}], 스트림 [{1}]이(가) 백로그로
upgradeHandler.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 리셋을 수신했습니다.
upgradeHandler.rst.debug=연결 [{0}], 스트림 [{1}], 오류 [{2}], 메시지 [{3}], RST (스트림을
닫습니다)
upgradeHandler.sendPrefaceFail=연결 [{0}]: 클라이언트에 preface를 전송하지 못했습니다.
+upgradeHandler.sendfile.reservation=sendfile 쓰기 직전입니다. 연결 [{0}], 스트림 [{1}], 연결
예약 [{2}], 연결 예약 [{3}]
upgradeHandler.socketCloseFailed=소켓을 닫는 중 오류 발생
upgradeHandler.startRequestBodyFrame.result=연결 [{0}], 스트림 [{1}]:
startRequestBodyFrame()이 [{2}]을(를) 반환함.
upgradeHandler.stream.closed=스트림 [{0}]이(가) 얼마 동안 이미 닫혀 있었습
[tomcat] branch 10.0.x updated: Backport translation fixes
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 7e88f86 Backport translation fixes
7e88f86 is described below
commit 7e88f86b513eaf63283d9945b934cb199d656eb8
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:12:12 2021 +0100
Backport translation fixes
---
java/org/apache/catalina/realm/LocalStrings_ja.properties | 1 +
java/org/apache/catalina/realm/LocalStrings_ko.properties | 1 +
.../tribes/group/interceptors/LocalStrings_zh_CN.properties| 3 +--
java/org/apache/coyote/http2/LocalStrings_ja.properties| 1 +
java/org/apache/coyote/http2/LocalStrings_ko.properties| 1 +
webapps/docs/changelog.xml | 10 ++
6 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties
b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index 0d55feb..4212a3e 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=ユーザ提供の資格情報とマ
dataSourceRealm.authenticateFailure=ユーザ名 [{0}] は認証に失敗しました
dataSourceRealm.authenticateSuccess=ユーザ名 [{0}] は認証に成功しました
dataSourceRealm.close=データベース接続をクローズ中の例外です
+dataSourceRealm.commit=クローズ前に接続をコミットした際に例外が発生しました
dataSourceRealm.exception=認証を実行中の例外です
dataSourceRealm.getPassword.exception=[{0}] のパスワードを取得中に例外が発生しました。
dataSourceRealm.getRoles.exception=[{0}] のロールを取得中に例外が発生しました。
diff --git a/java/org/apache/catalina/realm/LocalStrings_ko.properties
b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index 8946f62..414d491 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=사용자가 제공한
credentials과
dataSourceRealm.authenticateFailure=사용자명 [{0}]은(는) 성공적으로 인증되지 않았습니다.
dataSourceRealm.authenticateSuccess=사용자명 [{0}]이(가) 성공적으로 인증되었습니다.
dataSourceRealm.close=데이터베이스 연결을 닫는 중 예외 발생
+dataSourceRealm.commit=데이터베이스 연결을 닫기 전, 커밋을 시도하는 중 SQLException 발생
dataSourceRealm.exception=인증 처리 수행 중 예외 발생
dataSourceRealm.getPassword.exception=[{0}]을(를) 위한 비밀번호를 조회하던 중 예외 발생
dataSourceRealm.getRoles.exception=사용자 [{0}]을(를) 위한 역할들을 조회하는 중 예외 발생
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index 8fd3f13..78e2cc7 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -97,8 +97,7 @@ throughputInterceptor.report=吞吐量拦截器报告[\n\
\错误消息：{6}\n\
\接收消息：{7} 消息数\n\
\接收速率：{8} MB/秒（从第一个消息开始）\n\
-\收到：{9}MB]\n\
-\n
+\收到：{9}MB]\n
twoPhaseCommitInterceptor.expiredMessage=正在删除过期邮件[{0}]
twoPhaseCommitInterceptor.heartbeat.failed=无法在两阶段提交拦截器上执行心跳。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 04731b9..a232213 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -144,6 +144,7 @@ upgradeHandler.releaseBacklog=コネクション[{0}]、ストリーム[{1}]は
upgradeHandler.reset.receive=Connection[{0}]、Stream[{1}]、[{2}]のためにリセットを受信しました
upgradeHandler.rst.debug=コネクション [{0}]、ストリーム [{1}]、エラー [{2}]、メッセージ [{3}]、RST
(ストリームを切断します)
upgradeHandler.sendPrefaceFail=コネクション [{0}]、クライアントにプリフェイスを送信できませんでした。
+upgradeHandler.sendfile.reservation=sendfileによるwriteの前の
接続[{0}]、ストリーム[{1}]、接続予約[{2}]、ストリーム予約[{3}]
upgradeHandler.socketCloseFailed=ソケットクローズ中のエラー
upgradeHandler.startRequestBodyFrame.result=接続[{0}]、ストリーム[{1}]
startRequestBodyFrameが [{2}] を返しました
upgradeHandler.stream.closed=ストリーム[{0}]がしばらく閉じられていました
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 742f90a..bd6d88d 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -144,6 +144,7 @@ upgradeHandler.releaseBacklog=연결 [{0}], 스트림 [{1}]이(가) 백로그로
upgradeHandler.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 리셋을 수신했습니다.
upgradeHandler.rst.debug=연결 [{0}], 스트림 [{1}], 오류 [{2}], 메시지 [{3}], RST (스트림을
닫습니다)
upgradeHandler.sendPrefaceFail=연결 [{0}]: 클라이언트에 preface를 전송하지 못했습니다.
+upgradeHandler.sendfile.reservation=sendfile 쓰기 직전입니다. 연결 [{0}], 스트림 [{1}], 연결
예약 [{2}], 연결 예약 [{3}]
upgradeHandler.socketCloseFailed=소켓을 닫는 중 오류 발생
upgradeHandler.startRequestBodyFrame.result=연결 [{0}], 스트림 [{1}]:
startRequestBodyFrame()이 [{2}]을(를) 반환함.
upgradeHandler.stream.closed=스트림 [{0}]이(가) 얼마 동안 이미 닫혀 있었습니다.
[tomcat] branch main updated: Improvements to Korean translations
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 672bde0 Improvements to Korean translations
672bde0 is described below
commit 672bde04a1fd37c4c1acae2e2fe3268f8d3260ee
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:08:13 2021 +0100
Improvements to Korean translations
---
.../catalina/loader/LocalStrings_ko.properties | 1 -
.../catalina/realm/LocalStrings_ko.properties | 1 +
.../apache/coyote/http2/LocalStrings_ko.properties | 1 +
java/org/apache/el/LocalStrings_ko.properties | 56 ++
.../tomcat/websocket/LocalStrings_ko.properties| 1 -
webapps/docs/changelog.xml | 3 ++
6 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/loader/LocalStrings_ko.properties
b/java/org/apache/catalina/loader/LocalStrings_ko.properties
index 00705ed..2f650e4 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ko.properties
@@ -15,7 +15,6 @@
webappClassLoader.addExportsJavaIo=Java 9 또는 이후 버전을 사용할 때에는,
"--add-opens=java.base/java.io={0}" 을(를) JVM 명령행 아규먼트들에 추가해서, ObjectStream 캐시
메모리 릭 방지 옵션을 활성화할 필요가 있습니다. 또는 원하시는 경우, ObjectStream 클래스 캐시 메모리 릭 방지 옵션을 비활성화해서
이 경고 메시지를 없앨 수도 있습니다.
webappClassLoader.addExportsRmi=Java 9에서 실행하면서 RMI Target 메모리 누수 탐지를 사용 가능하게
하려면, "--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"를 JVM 명령 행 아규먼트에 추가해야
합니다. 또는, RMI Target 메모리 누수 탐지를 사용불능 상태로 설정함으로써, 이 경고를 없앨 수도 있습니다.
-webappClassLoader.addExportsThreadLocal=Java 9 환경에서 실행할 때에는, ThreadLocal 메모리
누수 탐지를 위하여, "--add-opens=java.base/java.lang=ALL-UNNAMED"를 JVM 명령 행 아규먼트들에 추가해야
합니다. 또는, ThreadLocal 메모리 누수 탐지를 사용불능 상태로 설정함으로써, 이 경고 메시지를 없앨 수도 있습니다.
webappClassLoader.addPermissionNoCanonicalFile=URL [{0}](으)로부터 canonical 파일
경로를 얻을 수 없습니다.
webappClassLoader.addPermissionNoProtocol=URL [{1}] 내의 프로토콜 [{0}]은(는) 지원되지
않으므로, 이 URL의 리소스에 대한 읽기가 승인되지 않았습니다.
webappClassLoader.addTransformer=클래스 파일 Transformer [{0}]을(를) 웹 애플리케이션 [{1}]에
추가했습니다.
diff --git a/java/org/apache/catalina/realm/LocalStrings_ko.properties
b/java/org/apache/catalina/realm/LocalStrings_ko.properties
index 8946f62..414d491 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ko.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ko.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=사용자가 제공한
credentials과
dataSourceRealm.authenticateFailure=사용자명 [{0}]은(는) 성공적으로 인증되지 않았습니다.
dataSourceRealm.authenticateSuccess=사용자명 [{0}]이(가) 성공적으로 인증되었습니다.
dataSourceRealm.close=데이터베이스 연결을 닫는 중 예외 발생
+dataSourceRealm.commit=데이터베이스 연결을 닫기 전, 커밋을 시도하는 중 SQLException 발생
dataSourceRealm.exception=인증 처리 수행 중 예외 발생
dataSourceRealm.getPassword.exception=[{0}]을(를) 위한 비밀번호를 조회하던 중 예외 발생
dataSourceRealm.getRoles.exception=사용자 [{0}]을(를) 위한 역할들을 조회하는 중 예외 발생
diff --git a/java/org/apache/coyote/http2/LocalStrings_ko.properties
b/java/org/apache/coyote/http2/LocalStrings_ko.properties
index 742f90a..bd6d88d 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ko.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ko.properties
@@ -144,6 +144,7 @@ upgradeHandler.releaseBacklog=연결 [{0}], 스트림 [{1}]이(가) 백로그로
upgradeHandler.reset.receive=연결 [{0}], 스트림 [{1}], [{2}](으)로 인해 리셋을 수신했습니다.
upgradeHandler.rst.debug=연결 [{0}], 스트림 [{1}], 오류 [{2}], 메시지 [{3}], RST (스트림을
닫습니다)
upgradeHandler.sendPrefaceFail=연결 [{0}]: 클라이언트에 preface를 전송하지 못했습니다.
+upgradeHandler.sendfile.reservation=sendfile 쓰기 직전입니다. 연결 [{0}], 스트림 [{1}], 연결
예약 [{2}], 연결 예약 [{3}]
upgradeHandler.socketCloseFailed=소켓을 닫는 중 오류 발생
upgradeHandler.startRequestBodyFrame.result=연결 [{0}], 스트림 [{1}]:
startRequestBodyFrame()이 [{2}]을(를) 반환함.
upgradeHandler.stream.closed=스트림 [{0}]이(가) 얼마 동안 이미 닫혀 있었습니다.
diff --git a/java/org/apache/el/LocalStrings_ko.properties
b/java/org/apache/el/LocalStrings_ko.properties
new file mode 100644
index 000..d339518
--- /dev/null
+++ b/java/org/apache/el/LocalStrings_ko.properties
@@ -0,0 +1,56 @@
+# 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.
+
+elSupport.coerce.nonAbstract=
[tomcat] branch main updated: Improvements to Japanese translations
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 304588c Improvements to Japanese translations
304588c is described below
commit 304588c1e205309f5025e822b6de14dc39c5180b
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:05:30 2021 +0100
Improvements to Japanese translations
---
java/jakarta/el/LocalStrings_ja.properties | 2 +-
.../catalina/loader/LocalStrings_ja.properties | 1 -
.../catalina/realm/LocalStrings_ja.properties | 1 +
.../apache/coyote/http2/LocalStrings_ja.properties | 1 +
java/org/apache/el/LocalStrings_ja.properties | 56 ++
.../tomcat/websocket/LocalStrings_ja.properties| 1 -
webapps/docs/changelog.xml | 3 ++
7 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/java/jakarta/el/LocalStrings_ja.properties
b/java/jakarta/el/LocalStrings_ja.properties
index fe1c17b..708dbb3 100644
--- a/java/jakarta/el/LocalStrings_ja.properties
+++ b/java/jakarta/el/LocalStrings_ja.properties
@@ -29,7 +29,7 @@ expressionFactory.readFailed=[{0}]の読み取りに失敗しました
importHandler.ambiguousImport=クラス [{0}] はすでにインポートした [{1}] と衝突するためインポートできません。
importHandler.ambiguousStaticImport=static import [{0}] はすでにインポートした [{1}]
と衝突するため処理できません。
importHandler.classNotFound=存在しないクラス [{0}] はインポートできません。
-importHandler.invalidClass=クラス[{0}]は publicで、エクスポートされたパッケージ中にあり、非abstract
で非インタフェースである必要があります
+importHandler.invalidClass=クラス[{0}]は publicで、 エクスポートされたパッケージ中にあり、非abstract
で非インタフェースである必要があります
importHandler.invalidClassName=インポートするクラスの名前[{0}]にはパッケージが含まれている必要があります
importHandler.invalidClassNameForStatic=クラス [{0}] の static import [{1}] は無効です。
importHandler.invalidStaticName=インポートするstaticメソッドまたはフィールドの名前[{0}]にはクラスが含まれている必要があります。
diff --git a/java/org/apache/catalina/loader/LocalStrings_ja.properties
b/java/org/apache/catalina/loader/LocalStrings_ja.properties
index 186db09..64e42dc 100644
--- a/java/org/apache/catalina/loader/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_ja.properties
@@ -15,7 +15,6 @@
webappClassLoader.addExportsJavaIo=Java 9以降で実行する場合は、JVMコマンドライン引数に「--add-opens
= java.base / java.io = {0} "」を追加して、ObjectStreamキャッシュメモリリーク保護を有効にする必要があります。
または、ObjectStreamクラスのキャッシュメモリリーク保護を無効にすることで、この警告を抑制することができます。
webappClassLoader.addExportsRmi=Java 9以降で実行する場合は、JVMコマンドライン引数に "--add-opens =
java.rmi / sun.rmi.transport = ALL-UNNAMED"を追加して、RMIターゲットメモリリーク検出を有効にする必要があります。
また、RMIターゲットメモリリーク検出を無効にすることで、この警告を抑制することも可能です。
-webappClassLoader.addExportsThreadLocal=Java 9以降で実行する場合は、JVMコマンドライン引数に
"--add-opens = java.base / java.lang =
ALL-UNNAMED"を追加して、ThreadLocalメモリリーク検出を有効にする必要があります。
また、ThreadLocalメモリリーク検出を無効にすることで、この警告を抑制することもできます。
webappClassLoader.addPermissionNoCanonicalFile=URL [{0}] の正規化パスを取得できません。
webappClassLoader.addPermissionNoProtocol=URL [{1}] に含まれるプロトコル [{0}] は未対応です。この
URL で参照できるリソースには読み取り権限を付与できません。
webappClassLoader.addTransformer=Web アプリケーション [{1}] にクラスファイル変換器 [{0}] を追加しました。
diff --git a/java/org/apache/catalina/realm/LocalStrings_ja.properties
b/java/org/apache/catalina/realm/LocalStrings_ja.properties
index 0d55feb..4212a3e 100644
--- a/java/org/apache/catalina/realm/LocalStrings_ja.properties
+++ b/java/org/apache/catalina/realm/LocalStrings_ja.properties
@@ -28,6 +28,7 @@ credentialHandler.invalidStoredCredential=ユーザ提供の資格情報とマ
dataSourceRealm.authenticateFailure=ユーザ名 [{0}] は認証に失敗しました
dataSourceRealm.authenticateSuccess=ユーザ名 [{0}] は認証に成功しました
dataSourceRealm.close=データベース接続をクローズ中の例外です
+dataSourceRealm.commit=クローズ前に接続をコミットした際に例外が発生しました
dataSourceRealm.exception=認証を実行中の例外です
dataSourceRealm.getPassword.exception=[{0}] のパスワードを取得中に例外が発生しました。
dataSourceRealm.getRoles.exception=[{0}] のロールを取得中に例外が発生しました。
diff --git a/java/org/apache/coyote/http2/LocalStrings_ja.properties
b/java/org/apache/coyote/http2/LocalStrings_ja.properties
index 04731b9..a232213 100644
--- a/java/org/apache/coyote/http2/LocalStrings_ja.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_ja.properties
@@ -144,6 +144,7 @@ upgradeHandler.releaseBacklog=コネクション[{0}]、ストリーム[{1}]は
upgradeHandler.reset.receive=Connection[{0}]、Stream[{1}]、[{2}]のためにリセットを受信しました
upgradeHandler.rst.debug=コネクション [{0}]、ストリーム [{1}]、エラー [{2}]、メッセージ [{3}]、RST
(ストリームを切断します)
upgradeHandler.sendPrefaceFail=コネクション [{0}]、クライアントにプリフェイスを送信できませんでした。
+upgradeHandler.sendfile.reservation=sendfileによるwriteの前の
接続[{0}]、ストリーム[{1}]、接続予約[{2}]、ストリーム予約[{3}]
upgradeHandler.socketCloseFailed=ソケットクローズ中のエラー
upgradeHandler.startRequestBodyFrame.result=接続[{0}]、ストリーム[{1}]
startRequestBodyFrameが [{2}] を返しました
upgradeHandler.stream.closed=ストリーム[{0}]がしばらく閉じられていました
diff --git a/java/org/apache/el/LocalStrings_ja.properties
b/java/org/apache/el/LocalStrings_ja.properties
new file mode 100644
index 000..193b298
--- /dev/null
+++ b/java/org/apache/el/LocalStrings_ja.pr
[tomcat] branch main updated: Fix typo
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 433a28b Fix typo
433a28b is described below
commit 433a28bb66c06471201d0cc6803b295fdf6f15cd
Author: Mark Thomas
AuthorDate: Thu Sep 2 21:01:46 2021 +0100
Fix typo
---
java/org/apache/tomcat/util/scan/LocalStrings_ja.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/tomcat/util/scan/LocalStrings_ja.properties
b/java/org/apache/tomcat/util/scan/LocalStrings_ja.properties
index e4b4025..31f353d 100644
--- a/java/org/apache/tomcat/util/scan/LocalStrings_ja.properties
+++ b/java/org/apache/tomcat/util/scan/LocalStrings_ja.properties
@@ -18,7 +18,7 @@ jarScan.classloaderFail=クラスローダー階層から[{0}]をスキャンで
jarScan.classloaderJarNoScan=クラスパス中のファイル [{0}] は JAR スキャンをしませんでした。
jarScan.classloaderJarScan=クラスパスの JAR ファイル [{0}] をスキャンします。
jarScan.classloaderStart=クラスローダー階層中の JAR ファイルをスキャンします。
-jarSacn.invalidModuleUri=モジュール URI [{0}] を JarScanner で処理する URL に変換できませんでした。
+jarScan.invalidModuleUri=モジュール URI [{0}] を JarScanner で処理する URL に変換できませんでした。
jarScan.jarUrlStart=URL [{0}] の JAR ファイルをスキャンします。
jarScan.webinfclassesFail=/WEB-INF/classesのスキャンに失敗しました
jarScan.webinflibFail=/WEB-INF/libからJAR [{0}]をスキャンできませんでした。
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Improvements to French translations
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 8eb0fa5 Improvements to French translations
8eb0fa5 is described below
commit 8eb0fa57d9b2161e869984f87a25f25be0f02ae8
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:59:49 2021 +0100
Improvements to French translations
---
java/org/apache/catalina/loader/LocalStrings_fr.properties | 1 -
java/org/apache/tomcat/util/net/LocalStrings_fr.properties | 1 +
java/org/apache/tomcat/websocket/LocalStrings_fr.properties | 1 -
webapps/docs/changelog.xml | 3 +++
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/loader/LocalStrings_fr.properties
b/java/org/apache/catalina/loader/LocalStrings_fr.properties
index 119b668..86de581 100644
--- a/java/org/apache/catalina/loader/LocalStrings_fr.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_fr.properties
@@ -15,7 +15,6 @@
webappClassLoader.addExportsJavaIo=Lorsque Java 9 ou ultérieur est utilisé,
"--add-opens=java.base/java.io={0}" doit être ajouté aux arguments de la ligne
de commande de la JVM pour activer la protection contre les fuites de mémoire
du cache de ObjectStream; cet avertissement peut aussi être supprimé en
désactivant cette protection
webappClassLoader.addExportsRmi=Quand Java 9 est utilisé, il faut utiliser
"--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED" sur la ligne de commande
de la JVM pour activer la détection de fuites de mémoire des cibles RMI ; sinon
cet avertissement peut être supprimé en désactivant cette détection
-webappClassLoader.addExportsThreadLocal=Quand Java 9 est utilisé, il faut
utiliser "--add-opens=java.base/java.lang=ALL-UNNAMED" sur la ligne de commande
de la JVM pour activer la détection de fuites de mémoire des ThreadLocal ;
sinon cet avertissement peut être supprimé en désactivant cette détection
webappClassLoader.addPermissionNoCanonicalFile=Impossible d’obtenir le chemin
de fichier canonique pour l''URL [{0}]
webappClassLoader.addPermissionNoProtocol=Le protocole [{0}] dans l''URL [{1}]
n''est pas supporté donc aucune permission de lecture n''a été assignée pour
les ressources situées à cette URL
webappClassLoader.addTransformer=Ajout d''un transformateur de fichier de
class [{0}] pour l''application web [{1}]
diff --git a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
index fd4a223..14128f6 100644
--- a/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/net/LocalStrings_fr.properties
@@ -46,6 +46,7 @@ channel.nio.ssl.wrapFail=Impossible d''enrober (wrap) les
données, le status es
endpoint.accept.fail=Aucun socket n'a pu être accepté
endpoint.alpn.fail=Erreur de configuration de la terminaison pour ALPN en
utilisant [{0}]
+endpoint.alpn.negotiated=Le protocole [{0}] a été négocié en utilisant ALPN
endpoint.apr.failSslContextMake=Incapable de créer un SSLContext. Vérifier que
SSLEngine est activé dans l'AprLifecycleListener, que l'AprLifecycleListener a
été correctement initialisé et qu'un protocole SSL valide a été spécifié.
endpoint.apr.invalidSslProtocol=Un valeur invalide [{0}] a été donnée pour
l''attribut SSLProtocol
endpoint.debug.channelCloseFail=Echec de la fermeture du canal (channel)
diff --git a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
index acaa7c1..e681368 100644
--- a/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/websocket/LocalStrings_fr.properties
@@ -25,7 +25,6 @@ asyncChannelWrapperSecure.eof=Fin de flux inattendue
asyncChannelWrapperSecure.statusUnwrap=Etat inattendu de SSLEngineResult après
une opération unwrap()
asyncChannelWrapperSecure.statusWrap=Etat inattendu de SSLEngineResult après
une opération wrap()
asyncChannelWrapperSecure.tooBig=Le résultat [{0}] est trop grand pour pouvoir
être converti en Integer
-asyncChannelWrapperSecure.unexpectedHandshakeState=Etat [{0}] inattendu
pendant la négociation TLS
asyncChannelWrapperSecure.wrongStateRead=L'indicateur de lecture en cours
était faux alors qu'il aurait dû vrai lors d'une tentative pour terminer une
opération de lecture
asyncChannelWrapperSecure.wrongStateWrite=L'indicateur d'écriture en cours
était faux alors qu'il aurait dû vrai lors d'une tentative pour terminer une
opération d'écriture
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 645a0f3..6ea5c1f 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -253,6 +253,9 @@
Improvements to Chinese translations contributed by syseal, wolibo and
ZhangJieWen. (markt)
+
+Improvements to French tr
[tomcat] branch main updated: Improvements to Chinese translations.
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 d2b1927 Improvements to Chinese translations.
d2b1927 is described below
commit d2b19276ea9f3781a849b36fc58a8f143f92154d
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:56:31 2021 +0100
Improvements to Chinese translations.
---
.../catalina/loader/LocalStrings_zh_CN.properties | 1 -
.../interceptors/LocalStrings_zh_CN.properties | 3 +--
java/org/apache/el/LocalStrings_zh_CN.properties | 25 ++
webapps/docs/changelog.xml | 4
4 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
index 8ecd37d..8874fbb 100644
--- a/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
+++ b/java/org/apache/catalina/loader/LocalStrings_zh_CN.properties
@@ -15,7 +15,6 @@
webappClassLoader.addExportsJavaIo=在Java 9或更高版本上运行时,需要向JVM命令行参数中添加"--add
opens=Java.base/Java.io={0}",以启用ObjectStream缓存内存泄漏保护.或者，可以通过禁用ObjectStream类缓存内存泄漏保护来抑制此警告.
webappClassLoader.addExportsRmi=在Java 9上运行时，需要在JVM命令行参数中添加“-add
opens=Java.rmi/sun.rmi.transport=ALL-UNNAMED”，以启用rmi目标内存泄漏检测。或者，可以通过禁用RMI目标内存泄漏检测来抑制此警告。
-webappClassLoader.addExportsThreadLocal=在Java 9上运行时，需要在JVM命令行参数中添加“-add
opens=Java.base/Java.lang=ALL-UNNAMED”，以启用线程本地内存泄漏检测。或者，可以通过禁用ThreadLocal内存泄漏检测来抑制此警告。
webappClassLoader.addPermissionNoCanonicalFile=无法从URL[{0}]获取规范文件路径
webappClassLoader.addPermissionNoProtocol=不支持URL[{1}]中的协议[{0}]，因此未授予位于此URL的资源的读取权限
webappClassLoader.addTransformer=将类文件转换器[{0}]添加到Web应用程序[{1}]。
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
index 8fd3f13..78e2cc7 100644
---
a/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
+++
b/java/org/apache/catalina/tribes/group/interceptors/LocalStrings_zh_CN.properties
@@ -97,8 +97,7 @@ throughputInterceptor.report=吞吐量拦截器报告[\n\
\错误消息：{6}\n\
\接收消息：{7} 消息数\n\
\接收速率：{8} MB/秒（从第一个消息开始）\n\
-\收到：{9}MB]\n\
-\n
+\收到：{9}MB]\n
twoPhaseCommitInterceptor.expiredMessage=正在删除过期邮件[{0}]
twoPhaseCommitInterceptor.heartbeat.failed=无法在两阶段提交拦截器上执行心跳。
diff --git a/java/org/apache/el/LocalStrings_zh_CN.properties
b/java/org/apache/el/LocalStrings_zh_CN.properties
new file mode 100644
index 000..9518411
--- /dev/null
+++ b/java/org/apache/el/LocalStrings_zh_CN.properties
@@ -0,0 +1,25 @@
+# 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.
+
+error.cannotSetVariables=不能在工厂上设置变量
+error.context.null=ELConect为空
+error.method.nullParms=参数类型不能为null
+error.noVariableMapperTarget=VariableMapper目标不能为空
+error.null=表达式不能为null
+error.nullLocalName=本地名称不能为null
+error.nullMethod=方法不能为null
+error.value.expectedType=预期的类型不能为null
+
+stream.compare.notComparable=Stream中的元素必须实现了Comparable接口
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2377fd3..645a0f3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -249,6 +249,10 @@
Switch to the CDN as the primary download location for ASF
dependencies.
(markt)
+
+Improvements to Chinese translations contributed by syseal, wolibo and
+ZhangJieWen. (markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat Native 1.2.31 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat Native 1.2.31 stable. The key features of this release are: - Windows binaries built using OpenSSL 1.1.1l - Fix an issue when building with OpenSSl 3.0.0 Please refer to the change log for the complete list of changes: http://tomcat.apache.org/native-doc/miscellaneous/changelog.html Downloads: http://tomcat.apache.org/download-native.cgi The Apache Tomcat Native Library provides portable API for features not found in contemporary JDK's. It uses Apache Portable Runtime as operating system abstraction layer and OpenSSL for SSL networking and allows optimal performance in production environments. - 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: Use CDN as primary source of ASF dependencies
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 5316299 Use CDN as primary source of ASF dependencies
5316299 is described below
commit 531629973d3d21b0c7d2e2749bd808ad2c6ae2cb
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:37:30 2021 +0100
Use CDN as primary source of ASF dependencies
---
build.properties.default | 2 +-
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 6935dca..7a041bf 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -99,7 +99,7 @@ compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
compile.deprecation=false
-base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download&filename=
+base-apache.loc.1=https://dlcdn.apache.org
base-apache.loc.2=https://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
base-commons.loc.2=${base-apache.loc.2}/commons
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a5ee483..a9a6ab4 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -208,6 +208,10 @@
Update the packaged version of the Tomcat Native Library to 1.2.31 to
pick up Windows binaries built with OpenSSL 1.1.1l.(markt)
+
+Switch to the CDN as the primary download location for ASF
dependencies.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Use CDN as primary source of ASF dependencies
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 86e8ed2 Use CDN as primary source of ASF dependencies
86e8ed2 is described below
commit 86e8ed264529f4832ed1f6e41b01f0d47ab3a500
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:37:30 2021 +0100
Use CDN as primary source of ASF dependencies
---
build.properties.default | 2 +-
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 7f75eee..92e2c9e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -96,7 +96,7 @@ compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
compile.deprecation=false
-base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download&filename=
+base-apache.loc.1=https://dlcdn.apache.org
base-apache.loc.2=https://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
base-commons.loc.2=${base-apache.loc.2}/commons
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4931bdf..1f7b982 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -227,6 +227,10 @@
Update the packaged version of the Tomcat Native Library to 1.2.31 to
pick up Windows binaries built with OpenSSL 1.1.1l.(markt)
+
+Switch to the CDN as the primary download location for ASF
dependencies.
+(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: Use CDN as primary source of ASF dependencies
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 381c883 Use CDN as primary source of ASF dependencies
381c883 is described below
commit 381c883b43f791a5efad3ded7ea1a2b58227ec19
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:37:30 2021 +0100
Use CDN as primary source of ASF dependencies
---
build.properties.default | 2 +-
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 2c56370..96a5346 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -96,7 +96,7 @@ compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
compile.deprecation=false
-base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download&filename=
+base-apache.loc.1=https://dlcdn.apache.org
base-apache.loc.2=https://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
base-commons.loc.2=${base-apache.loc.2}/commons
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 85fddb7..f59579d 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -227,6 +227,10 @@
Update the packaged version of the Tomcat Native Library to 1.2.31 to
pick up Windows binaries built with OpenSSL 1.1.1l.(markt)
+
+Switch to the CDN as the primary download location for ASF
dependencies.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Use CDN as primary source of ASF dependencies
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 69f6483 Use CDN as primary source of ASF dependencies
69f6483 is described below
commit 69f6483e67878f502f1af88497968f7d4f66aa44
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:37:30 2021 +0100
Use CDN as primary source of ASF dependencies
---
build.properties.default | 2 +-
webapps/docs/changelog.xml | 4
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/build.properties.default b/build.properties.default
index 2cb3fa5..3cc1cc6 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -94,7 +94,7 @@ compile.debug=true
# Do not pass -deprecation (-Xlint:deprecation) flag to javac
compile.deprecation=false
-base-apache.loc.1=https://www.apache.org/dyn/closer.lua?action=download&filename=
+base-apache.loc.1=https://dlcdn.apache.org
base-apache.loc.2=https://archive.apache.org/dist
base-commons.loc.1=${base-apache.loc.1}/commons
base-commons.loc.2=${base-apache.loc.2}/commons
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index a35bd14..2377fd3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -245,6 +245,10 @@
Update the packaged version of the Tomcat Native Library to 1.2.31 to
pick up Windows binaries built with OpenSSL 1.1.1l.(markt)
+
+Switch to the CDN as the primary download location for ASF
dependencies.
+(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Update to Tomcat Native 1.2.31
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 daad829 Update to Tomcat Native 1.2.31
daad829 is described below
commit daad829fb71195b6eef8164f7f41a91d4af0a25e
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:00:49 2021 +0100
Update to Tomcat Native 1.2.31
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 457a24d..6935dca 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -156,19 +156,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.30
+tomcat-native.version=1.2.31
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
+tomcat-native.src.checksum.value=2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=ce84edcec3b5a89b0c30951bb8832695a657e7558bceece8e92551644773d0f763369951d9d043dbf52653f4e37238d8d53555ae58cc0017bf777b447d00f603
+tomcat-native.win.checksum.value=c88aad31f4e3c860e73a28903de0b4bb2c1d46851e48711ae9a86e6da98fe20db03c6e44957e97bbf1916decc1aba048e907b2072539b1b5da4aea2b88d8a39d
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1l-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1l-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.06.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index d32e370..a5ee483 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -204,6 +204,10 @@
Update the internal fork of Apache Commons DBCP to c6d5cd9
(2021-06-05, 2.9.0-SNAPSHOT). Refactoring and code clean-up. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.31 to
+pick up Windows binaries built with OpenSSL 1.1.1l.(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Update to Tomcat Native 1.2.31
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 89da229 Update to Tomcat Native 1.2.31
89da229 is described below
commit 89da2297158cc7e49b42149c58c12a4a6abb866e
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:00:49 2021 +0100
Update to Tomcat Native 1.2.31
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 5d395ad..7f75eee 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -148,19 +148,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.30
+tomcat-native.version=1.2.31
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
+tomcat-native.src.checksum.value=2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=ce84edcec3b5a89b0c30951bb8832695a657e7558bceece8e92551644773d0f763369951d9d043dbf52653f4e37238d8d53555ae58cc0017bf777b447d00f603
+tomcat-native.win.checksum.value=c88aad31f4e3c860e73a28903de0b4bb2c1d46851e48711ae9a86e6da98fe20db03c6e44957e97bbf1916decc1aba048e907b2072539b1b5da4aea2b88d8a39d
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1l-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1l-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.06.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 2d6482a..4931bdf 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -223,6 +223,10 @@
Update the internal fork of Apache Commons DBCP to 2.9.0 (2021-08-03).
Improvements, code clean-up and refactoring. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.31 to
+pick up Windows binaries built with OpenSSL 1.1.1l.(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: Update to Tomcat Native 1.2.31
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 7062f72 Update to Tomcat Native 1.2.31
7062f72 is described below
commit 7062f72ea13f312488a93daaf11039240b84c104
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:00:49 2021 +0100
Update to Tomcat Native 1.2.31
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 0dddea9..2c56370 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -148,19 +148,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.30
+tomcat-native.version=1.2.31
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
+tomcat-native.src.checksum.value=2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=ce84edcec3b5a89b0c30951bb8832695a657e7558bceece8e92551644773d0f763369951d9d043dbf52653f4e37238d8d53555ae58cc0017bf777b447d00f603
+tomcat-native.win.checksum.value=c88aad31f4e3c860e73a28903de0b4bb2c1d46851e48711ae9a86e6da98fe20db03c6e44957e97bbf1916decc1aba048e907b2072539b1b5da4aea2b88d8a39d
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1l-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1l-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.06.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ab56112..85fddb7 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -223,6 +223,10 @@
Update the internal fork of Apache Commons DBCP to 2.9.0 (2021-08-03).
Improvements, code clean-up and refactoring. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.31 to
+pick up Windows binaries built with OpenSSL 1.1.1l.(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Update to Tomcat Native 1.2.31
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 92ad31a Update to Tomcat Native 1.2.31
92ad31a is described below
commit 92ad31acce0ab5ddc79ffc6c45a6ba61063f1e62
Author: Mark Thomas
AuthorDate: Thu Sep 2 20:00:49 2021 +0100
Update to Tomcat Native 1.2.31
---
build.properties.default | 10 +-
webapps/docs/changelog.xml | 4
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index 53fe36e..2cb3fa5 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -146,19 +146,19 @@
jdt.loc.1=http://archive.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj
jdt.loc.2=http://download.eclipse.org/eclipse/downloads/drops4/${jdt.release}/ecj-${jdt.version}.jar
# - Tomcat native library -
-tomcat-native.version=1.2.30
+tomcat-native.version=1.2.31
tomcat-native.src.checksum.enabled=true
tomcat-native.src.checksum.algorithm=SHA-512
-tomcat-native.src.checksum.value=51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953
+tomcat-native.src.checksum.value=2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49
tomcat-native.win.checksum.enabled=true
tomcat-native.win.checksum.algorithm=SHA-512
-tomcat-native.win.checksum.value=ce84edcec3b5a89b0c30951bb8832695a657e7558bceece8e92551644773d0f763369951d9d043dbf52653f4e37238d8d53555ae58cc0017bf777b447d00f603
+tomcat-native.win.checksum.value=c88aad31f4e3c860e73a28903de0b4bb2c1d46851e48711ae9a86e6da98fe20db03c6e44957e97bbf1916decc1aba048e907b2072539b1b5da4aea2b88d8a39d
tomcat-native.home=${base.path}/tomcat-native-${tomcat-native.version}
tomcat-native.tar.gz=${tomcat-native.home}/tomcat-native.tar.gz
tomcat-native.loc.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
tomcat-native.loc.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/source/tomcat-native-${tomcat-native.version}-src.tar.gz
-tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
-tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1k-win32-bin.zip
+tomcat-native.win.1=${base-tomcat.loc.1}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1l-win32-bin.zip
+tomcat-native.win.2=${base-tomcat.loc.2}/tomcat-connectors/native/${tomcat-native.version}/binaries/tomcat-native-${tomcat-native.version}-openssl-1.1.1l-win32-bin.zip
# - NSIS, version 3.0 or later -
nsis.version=3.06.1
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0cea478..a35bd14 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -241,6 +241,10 @@
Update the internal fork of Apache Commons DBCP to 2.9.0 (2021-08-03).
Improvements, code clean-up and refactoring. (markt)
+
+Update the packaged version of the Tomcat Native Library to 1.2.31 to
+pick up Windows binaries built with OpenSSL 1.1.1l.(markt)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1892827 - in /tomcat/site/trunk: docs/download-native.html xdocs/download-native.xml
Author: markt Date: Thu Sep 2 18:53:39 2021 New Revision: 1892827 URL: http://svn.apache.org/viewvc?rev=1892827&view=rev Log: OpenSSL version also changed. Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/xdocs/download-native.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1892827&r1=1892826&r2=1892827&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Thu Sep 2 18:53:39 2021 @@ -88,25 +88,25 @@ and 64-bit (x64) CPU architectures. You have to use the DLL that matches CPU architecture of JVM that you use to run Tomcat. -Binaries for Microsoft Windows built with OpenSSL 1.1.1k +Binaries for Microsoft Windows built with OpenSSL 1.1.1l - + Native 1.2.31 Windows Binaries zip (recommended) - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-win32-bin.zip.asc";>PGP], - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-win32-bin.zip.sha512";>SHA512] + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1l-win32-bin.zip.asc";>PGP], + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1l-win32-bin.zip.sha512";>SHA512] - + Native 1.2.31 Windows OCSP-enabled Binaries zip - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-ocsp-win32-bin.zip.asc";>PGP], - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-ocsp-win32-bin.zip.sha512";>SHA512] + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1l-ocsp-win32-bin.zip.asc";>PGP], + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1l-ocsp-win32-bin.zip.sha512";>SHA512] Modified: tomcat/site/trunk/xdocs/download-native.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-native.xml?rev=1892827&r1=1892826&r2=1892827&view=diff == --- tomcat/site/trunk/xdocs/download-native.xml (original) +++ tomcat/site/trunk/xdocs/download-native.xml Thu Sep 2 18:53:39 2021 @@ -89,25 +89,25 @@ and 64-bit (x64) CPU architectures. You have to use the DLL that matches CPU architecture of JVM that you use to run Tomcat. -Binaries for Microsoft Windows built with OpenSSL 1.1.1k +Binaries for Microsoft Windows built with OpenSSL 1.1.1l - + Native 1.2.31 Windows Binaries zip (recommended) - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-win32-bin.zip.asc";>PGP], - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-win32-bin.zip.sha512";>SHA512] + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1l-win32-bin.zip.asc";>PGP], + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1l-win32-bin.zip.sha512";>SHA512] - + Native 1.2.31 Windows OCSP-enabled Binaries zip - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-ocsp-win32-bin.zip.asc";>PGP], - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-ocsp-win32-bin.zip.sha512";>SHA512] + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1l-ocsp-win32-bin.zip.asc";>PGP], + [https://downloads.apache.or
[tomcat-native] branch main updated: Review output of conscious language checker for Tomcat Native
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat-native.git The following commit(s) were added to refs/heads/main by this push: new c17d3e0 Review output of conscious language checker for Tomcat Native c17d3e0 is described below commit c17d3e0e0a594604ff4f30065360aacc688cfb50 Author: Mark Thomas AuthorDate: Thu Sep 2 19:48:10 2021 +0100 Review output of conscious language checker for Tomcat Native --- native/NMAKEmakefile| 2 +- native/NMAKEmakefile.inc| 2 +- native/srclib/apr/NMAKEmakefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile index 24cdbb4..1c91b5c 100644 --- a/native/NMAKEmakefile +++ b/native/NMAKEmakefile @@ -15,7 +15,7 @@ # # # -# NMAKEmakefile Master Tomcat Native makefile. +# NMAKEmakefile Tomcat Native makefile. # Usage: # APR_DECLARE_STATIC=1 Use static version of the APR # ENABLE_OCSP=1Enable OpenSSL OCSP code diff --git a/native/NMAKEmakefile.inc b/native/NMAKEmakefile.inc index 751a1d2..257d30b 100644 --- a/native/NMAKEmakefile.inc +++ b/native/NMAKEmakefile.inc @@ -18,7 +18,7 @@ # # # -# Makefile.inc Master makefile definitions. +# Makefile.inc Tomcat Native makefile definitions. # This file defines CPU architecture and basic compiler # and linker parameters. # Common params: diff --git a/native/srclib/apr/NMAKEmakefile b/native/srclib/apr/NMAKEmakefile index 1d760a3..9cd5f71 100644 --- a/native/srclib/apr/NMAKEmakefile +++ b/native/srclib/apr/NMAKEmakefile @@ -15,7 +15,7 @@ # # # -# NMAKEmakefile Master APR makefile. +# NMAKEmakefile APR makefile. # Usage: # DLL=1 Build DLL version # DEBUG=1 Build DEBUG version of APR - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1892824 - in /tomcat/site/trunk: docs/download-native.html docs/index.html docs/oldnews.html xdocs/download-native.xml xdocs/index.xml xdocs/oldnews.xml
Author: markt Date: Thu Sep 2 18:34:40 2021 New Revision: 1892824 URL: http://svn.apache.org/viewvc?rev=1892824&view=rev Log: Update site for Tomcat Native 1.2.31 release Modified: tomcat/site/trunk/docs/download-native.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/xdocs/download-native.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/oldnews.xml Modified: tomcat/site/trunk/docs/download-native.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-native.html?rev=1892824&r1=1892823&r2=1892824&view=diff == --- tomcat/site/trunk/docs/download-native.html (original) +++ tomcat/site/trunk/docs/download-native.html Thu Sep 2 18:34:40 2021 @@ -49,22 +49,22 @@ Source (please choose the correct format for your platform) - -Native 1.2.30 Source Release tar.gz (e.g. Unix, Linux, Mac OS) + +Native 1.2.31 Source Release tar.gz (e.g. Unix, Linux, Mac OS) -[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.30/source/tomcat-native-1.2.30-src.tar.gz.asc";>PGP], -[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.30/source/tomcat-native-1.2.30-src.tar.gz.sha512";>SHA512] +[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/source/tomcat-native-1.2.31-src.tar.gz.asc";>PGP], +[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/source/tomcat-native-1.2.31-src.tar.gz.sha512";>SHA512] - -Native 1.2.30 Source Release zip (e.g. Windows) + +Native 1.2.31 Source Release zip (e.g. Windows) -[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.30/source/tomcat-native-1.2.30-win32-src.zip.asc";>PGP], -[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.30/source/tomcat-native-1.2.30-win32-src.zip.sha512";>SHA512] +[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/source/tomcat-native-1.2.31-win32-src.zip.asc";>PGP], +[https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/source/tomcat-native-1.2.31-win32-src.zip.sha512";>SHA512] @@ -73,7 +73,7 @@ You can find binaries release too. You may download them from - HERE + HERE @@ -91,22 +91,22 @@ Binaries for Microsoft Windows built with OpenSSL 1.1.1k - - Native 1.2.30 Windows Binaries zip (recommended) + + Native 1.2.31 Windows Binaries zip (recommended) - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.30/binaries/tomcat-native-1.2.30-openssl-1.1.1k-win32-bin.zip.asc";>PGP], - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.30/binaries/tomcat-native-1.2.30-openssl-1.1.1k-win32-bin.zip.sha512";>SHA512] + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-win32-bin.zip.asc";>PGP], + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-win32-bin.zip.sha512";>SHA512] - - Native 1.2.30 Windows OCSP-enabled Binaries zip + + Native 1.2.31 Windows OCSP-enabled Binaries zip - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.30/binaries/tomcat-native-1.2.30-openssl-1.1.1k-ocsp-win32-bin.zip.asc";>PGP], - [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.30/binaries/tomcat-native-1.2.30-openssl-1.1.1k-ocsp-win32-bin.zip.sha512";>SHA512] + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-ocsp-win32-bin.zip.asc";>PGP], + [https://downloads.apache.org/tomcat/tomcat-connectors/native/1.2.31/binaries/tomcat-native-1.2.31-openssl-1.1.1k-ocsp-win32-bin.zip.sha512";>SHA512] Modified: tomcat/site/trunk/docs/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1892824&r1=1892823&r2=1892824&view=diff == --- tomcat/site/trunk/docs/index.html (ori
svn commit: r1892823 - in /tomcat/site/trunk/docs/native-doc: index.html miscellaneous/changelog.html news/2021.html
Author: markt Date: Thu Sep 2 18:29:40 2021 New Revision: 1892823 URL: http://svn.apache.org/viewvc?rev=1892823&view=rev Log: Update docs for Tomcat Native 1.2.31 release Modified: tomcat/site/trunk/docs/native-doc/index.html tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html tomcat/site/trunk/docs/native-doc/news/2021.html Modified: tomcat/site/trunk/docs/native-doc/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/index.html?rev=1892823&r1=1892822&r2=1892823&view=diff == --- tomcat/site/trunk/docs/native-doc/index.html (original) +++ tomcat/site/trunk/docs/native-doc/index.html Thu Sep 2 18:29:40 2021 @@ -28,10 +28,10 @@ Headlines -4 Jun 2021 - TC-Native-1.2.30 +1 Sep 2021 - TC-Native-1.2.31 released The Apache Tomcat team is proud to announce the immediate availability of -Tomcat Native 1.2.30 Stable. +Tomcat Native 1.2.31 Stable. The sources and the binaries for selected platforms are available from the Download page. @@ -162,10 +162,10 @@ Nov 29, 2020 12:27:41 PM org.apache.coyo INFO: Initializing Coyote HTTP/1.1 on http-8080 -Refer to the tomcat documentation to configure the connectors -(See http://tomcat.apache.org/tomcat-9.0-doc/apr.html";>Tomcat 9.0.x -http://tomcat.apache.org/tomcat-8.5-doc/apr.html";>Tomcat 8.5.x -and http://tomcat.apache.org/tomcat-7.0-doc/apr.html";>Tomcat 7.0.x) +Refer to the tomcat documentation to configure the connectors (See +http://tomcat.apache.org/tomcat-10.0-doc/apr.html";>Tomcat 10.0.x, +http://tomcat.apache.org/tomcat-9.0-doc/apr.html";>Tomcat 9.0.x and +http://tomcat.apache.org/tomcat-8.5-doc/apr.html";>Tomcat 8.5.x) Modified: tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html?rev=1892823&r1=1892822&r2=1892823&view=diff == --- tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html (original) +++ tomcat/site/trunk/docs/native-doc/miscellaneous/changelog.html Thu Sep 2 18:29:40 2021 @@ -3,6 +3,17 @@ This is the Changelog for Tomcat Native 1.2. +Changes in 1.2.31 + + + https://bz.apache.org/bugzilla/show_bug.cgi?id=65441";>65441: Correct previous fix that enabled building to continue + with OpenSSL 3.x. Patch provided by lzsiga. (markt) + + + https://bz.apache.org/bugzilla/show_bug.cgi?id=65659";>65659: Remove remaining reference to pkg-config + which is no longer included in the Tomcat Native distribution. (markt) + + Changes in 1.2.30 Modified: tomcat/site/trunk/docs/native-doc/news/2021.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/native-doc/news/2021.html?rev=1892823&r1=1892822&r2=1892823&view=diff == --- tomcat/site/trunk/docs/native-doc/news/2021.html (original) +++ tomcat/site/trunk/docs/native-doc/news/2021.html Thu Sep 2 18:29:40 2021 @@ -1,5 +1,10 @@ The Apache Tomcat Native - News - 2021 News and Statushttp://tomcat.apache.org/";>http://www.apache.org/"; target="_blank">The Apache Tomcat Native - NewsLinksDocs Home Miscellaneous DocumentationChangelogNews202120202019201820172016201520142013201220112010200920082021 News and Status2021 News & Status + 1 Sep 2021 - TC-Native-1.2.31 released + The Apache Tomcat team is proud to announce the immediate availability of + Tomcat Native 1.2.31. This is a bugfix release. + + 4 Jun 2021 - TC-Native-1.2.30 released The Apache Tomcat team is proud to announce the immediate availability of Tomcat Native 1.2.30. This is a bugfix release. @@ -17,4 +22,4 @@ Copyright © 2008-2020, The Apache Software Foundation - + \ No newline at end of file - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Plans for Tomcat 8.5.71
Rémy, On 9/2/21 05:47, Rémy Maucherat wrote: On Wed, Sep 1, 2021 at 2:52 PM Christopher Schultz wrote: All, Since the tcnative vote has passed, and it's the beginning of the month, I expect to tag + call for a vote on 8.5.71 later today (US-Eastern time). It's an extra-long weekend in the US this upcoming weekend; if I get enough votes by Friday mid-day, I'll do the release, otherwise the vote will likely remain open until Wednesday morning. I think you should wait for the tag on the main branch before doing anything, otherwise you may be missing one of the "auto" pre tag updates (poeditor, etc). Sure thing. I'm running out of time this week, anyway, so next week is a little better for me :) -chris - 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: Update internal DBCP fork to 2021-06-05
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 0cf7efb Update internal DBCP fork to 2021-06-05
0cf7efb is described below
commit 0cf7efb75616c71acc7477723db0f3db7c8c4cb1
Author: Mark Thomas
AuthorDate: Thu Sep 2 17:15:27 2021 +0100
Update internal DBCP fork to 2021-06-05
---
MERGE.txt | 6 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 7 +-
.../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 69 +++--
.../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 322 +
.../dbcp/dbcp2/ConnectionFactoryFactory.java | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/Constants.java | 16 +-
.../dbcp/dbcp2/DataSourceConnectionFactory.java| 2 +-
...DataSourceMXBean.java => DataSourceMXBean.java} | 272 +
.../tomcat/dbcp/dbcp2/DelegatingConnection.java| 18 +-
.../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 19 +-
.../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 24 +-
.../tomcat/dbcp/dbcp2/DelegatingStatement.java | 19 +-
java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java| 4 +-
.../tomcat/dbcp/dbcp2/PoolableConnection.java | 6 +-
.../dbcp/dbcp2/PoolableConnectionFactory.java | 6 +-
.../dbcp/dbcp2/PoolablePreparedStatement.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolingConnection.java | 2 +-
.../tomcat/dbcp/dbcp2/PoolingDataSource.java | 12 +-
.../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 21 +-
java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 8 +-
.../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 71 +++--
.../dbcp2/cpdsadapter/PooledConnectionImpl.java| 12 +-
.../dbcp2/datasources/CPDSConnectionFactory.java | 6 +-
.../dbcp2/datasources/InstanceKeyDataSource.java | 79 +++--
.../datasources/InstanceKeyDataSourceFactory.java | 20 +-
.../datasources/KeyedCPDSConnectionFactory.java| 30 +-
.../dbcp2/datasources/PerUserPoolDataSource.java | 2 +-
.../dbcp2/datasources/PooledConnectionAndInfo.java | 11 +-
.../dbcp2/datasources/SharedPoolDataSource.java| 8 +-
.../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 15 +-
webapps/docs/changelog.xml | 4 +
31 files changed, 408 insertions(+), 687 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index ca9839a..4d7b5de 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -73,4 +73,8 @@ Sub-tree
src/main/java/org/apache/commons/dbcp2
src/main/resources/org/apache/commons/dbcp2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-e24196a95bbbc531eb3c5f1b19e1dc42fd78a783 (2021-01-15)
+1a0e9e8a61b7e8327a159516907778cd74da7a3b (2021-06-05)
+Note: Commits after this point started to make extensive use of the java.time.*
+ package which is not available in Java 7. It is anticipated that further
+ changes to the DBCP 2 fork in Tomcat 8.5.x will be limited to on-demand
+ back-port of bug fixes.
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
index 671e3e6..7ba6656 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.tomcat.dbcp.pool2.TrackedUse;
/**
- * Tracks db connection usage for recovering and reporting abandoned db
connections.
+ * Tracks connection usage for recovering and reporting abandoned connections.
*
* The JDBC Connection, Statement, and ResultSet classes extend this class.
*
@@ -38,7 +38,7 @@ public class AbandonedTrace implements TrackedUse {
private final List> traceList = new
ArrayList<>();
/** Last time this connection was used. */
-private volatile long lastUsedMillis = 0;
+private volatile long lastUsedMillis;
/**
* Creates a new AbandonedTrace without config and without doing abandoned
tracing.
@@ -153,7 +153,8 @@ public class AbandonedTrace implements TrackedUse {
if (trace != null && trace.equals(traceInList)) {
iter.remove();
break;
-} else if (traceInList == null) {
+}
+if (traceInList == null) {
// Clean-up since we are here anyway
iter.remove();
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index 8f11d75..67c6840 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -40,7 +40,9 @@ import java.util.logging.Logger;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.Mal
[tomcat] branch 8.5.x updated: Limited back-port changes to Commons Pool.
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 7604f87 Limited back-port changes to Commons Pool.
7604f87 is described below
commit 7604f87140be5fe7c8d8932f4d79e75f2a613615
Author: Mark Thomas
AuthorDate: Thu Sep 2 16:50:57 2021 +0100
Limited back-port changes to Commons Pool.
As of mid-Feb 2021 the Pool 2 code started to make extensive use of the
java.time.* package which is not available in Java 7. Therefore the code
in 8.5.x has not been updated past this point.
---
MERGE.txt | 6 +++-
.../dbcp/pool2/impl/DefaultPooledObject.java | 32 +++---
.../dbcp/pool2/impl/GenericKeyedObjectPool.java| 4 +--
.../tomcat/dbcp/pool2/impl/GenericObjectPool.java | 14 +-
.../dbcp/pool2/impl/SecurityManagerCallStack.java | 4 +--
.../tomcat/dbcp/pool2/impl/ThrowableCallStack.java | 4 +--
webapps/docs/changelog.xml | 4 +++
7 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 73ecd41..ca9839a 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -62,7 +62,11 @@ Pool2
Sub-tree
src/main/java/org/apache/commons/pool2
The SHA1 ID / tag for the most recent commit to be merged to Tomcat is:
-a38c52529beb04bf0815b7d95fb4a393ea110dee
+0da5c540983485565f08711bf986e1ea43b162f3 (2021-02-02)
+Note: Commits after this point started to make extensive use of the java.time.*
+ package which is not available in Java 7. It is anticipated that further
+ changes to the Pool 2 fork in Tomcat 8.5.x will be limited to on-demand
+ back-port of bug fixes.
DBCP2
Sub-tree
diff --git a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
index 1883041..36cb0df 100644
--- a/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
+++ b/java/org/apache/tomcat/dbcp/pool2/impl/DefaultPooledObject.java
@@ -38,10 +38,10 @@ public class DefaultPooledObject implements
PooledObject {
private final T object;
private PooledObjectState state = PooledObjectState.IDLE; //
@GuardedBy("this") to ensure transitions are valid
-private final long createTime = System.currentTimeMillis();
-private volatile long lastBorrowTime = createTime;
-private volatile long lastUseTime = createTime;
-private volatile long lastReturnTime = createTime;
+private final long createTimeMillis = System.currentTimeMillis();
+private volatile long lastBorrowTimeMillis = createTimeMillis;
+private volatile long lastUseTimeMillis = createTimeMillis;
+private volatile long lastReturnTimeMillis = createTimeMillis;
private volatile boolean logAbandoned = false;
private volatile CallStack borrowedBy = NoOpCallStack.INSTANCE;
private volatile CallStack usedBy = NoOpCallStack.INSTANCE;
@@ -64,14 +64,14 @@ public class DefaultPooledObject implements
PooledObject {
@Override
public long getCreateTime() {
-return createTime;
+return createTimeMillis;
}
@Override
public long getActiveTimeMillis() {
// Take copies to avoid threading issues
-final long rTime = lastReturnTime;
-final long bTime = lastBorrowTime;
+final long rTime = lastReturnTimeMillis;
+final long bTime = lastBorrowTimeMillis;
if (rTime > bTime) {
return rTime - bTime;
@@ -81,7 +81,7 @@ public class DefaultPooledObject implements
PooledObject {
@Override
public long getIdleTimeMillis() {
-final long elapsed = System.currentTimeMillis() - lastReturnTime;
+final long elapsed = System.currentTimeMillis() - lastReturnTimeMillis;
// elapsed may be negative if:
// - another thread updates lastReturnTime during the calculation
window
// - System.currentTimeMillis() is not monotonic (e.g. system time is
set back)
@@ -90,12 +90,12 @@ public class DefaultPooledObject implements
PooledObject {
@Override
public long getLastBorrowTime() {
-return lastBorrowTime;
+return lastBorrowTimeMillis;
}
@Override
public long getLastReturnTime() {
-return lastReturnTime;
+return lastReturnTimeMillis;
}
/**
@@ -120,9 +120,9 @@ public class DefaultPooledObject implements
PooledObject {
@Override
public long getLastUsedTime() {
if (object instanceof TrackedUse) {
-return Math.max(((TrackedUse) object).getLastUsed(), lastUseTime);
+return Math.max(((TrackedUse) object).getLastUsed(),
lastUseTimeMillis);
}
-return lastUseTime;
+return lastUseTimeMillis;
}
@Override
@@ -187,8 +187,8 @@ public class DefaultPooledObject implement
[tomcat] branch 9.0.x updated (98075af -> 5bb554f)
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 98075af Tighten up for partial roles and groups configuration new 4baafb5 Update internal fork of Commons Pool to 2.11.1 new 5bb554f Update internal fork of Commons DBCP to 2.9.0 (2021-08-03) 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: MERGE.txt |4 +- .../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 33 +- .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 643 -- .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 521 ++--- .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 330 +-- .../dbcp/dbcp2/ConnectionFactoryFactory.java |2 +- java/org/apache/tomcat/dbcp/dbcp2/Constants.java | 16 +- .../dbcp/dbcp2/DataSourceConnectionFactory.java|2 +- ...DataSourceMXBean.java => DataSourceMXBean.java} | 284 ++- .../tomcat/dbcp/dbcp2/DelegatingConnection.java| 866 +++ .../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 19 +- .../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 24 +- .../tomcat/dbcp/dbcp2/DelegatingStatement.java | 19 +- .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 136 +- java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java|4 +- .../dbcp/dbcp2/PoolableCallableStatement.java | 30 +- .../tomcat/dbcp/dbcp2/PoolableConnection.java | 283 ++- .../dbcp/dbcp2/PoolableConnectionFactory.java | 171 +- .../dbcp/dbcp2/PoolableConnectionMXBean.java | 44 +- .../dbcp/dbcp2/PoolablePreparedStatement.java | 20 +- .../tomcat/dbcp/dbcp2/PoolingConnection.java | 68 +- .../tomcat/dbcp/dbcp2/PoolingDataSource.java | 183 +- .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 225 +- java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 52 +- .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 106 +- .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 193 +- .../dbcp2/cpdsadapter/PooledConnectionImpl.java| 110 +- .../dbcp2/datasources/CPDSConnectionFactory.java | 426 ++-- .../tomcat/dbcp/dbcp2/datasources/CharArray.java | 88 + .../dbcp2/datasources/InstanceKeyDataSource.java | 1220 +- .../datasources/InstanceKeyDataSourceFactory.java | 226 +- .../datasources/KeyedCPDSConnectionFactory.java| 335 +-- .../dbcp2/datasources/PerUserPoolDataSource.java | 343 ++- .../datasources/PerUserPoolDataSourceFactory.java | 65 +- .../tomcat/dbcp/dbcp2/datasources/PoolKey.java |2 +- .../dbcp2/datasources/PooledConnectionAndInfo.java | 55 +- .../dbcp2/datasources/PooledConnectionManager.java | 30 +- .../dbcp2/datasources/SharedPoolDataSource.java| 104 +- .../datasources/SharedPoolDataSourceFactory.java | 10 +- .../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 53 +- .../dbcp/dbcp2/managed/BasicManagedDataSource.java | 227 +- .../managed/DataSourceXAConnectionFactory.java | 45 +- .../dbcp2/managed/LocalXAConnectionFactory.java| 39 +- .../dbcp/dbcp2/managed/ManagedConnection.java | 36 +- .../dbcp/dbcp2/managed/ManagedDataSource.java | 29 +- .../managed/PoolableManagedConnectionFactory.java |3 +- .../dbcp/dbcp2/managed/TransactionContext.java | 181 +- .../dbcp2/managed/TransactionContextListener.java | 29 +- .../dbcp/dbcp2/managed/TransactionRegistry.java| 134 +- .../dbcp/dbcp2/managed/XAConnectionFactory.java| 45 +- .../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 70 +- .../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 84 +- .../tomcat/dbcp/pool2/BasePooledObjectFactory.java | 53 +- java/org/apache/tomcat/dbcp/pool2/DestroyMode.java | 10 +- .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 23 +- .../dbcp/pool2/KeyedPooledObjectFactory.java | 58 +- java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 14 +- java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 2360 ++-- .../org/apache/tomcat/dbcp/pool2/PooledObject.java | 308 ++- .../tomcat/dbcp/pool2/PooledObjectFactory.java | 48 +- .../tomcat/dbcp/pool2/PooledObjectState.java | 28 +- .../dbcp/pool2/SwallowedExceptionListener.java |2 +- java/org/apache/tomcat/dbcp/pool2/TrackedUse.java | 30 +- .../apache/tomcat/dbcp/pool2/UsageTracking.java| 15 +- .../tomcat/dbcp/pool2/impl/AbandonedConfig.java| 325 +-- .../dbcp/pool2/impl/BaseGenericObjectPool.java | 2279 +++ .../dbcp/pool2/impl/BaseObjectPoolConfig.java | 906 +--- .../apache/tomcat/dbcp/pool2/impl/CallStack.java | 24 +- .../tomcat/dbcp/pool2/impl/CallStackUtils.java |2 +- .../dbcp/pool
[tomcat] branch 10.0.x updated (a1bd28d -> 72e85bb)
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 a1bd28d Tighten up for partial roles and groups configuration new c917683 Update internal fork of Commons Pool to 2.11.1 new 72e85bb Update internal fork of Commons DBCP to 2.9.0 (2021-08-03) 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: MERGE.txt |4 +- .../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 33 +- .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 643 -- .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 521 ++--- .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 330 +-- .../dbcp/dbcp2/ConnectionFactoryFactory.java |2 +- java/org/apache/tomcat/dbcp/dbcp2/Constants.java | 16 +- .../dbcp/dbcp2/DataSourceConnectionFactory.java|2 +- ...DataSourceMXBean.java => DataSourceMXBean.java} | 284 ++- .../tomcat/dbcp/dbcp2/DelegatingConnection.java| 866 +++ .../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 19 +- .../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 24 +- .../tomcat/dbcp/dbcp2/DelegatingStatement.java | 19 +- .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 136 +- java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java|4 +- .../dbcp/dbcp2/PoolableCallableStatement.java | 30 +- .../tomcat/dbcp/dbcp2/PoolableConnection.java | 283 ++- .../dbcp/dbcp2/PoolableConnectionFactory.java | 171 +- .../dbcp/dbcp2/PoolableConnectionMXBean.java | 44 +- .../dbcp/dbcp2/PoolablePreparedStatement.java | 20 +- .../tomcat/dbcp/dbcp2/PoolingConnection.java | 68 +- .../tomcat/dbcp/dbcp2/PoolingDataSource.java | 183 +- .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 225 +- java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 52 +- .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 106 +- .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 193 +- .../dbcp2/cpdsadapter/PooledConnectionImpl.java| 110 +- .../dbcp2/datasources/CPDSConnectionFactory.java | 426 ++-- .../tomcat/dbcp/dbcp2/datasources/CharArray.java | 88 + .../dbcp2/datasources/InstanceKeyDataSource.java | 1220 +- .../datasources/InstanceKeyDataSourceFactory.java | 226 +- .../datasources/KeyedCPDSConnectionFactory.java| 335 +-- .../dbcp2/datasources/PerUserPoolDataSource.java | 343 ++- .../datasources/PerUserPoolDataSourceFactory.java | 65 +- .../tomcat/dbcp/dbcp2/datasources/PoolKey.java |2 +- .../dbcp2/datasources/PooledConnectionAndInfo.java | 55 +- .../dbcp2/datasources/PooledConnectionManager.java | 30 +- .../dbcp2/datasources/SharedPoolDataSource.java| 104 +- .../datasources/SharedPoolDataSourceFactory.java | 10 +- .../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 53 +- .../dbcp/dbcp2/managed/BasicManagedDataSource.java | 227 +- .../managed/DataSourceXAConnectionFactory.java | 45 +- .../dbcp2/managed/LocalXAConnectionFactory.java| 39 +- .../dbcp/dbcp2/managed/ManagedConnection.java | 36 +- .../dbcp/dbcp2/managed/ManagedDataSource.java | 29 +- .../managed/PoolableManagedConnectionFactory.java |3 +- .../dbcp/dbcp2/managed/TransactionContext.java | 181 +- .../dbcp2/managed/TransactionContextListener.java | 29 +- .../dbcp/dbcp2/managed/TransactionRegistry.java| 134 +- .../dbcp/dbcp2/managed/XAConnectionFactory.java| 45 +- .../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 70 +- .../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 84 +- .../tomcat/dbcp/pool2/BasePooledObjectFactory.java | 53 +- java/org/apache/tomcat/dbcp/pool2/DestroyMode.java | 10 +- .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 23 +- .../dbcp/pool2/KeyedPooledObjectFactory.java | 58 +- java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 14 +- java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 2360 ++-- .../org/apache/tomcat/dbcp/pool2/PooledObject.java | 308 ++- .../tomcat/dbcp/pool2/PooledObjectFactory.java | 48 +- .../tomcat/dbcp/pool2/PooledObjectState.java | 28 +- .../dbcp/pool2/SwallowedExceptionListener.java |2 +- java/org/apache/tomcat/dbcp/pool2/TrackedUse.java | 30 +- .../apache/tomcat/dbcp/pool2/UsageTracking.java| 15 +- .../tomcat/dbcp/pool2/impl/AbandonedConfig.java| 325 +-- .../dbcp/pool2/impl/BaseGenericObjectPool.java | 2279 +++ .../dbcp/pool2/impl/BaseObjectPoolConfig.java | 906 +--- .../apache/tomcat/dbcp/pool2/impl/CallStack.java | 24 +- .../tomcat/dbcp/pool2/impl/CallStackUtils.java |2 +- .../dbcp/poo
[tomcat] branch main updated (e1cef2c -> d2e8a3b4)
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 e1cef2c Tighten up for partial roles and groups configuration new fbd85f4 Update internal fork of Commons Pool to 2.11.1 new d2e8a3b4 Update internal fork of Commons DBCP to 2.9.0 (2021-08-03) 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: MERGE.txt |4 +- .../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 33 +- .../apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 643 -- .../tomcat/dbcp/dbcp2/BasicDataSourceFactory.java | 521 ++--- .../tomcat/dbcp/dbcp2/BasicDataSourceMXBean.java | 330 +-- .../dbcp/dbcp2/ConnectionFactoryFactory.java |2 +- java/org/apache/tomcat/dbcp/dbcp2/Constants.java | 16 +- .../dbcp/dbcp2/DataSourceConnectionFactory.java|2 +- ...DataSourceMXBean.java => DataSourceMXBean.java} | 284 ++- .../tomcat/dbcp/dbcp2/DelegatingConnection.java| 866 +++ .../dbcp/dbcp2/DelegatingDatabaseMetaData.java | 19 +- .../tomcat/dbcp/dbcp2/DelegatingResultSet.java | 24 +- .../tomcat/dbcp/dbcp2/DelegatingStatement.java | 19 +- .../org/apache/tomcat/dbcp/dbcp2/Jdbc41Bridge.java | 136 +- java/org/apache/tomcat/dbcp/dbcp2/PStmtKey.java|4 +- .../dbcp/dbcp2/PoolableCallableStatement.java | 30 +- .../tomcat/dbcp/dbcp2/PoolableConnection.java | 283 ++- .../dbcp/dbcp2/PoolableConnectionFactory.java | 171 +- .../dbcp/dbcp2/PoolableConnectionMXBean.java | 44 +- .../dbcp/dbcp2/PoolablePreparedStatement.java | 20 +- .../tomcat/dbcp/dbcp2/PoolingConnection.java | 68 +- .../tomcat/dbcp/dbcp2/PoolingDataSource.java | 183 +- .../apache/tomcat/dbcp/dbcp2/PoolingDriver.java| 225 +- java/org/apache/tomcat/dbcp/dbcp2/Utils.java | 52 +- .../dbcp/dbcp2/cpdsadapter/ConnectionImpl.java | 106 +- .../dbcp/dbcp2/cpdsadapter/DriverAdapterCPDS.java | 193 +- .../dbcp2/cpdsadapter/PooledConnectionImpl.java| 110 +- .../dbcp2/datasources/CPDSConnectionFactory.java | 426 ++-- .../tomcat/dbcp/dbcp2/datasources/CharArray.java | 88 + .../dbcp2/datasources/InstanceKeyDataSource.java | 1220 +- .../datasources/InstanceKeyDataSourceFactory.java | 226 +- .../datasources/KeyedCPDSConnectionFactory.java| 335 +-- .../dbcp2/datasources/PerUserPoolDataSource.java | 343 ++- .../datasources/PerUserPoolDataSourceFactory.java | 65 +- .../tomcat/dbcp/dbcp2/datasources/PoolKey.java |2 +- .../dbcp2/datasources/PooledConnectionAndInfo.java | 55 +- .../dbcp2/datasources/PooledConnectionManager.java | 30 +- .../dbcp2/datasources/SharedPoolDataSource.java| 104 +- .../datasources/SharedPoolDataSourceFactory.java | 10 +- .../tomcat/dbcp/dbcp2/datasources/UserPassKey.java | 53 +- .../dbcp/dbcp2/managed/BasicManagedDataSource.java | 227 +- .../managed/DataSourceXAConnectionFactory.java | 45 +- .../dbcp2/managed/LocalXAConnectionFactory.java| 39 +- .../dbcp/dbcp2/managed/ManagedConnection.java | 36 +- .../dbcp/dbcp2/managed/ManagedDataSource.java | 29 +- .../managed/PoolableManagedConnectionFactory.java |3 +- .../dbcp/dbcp2/managed/TransactionContext.java | 181 +- .../dbcp2/managed/TransactionContextListener.java | 29 +- .../dbcp/dbcp2/managed/TransactionRegistry.java| 134 +- .../dbcp/dbcp2/managed/XAConnectionFactory.java| 45 +- .../dbcp/pool2/BaseKeyedPooledObjectFactory.java | 70 +- .../apache/tomcat/dbcp/pool2/BaseObjectPool.java | 84 +- .../tomcat/dbcp/pool2/BasePooledObjectFactory.java | 53 +- java/org/apache/tomcat/dbcp/pool2/DestroyMode.java | 10 +- .../apache/tomcat/dbcp/pool2/KeyedObjectPool.java | 23 +- .../dbcp/pool2/KeyedPooledObjectFactory.java | 58 +- java/org/apache/tomcat/dbcp/pool2/ObjectPool.java | 14 +- java/org/apache/tomcat/dbcp/pool2/PoolUtils.java | 2360 ++-- .../org/apache/tomcat/dbcp/pool2/PooledObject.java | 308 ++- .../tomcat/dbcp/pool2/PooledObjectFactory.java | 48 +- .../tomcat/dbcp/pool2/PooledObjectState.java | 28 +- .../dbcp/pool2/SwallowedExceptionListener.java |2 +- java/org/apache/tomcat/dbcp/pool2/TrackedUse.java | 30 +- .../apache/tomcat/dbcp/pool2/UsageTracking.java| 15 +- .../tomcat/dbcp/pool2/impl/AbandonedConfig.java| 325 +-- .../dbcp/pool2/impl/BaseGenericObjectPool.java | 2279 +++ .../dbcp/pool2/impl/BaseObjectPoolConfig.java | 906 +--- .../apache/tomcat/dbcp/pool2/impl/CallStack.java | 24 +- .../tomcat/dbcp/pool2/impl/CallStackUtils.java |2 +- .../dbcp/pool2
Re: Plans for Tomcat 8.5.71
On Wed, Sep 1, 2021 at 2:52 PM Christopher Schultz wrote: > > All, > > Since the tcnative vote has passed, and it's the beginning of the month, > I expect to tag + call for a vote on 8.5.71 later today (US-Eastern > time). It's an extra-long weekend in the US this upcoming weekend; if I > get enough votes by Friday mid-day, I'll do the release, otherwise the > vote will likely remain open until Wednesday morning. I think you should wait for the tag on the main branch before doing anything, otherwise you may be missing one of the "auto" pre tag updates (poeditor, etc). Rémy > > Thanks, > -chris > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 9.0.x updated: Tighten up for partial roles and groups configuration
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 98075af Tighten up for partial roles and groups configuration
98075af is described below
commit 98075af3745589d73e8278ccf7f8e3030a09b197
Author: remm
AuthorDate: Thu Sep 2 11:33:14 2021 +0200
Tighten up for partial roles and groups configuration
Add debug log in open() that show the current feature in use, as there
are three levels and lots of configuration attributes.
Also harmonize some names.
---
.../catalina/users/DataSourceUserDatabase.java | 243 +
webapps/docs/jndi-resources-howto.xml | 12 +-
2 files changed, 155 insertions(+), 100 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 2c6eb5e..ec44e8b 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -110,7 +110,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
/**
* The generated string for the roles PreparedStatement
*/
-private String preparedRoles = null;
+private String preparedUserRoles = null;
/**
@@ -122,7 +122,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
/**
* The generated string for the groups PreparedStatement
*/
-private String preparedGroups = null;
+private String preparedUserGroups = null;
/**
@@ -615,15 +615,19 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
return null;
}
-Connection dbConnection = openConnection();
-if (dbConnection == null) {
+if (isGroupStoreDefined()) {
+Connection dbConnection = openConnection();
+if (dbConnection == null) {
+return null;
+}
+try {
+return findGroupInternal(dbConnection, groupname);
+} finally {
+close(dbConnection);
+}
+} else {
return null;
}
-try {
-return findGroupInternal(dbConnection, groupname);
-} finally {
-close(dbConnection);
-}
} finally {
readLock.unlock();
}
@@ -685,15 +689,19 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
return null;
}
-Connection dbConnection = openConnection();
-if (dbConnection == null) {
+if (userRoleTable != null && roleNameCol != null) {
+Connection dbConnection = openConnection();
+if (dbConnection == null) {
+return null;
+}
+try {
+return findRoleInternal(dbConnection, rolename);
+} finally {
+close(dbConnection);
+}
+} else {
return null;
}
-try {
-return findRoleInternal(dbConnection, rolename);
-} finally {
-close(dbConnection);
-}
} finally {
readLock.unlock();
}
@@ -773,7 +781,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
// Lookup groups
ArrayList groups = new ArrayList<>();
if (isGroupStoreDefined()) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedGroups)) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedUserGroups)) {
stmt.setString(1, userName);
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
@@ -792,8 +800,8 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
}
ArrayList roles = new ArrayList<>();
-if (isRoleStoreDefined()) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedRoles)) {
+if (userRoleTable != null && roleNameCol != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedUserRoles)) {
stmt.setString(1, userName);
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
@@ -857,19 +865,45 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
@Override
public void open() throws Exception {
+if (log.isDebugEnabled()) {
+// As there are lots of parameters to configure, log some debug to
help out
+log.debug("DataSource UserDatabase features: User<
[tomcat] branch 10.0.x updated: Tighten up for partial roles and groups configuration
This is an automated email from the ASF dual-hosted git repository.
remm 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 a1bd28d Tighten up for partial roles and groups configuration
a1bd28d is described below
commit a1bd28d937053592d0a1a18e12f89694b2f65865
Author: remm
AuthorDate: Thu Sep 2 11:33:14 2021 +0200
Tighten up for partial roles and groups configuration
Add debug log in open() that show the current feature in use, as there
are three levels and lots of configuration attributes.
Also harmonize some names.
---
.../catalina/users/DataSourceUserDatabase.java | 243 +
webapps/docs/jndi-resources-howto.xml | 12 +-
2 files changed, 155 insertions(+), 100 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 2c6eb5e..ec44e8b 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -110,7 +110,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
/**
* The generated string for the roles PreparedStatement
*/
-private String preparedRoles = null;
+private String preparedUserRoles = null;
/**
@@ -122,7 +122,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
/**
* The generated string for the groups PreparedStatement
*/
-private String preparedGroups = null;
+private String preparedUserGroups = null;
/**
@@ -615,15 +615,19 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
return null;
}
-Connection dbConnection = openConnection();
-if (dbConnection == null) {
+if (isGroupStoreDefined()) {
+Connection dbConnection = openConnection();
+if (dbConnection == null) {
+return null;
+}
+try {
+return findGroupInternal(dbConnection, groupname);
+} finally {
+close(dbConnection);
+}
+} else {
return null;
}
-try {
-return findGroupInternal(dbConnection, groupname);
-} finally {
-close(dbConnection);
-}
} finally {
readLock.unlock();
}
@@ -685,15 +689,19 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
return null;
}
-Connection dbConnection = openConnection();
-if (dbConnection == null) {
+if (userRoleTable != null && roleNameCol != null) {
+Connection dbConnection = openConnection();
+if (dbConnection == null) {
+return null;
+}
+try {
+return findRoleInternal(dbConnection, rolename);
+} finally {
+close(dbConnection);
+}
+} else {
return null;
}
-try {
-return findRoleInternal(dbConnection, rolename);
-} finally {
-close(dbConnection);
-}
} finally {
readLock.unlock();
}
@@ -773,7 +781,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
// Lookup groups
ArrayList groups = new ArrayList<>();
if (isGroupStoreDefined()) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedGroups)) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedUserGroups)) {
stmt.setString(1, userName);
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
@@ -792,8 +800,8 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
}
ArrayList roles = new ArrayList<>();
-if (isRoleStoreDefined()) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedRoles)) {
+if (userRoleTable != null && roleNameCol != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedUserRoles)) {
stmt.setString(1, userName);
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
@@ -857,19 +865,45 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
@Override
public void open() throws Exception {
+if (log.isDebugEnabled()) {
+// As there are lots of parameters to configure, log some debug to
help out
+log.debug("DataSource UserDatabase features: Use
[tomcat] branch main updated: Tighten up for partial roles and groups configuration
This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e1cef2c Tighten up for partial roles and groups configuration
e1cef2c is described below
commit e1cef2cfc47982c947b5f23a8dae7c71cf1b979c
Author: remm
AuthorDate: Thu Sep 2 11:33:14 2021 +0200
Tighten up for partial roles and groups configuration
Add debug log in open() that show the current feature in use, as there
are three levels and lots of configuration attributes.
Also harmonize some names.
---
.../catalina/users/DataSourceUserDatabase.java | 243 +
webapps/docs/jndi-resources-howto.xml | 12 +-
2 files changed, 155 insertions(+), 100 deletions(-)
diff --git a/java/org/apache/catalina/users/DataSourceUserDatabase.java
b/java/org/apache/catalina/users/DataSourceUserDatabase.java
index 2c6eb5e..ec44e8b 100644
--- a/java/org/apache/catalina/users/DataSourceUserDatabase.java
+++ b/java/org/apache/catalina/users/DataSourceUserDatabase.java
@@ -110,7 +110,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
/**
* The generated string for the roles PreparedStatement
*/
-private String preparedRoles = null;
+private String preparedUserRoles = null;
/**
@@ -122,7 +122,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
/**
* The generated string for the groups PreparedStatement
*/
-private String preparedGroups = null;
+private String preparedUserGroups = null;
/**
@@ -615,15 +615,19 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
return null;
}
-Connection dbConnection = openConnection();
-if (dbConnection == null) {
+if (isGroupStoreDefined()) {
+Connection dbConnection = openConnection();
+if (dbConnection == null) {
+return null;
+}
+try {
+return findGroupInternal(dbConnection, groupname);
+} finally {
+close(dbConnection);
+}
+} else {
return null;
}
-try {
-return findGroupInternal(dbConnection, groupname);
-} finally {
-close(dbConnection);
-}
} finally {
readLock.unlock();
}
@@ -685,15 +689,19 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
return null;
}
-Connection dbConnection = openConnection();
-if (dbConnection == null) {
+if (userRoleTable != null && roleNameCol != null) {
+Connection dbConnection = openConnection();
+if (dbConnection == null) {
+return null;
+}
+try {
+return findRoleInternal(dbConnection, rolename);
+} finally {
+close(dbConnection);
+}
+} else {
return null;
}
-try {
-return findRoleInternal(dbConnection, rolename);
-} finally {
-close(dbConnection);
-}
} finally {
readLock.unlock();
}
@@ -773,7 +781,7 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
// Lookup groups
ArrayList groups = new ArrayList<>();
if (isGroupStoreDefined()) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedGroups)) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedUserGroups)) {
stmt.setString(1, userName);
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
@@ -792,8 +800,8 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
}
ArrayList roles = new ArrayList<>();
-if (isRoleStoreDefined()) {
-try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedRoles)) {
+if (userRoleTable != null && roleNameCol != null) {
+try (PreparedStatement stmt =
dbConnection.prepareStatement(preparedUserRoles)) {
stmt.setString(1, userName);
try (ResultSet rs = stmt.executeQuery()) {
while (rs.next()) {
@@ -857,19 +865,45 @@ public class DataSourceUserDatabase extends
SparseUserDatabase {
@Override
public void open() throws Exception {
+if (log.isDebugEnabled()) {
+// As there are lots of parameters to configure, log some debug to
help out
+log.debug("DataSource UserDatabase features: User<->
[GitHub] [tomcat] DigitalFatCat opened a new pull request #446: Improvements to Chinese translations
DigitalFatCat opened a new pull request #446: URL: https://github.com/apache/tomcat/pull/446 Improvements to Chinese translations -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch 8.5.x updated: Align with Commons FileUpload source
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 f81068d Align with Commons FileUpload source
f81068d is described below
commit f81068d6f1c6d342382d833a4c7e715b4f9aee12
Author: Mark Thomas
AuthorDate: Thu Sep 2 09:28:24 2021 +0100
Align with Commons FileUpload source
---
java/org/apache/tomcat/util/http/fileupload/package-info.java | 1 -
.../tomcat/util/http/fileupload/servlet/ServletRequestContext.java| 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/package-info.java
b/java/org/apache/tomcat/util/http/fileupload/package-info.java
index aea8293..f13b598 100644
--- a/java/org/apache/tomcat/util/http/fileupload/package-info.java
+++ b/java/org/apache/tomcat/util/http/fileupload/package-info.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
/**
* NOTE: This code has been copied from commons-fileupload trunk
* 1.3 and commons-io 1.4 and package renamed to avoid clashes with
diff --git
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
index 67852a6..a23f693 100644
---
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
+++
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
@@ -110,8 +110,8 @@ public class ServletRequestContext implements UploadContext
{
@Override
public String toString() {
return String.format("ContentLength=%s, ContentType=%s",
- Long.valueOf(this.contentLength()),
- this.getContentType());
+Long.valueOf(this.contentLength()),
+this.getContentType());
}
}
-
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: Align with Commons FileUpload source
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 295c7bb Align with Commons FileUpload source
295c7bb is described below
commit 295c7bbe82be37dbec8c0ab7b4be11f45449cdce
Author: Mark Thomas
AuthorDate: Thu Sep 2 09:28:24 2021 +0100
Align with Commons FileUpload source
---
java/org/apache/tomcat/util/http/fileupload/package-info.java | 1 -
.../tomcat/util/http/fileupload/servlet/ServletRequestContext.java| 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/package-info.java
b/java/org/apache/tomcat/util/http/fileupload/package-info.java
index aea8293..f13b598 100644
--- a/java/org/apache/tomcat/util/http/fileupload/package-info.java
+++ b/java/org/apache/tomcat/util/http/fileupload/package-info.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
/**
* NOTE: This code has been copied from commons-fileupload trunk
* 1.3 and commons-io 1.4 and package renamed to avoid clashes with
diff --git
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
index 67852a6..a23f693 100644
---
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
+++
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
@@ -110,8 +110,8 @@ public class ServletRequestContext implements UploadContext
{
@Override
public String toString() {
return String.format("ContentLength=%s, ContentType=%s",
- Long.valueOf(this.contentLength()),
- this.getContentType());
+Long.valueOf(this.contentLength()),
+this.getContentType());
}
}
-
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: Align with Commons FileUpload source
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 6986dde Align with Commons FileUpload source
6986dde is described below
commit 6986dded97638f60bf1862fd5b1701d463760f45
Author: Mark Thomas
AuthorDate: Thu Sep 2 09:28:24 2021 +0100
Align with Commons FileUpload source
---
java/org/apache/tomcat/util/http/fileupload/package-info.java | 1 -
.../tomcat/util/http/fileupload/servlet/ServletRequestContext.java| 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/package-info.java
b/java/org/apache/tomcat/util/http/fileupload/package-info.java
index aea8293..f13b598 100644
--- a/java/org/apache/tomcat/util/http/fileupload/package-info.java
+++ b/java/org/apache/tomcat/util/http/fileupload/package-info.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
/**
* NOTE: This code has been copied from commons-fileupload trunk
* 1.3 and commons-io 1.4 and package renamed to avoid clashes with
diff --git
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
index e43440c..abf4008 100644
---
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
+++
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
@@ -110,8 +110,8 @@ public class ServletRequestContext implements UploadContext
{
@Override
public String toString() {
return String.format("ContentLength=%s, ContentType=%s",
- Long.valueOf(this.contentLength()),
- this.getContentType());
+Long.valueOf(this.contentLength()),
+this.getContentType());
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch main updated: Align with Commons FileUpload source
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 7eab11a Align with Commons FileUpload source
7eab11a is described below
commit 7eab11a932dbc41df9bfa3aa38a6455246841656
Author: Mark Thomas
AuthorDate: Thu Sep 2 09:28:24 2021 +0100
Align with Commons FileUpload source
---
java/org/apache/tomcat/util/http/fileupload/package-info.java | 1 -
.../tomcat/util/http/fileupload/servlet/ServletRequestContext.java| 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/tomcat/util/http/fileupload/package-info.java
b/java/org/apache/tomcat/util/http/fileupload/package-info.java
index aea8293..f13b598 100644
--- a/java/org/apache/tomcat/util/http/fileupload/package-info.java
+++ b/java/org/apache/tomcat/util/http/fileupload/package-info.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
/**
* NOTE: This code has been copied from commons-fileupload trunk
* 1.3 and commons-io 1.4 and package renamed to avoid clashes with
diff --git
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
index e43440c..abf4008 100644
---
a/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
+++
b/java/org/apache/tomcat/util/http/fileupload/servlet/ServletRequestContext.java
@@ -110,8 +110,8 @@ public class ServletRequestContext implements UploadContext
{
@Override
public String toString() {
return String.format("ContentLength=%s, ContentType=%s",
- Long.valueOf(this.contentLength()),
- this.getContentType());
+Long.valueOf(this.contentLength()),
+this.getContentType());
}
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
